From bf1853a8f20efb3e558bf1eb1683eb0ad7b1b767 Mon Sep 17 00:00:00 2001 From: Markham Date: Sat, 24 Mar 2018 17:56:33 +0100 Subject: [PATCH] add target system-tools; ethtool; ofgwrite ...silence output --- Makefile | 11 +++++++---- make/applications.mk | 34 ++++++++++++++++++++++++++++++++++ make/archives.mk | 6 ++++++ make/bootstrap.mk | 19 +++++++++++++++++-- make/environment.mk | 19 +++++++++++++++++-- make/versions.mk | 5 +++++ 6 files changed, 86 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index f7c4180..7c84b44 100755 --- a/Makefile +++ b/Makefile @@ -28,6 +28,9 @@ include make/flashimage.mk include make/cleantargets.mk include make/ffmpeg.mk +PARALLEL_JOBS := $(shell echo $$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`))) +override MAKE = make $(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS)) $(SILENT_OPT) + ############################################################################ # a print out of environment variables # @@ -147,7 +150,7 @@ wittinobi-init: @echo "" wittinobi-neutrino: - $(MAKE) neutrino applications multimedia plugins skeleton rootfs + $(MAKE) neutrino system-tools applications multimedia plugins skeleton rootfs @echo "" @echo ' ============================================================================== ' @echo -e " \033[32mmake wittinobi-neutrino done\033[0m" @@ -160,7 +163,7 @@ armbox-flashimage: coolstream-flashimage: $(MAKE) flash flash-check flash-finalize -wittinobi-neutrino-flash: $(MAKE) neutrino applications multimedia plugins skeleton rootfs flash-prepare $(BOXTYPE)-flashimage +wittinobi-neutrino-flash: $(MAKE) neutrino system-tools applications multimedia plugins skeleton rootfs flash-prepare $(BOXTYPE)-flashimage @echo "" @echo ' ============================================================================== ' @echo -e " \033[32mmake wittinobi-neutrino-flash done\033[0m" @@ -168,7 +171,7 @@ wittinobi-neutrino-flash: $(MAKE) neutrino applications multimedia plugins skele @echo "" wittinobi-all: - $(MAKE) neutrino applications multimedia plugins skeleton bootloader kernel drivers rootfs flash-prepare flash flash-full flash-check flash-finalize + $(MAKE) neutrino system-tools applications multimedia plugins skeleton bootloader kernel drivers rootfs flash-prepare flash flash-full flash-check flash-finalize @echo "" @echo ' ============================================================================== ' @echo -e " \033[32mmake wittinobi-all done\033[0m" @@ -213,7 +216,6 @@ neutrino-libs: # applications.mk applications: - $(MAKE) $(D)/procps $(D)/busybox $(D)/e2fsprogs $(D)/fbshot $(D)/vsftpd $(D)/mtd-utils $(D)/ntp $(D)/timezone if [ $(WIFI) = "yes" ]; then \ $(MAKE) $(D)/wpa_supplicant; \ else \ @@ -337,6 +339,7 @@ PHONY += prerequisites download PHONY += bootstrap includes-and-libs modules PHONY += neutrino PHONY += neutrino-libs +PHONY += system-tools PHONY += applications PHONY += multimedia PHONY += plugins diff --git a/make/applications.mk b/make/applications.mk index 2832df1..5cdc2ab 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -739,6 +739,40 @@ $(D)/portmap: $(ARCHIVE)/portmap-$(PORTMAP_VER).tgz $(REMOVE)/portmap_$(PORTMAP_VER) $(TOUCH) +# +# ofgwrite +# +$(D)/ofgwrite: $(ARCHIVE)/ofgwrite-git-$(OFGWRITE_VER).tar.bz2 | $(TARGETPREFIX) + $(START_BUILD) + $(REMOVE)/ofgwrite-git-$(OFGWRITE_VER) + $(UNTAR)/ofgwrite-git-$(OFGWRITE_VER).tar.bz2 + set -e; cd $(BUILD_TMP)/ofgwrite-git-$(OFGWRITE_VER); \ + $(BUILDENV); \ + $(MAKE); \ + install -m 755 $(BUILD_TMP)/ofgwrite-git-$(OFGWRITE_VER)/ofgwrite_bin $(TARGETPREFIX)/bin + install -m 755 $(BUILD_TMP)/ofgwrite-git-$(OFGWRITE_VER)/ofgwrite_tgz $(TARGETPREFIX)/bin + install -m 755 $(BUILD_TMP)/ofgwrite-git-$(OFGWRITE_VER)/ofgwrite $(TARGETPREFIX)/bin + $(REMOVE)/ofgwrite-git-$(OFGWRITE_VER) + $(TOUCH) + +# +# ethtool +# +$(D)/ethtool: $(ARCHIVE)/ethtool-$(ETHTOOL_VER).tar.xz | $(TARGETPREFIX) + $(START_BUILD) + $(REMOVE)/ethtool-$(ETHTOOL_VER) + $(UNTAR)/ethtool-$(ETHTOOL_VER).tar.xz + set -e; cd $(BUILD_TMP)/ethtool-$(ETHTOOL_VER); \ + $(CONFIGURE) \ + --prefix=/ \ + --mandir=/.remove \ + --libdir=$(TARGETPREFIX)/lib \ + ; \ + $(MAKE); \ + $(MAKE) install DESTDIR=$(TARGETPREFIX) + $(REMOVE)/ethtool-$(ETHTOOL_VER) + $(TOUCH) + $(D)/unfsd: $(D)/libflex $(D)/portmap $(ARCHIVE)/unfs3-$(UNFS3_VER).tar.gz $(START_BUILD) $(UNTAR)/unfs3-$(UNFS3_VER).tar.gz diff --git a/make/archives.mk b/make/archives.mk index 63263e1..bfe21b6 100755 --- a/make/archives.mk +++ b/make/archives.mk @@ -240,6 +240,9 @@ $(ARCHIVE)/inadyn-mt.v.$(INADYN_VER).tar.gz: $(ARCHIVE)/flac-1.3.0.tar.gz: $(WGET) http://www.fhloston-paradise.de/flac-1.3.0.tar.gz +$(ARCHIVE)/ethtool-$(ETHTOOL_VER).tar.xz: + $(WGET) https://www.kernel.org/pub/software/network/ethtool/ethtool-$(ETHTOOL_VER).tar.xz + $(ARCHIVE)/expat-$(EXPAT_VER).tar.bz2: $(WGET) http://downloads.sourceforge.net/expat/expat-$(EXPAT_VER).tar.bz2 @@ -300,6 +303,9 @@ $(ARCHIVE)/hd-idle-$(HD_IDLE_VER).tgz: $(ARCHIVE)/tzdata$(TZ_VER).tar.gz: $(WGET) ftp://ftp.iana.org/tz/releases/tzdata$(TZ_VER).tar.gz +$(ARCHIVE)/ofgwrite-git-$(OFGWRITE_VER).tar.bz2: + get-git-archive.sh https://github.com/Duckbox-Developers/ofgwrite-ddt.git $(OFGWRITE_VER) $(notdir $@) $(ARCHIVE) + $(ARCHIVE)/u-boot-$(U-BOOT_VER).tar.bz2: $(WGET) ftp://ftp.denx.de/pub/u-boot/u-boot-$(U-BOOT_VER).tar.bz2 diff --git a/make/bootstrap.mk b/make/bootstrap.mk index 0b44056..87eea5d 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -21,6 +21,21 @@ endif bootstrap: $(BOOTSTRAP) +SYSTEM_TOOLS = $(D)/busybox +SYSTEM_TOOLS += $(D)/zlib +SYSTEM_TOOLS += $(D)/e2fsprogs +SYSTEM_TOOLS += $(D)/fbshot +SYSTEM_TOOLS += $(D)/vsftpd +SYSTEM_TOOLS += $(D)/mtd-utils +SYSTEM_TOOLS += $(D)/procps +SYSTEM_TOOLS += $(D)/ntp +SYSTEM_TOOLS += $(D)/timezone +ifeq ($(BOXTYPE), armbox) +SYSTEM_TOOLS += $(D)/ofgwrite +SYSTEM_TOOLS += $(D)/ethtool +endif + +system-tools: $(SYSTEM_TOOLS) targetprefix: mkdir -p $(TARGETPREFIX) @@ -243,9 +258,9 @@ $(TARGETPREFIX)/lib/firmware: | $(TARGETPREFIX) fi $(TARGETPREFIX)/lib/modules: | $(TARGETPREFIX) - mkdir -p $@ + mkdir -p $@/$(KVERSION_FULL) if test -e $(SOURCE_DIR)/git/DRIVERS; then \ - cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/drivers/$(KVERSION_FULL)/* $@/; \ + cp -a $(SOURCE_DIR)/git/DRIVERS/$(DRIVER_DIR)/drivers/$(KVERSION_FULL)/* $@/$(KVERSION_FULL)/; \ fi $(TARGETPREFIX)/lib/libc.so.6: | $(TARGETPREFIX) diff --git a/make/environment.mk b/make/environment.mk index ba9dcf0..d367b41 100755 --- a/make/environment.mk +++ b/make/environment.mk @@ -31,8 +31,22 @@ BUILD ?= $(shell /usr/share/libtool/config.guess 2>/dev/null || /usr/share GCC = $(shell gcc -dumpversion | cut -c 1-3) -SILENT_OPT := >/dev/null 2>&1 -SILENT := @ +# default platform... +MAKEFLAGS = --no-print-directory +# If VERBOSE equals 0 then the above command will be hidden. +# If VERBOSE equals 1 then the above command is displayed. +ifeq ($(VERBOSE),1) +SILENT_PATCH = +SILENT_OPT = +SILENT = +WGET_SILENT_OPT = +else +SILENT_PATCH = -s +SILENT_OPT := >/dev/null 2>&1 +SILENT = @ +WGET_SILENT_OPT = -o /dev/null +MAKEFLAGS += --silent +endif ifeq ($(BOXMODEL), $(filter $(BOXMODEL), zee2 link)) BOXTYPE = coolstream @@ -69,6 +83,7 @@ else ifeq ($(BOXMODEL), hd51) DRIVER_DIR ?= $(PLATFORM) KERNEL_VER = 4.10.12 KERNEL_VERSION_FULL = $(KERNEL_VER) + KVERSION_FULL = $(KERNEL_VER) KERNEL_DATE = 20171103 KERNEL_TYPE = hd51 KERNEL_SRC = linux-$(KERNEL_VER)-arm.tar.gz diff --git a/make/versions.mk b/make/versions.mk index dc836a5..20c4e33 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -15,6 +15,8 @@ CT_NG_VER_HD1 = 1894239 CT_NG_VER_HD2 = a0d58f4 CT_NG_VER_ARM = 1dbb06f2 +ETHTOOL_VER = 4.15 + # Linaro GCC Versions GCC_VER_HD1 = linaro-4.9-2017.01 GCC_VER_HD2 = linaro-5.2-2015.11-2 @@ -130,6 +132,9 @@ NTFS_3G_VER=2016.2.22 # ntp; synchronize system clock over a network NTP_VER=4.2.8p6 +# ofgwrite from Betacentauri: Based upon: mtd-utils-native-1.5.1 and busybox 1.24.1 +OFGWRITE_VER = b7808ce + # openssl; toolkit for the SSL v2/v3 and TLS v1 protocol OPENSSL_VER=1.0.2 OPENSSL_SUBVER=n -- 2.39.5