From: Markham Date: Sat, 24 Mar 2018 20:58:29 +0000 (+0100) Subject: fix target wittinobi-neutrino-flash X-Git-Url: https://git.webhop.me/?a=commitdiff_plain;h=93f49a58332e367e284ac49208fdc43a631beef5;p=bs-cst-neutrino-hd.git fix target wittinobi-neutrino-flash --- diff --git a/Makefile b/Makefile index 7293eaa..13f2fc7 100755 --- a/Makefile +++ b/Makefile @@ -140,6 +140,7 @@ print-targets: # wittinobi wittinobi-init: + $(START_BUILD) $(MAKE) prerequisites bootstrap post-customize @echo "" @echo ' ============================================================================== ' @@ -150,6 +151,7 @@ wittinobi-init: @echo "" wittinobi-neutrino: + $(START_BUILD) $(MAKE) neutrino system-tools applications multimedia plugins skeleton rootfs @echo "" @echo ' ============================================================================== ' @@ -163,7 +165,9 @@ armbox-flashimage: coolstream-flashimage: $(MAKE) flash flash-check flash-finalize -wittinobi-neutrino-flash: $(MAKE) neutrino system-tools applications multimedia plugins skeleton rootfs flash-prepare $(BOXTYPE)-flashimage +wittinobi-neutrino-flash: + $(START_BUILD) + $(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" @@ -171,6 +175,7 @@ wittinobi-neutrino-flash: $(MAKE) neutrino system-tools applications multimedia @echo "" wittinobi-all: + $(START_BUILD) $(MAKE) neutrino system-tools applications multimedia plugins skeleton bootloader kernel drivers rootfs flash-prepare flash flash-full flash-check flash-finalize @echo "" @echo ' ============================================================================== ' @@ -347,3 +352,11 @@ PHONY += plugins #PHONY += bootloader #PHONY += drivers .PHONY: $(PHONY) + +# this makes sure we do not build top-level dependencies in parallel +# (which would not be too helpful anyway, running many configure and +# downloads in parallel...), but the sub-targets are still built in +# parallel, which is useful on multi-processor / multi-core machines +.NOTPARALLEL: + +# end diff --git a/make/applications.mk b/make/applications.mk index 5cdc2ab..9068bee 100755 --- a/make/applications.mk +++ b/make/applications.mk @@ -220,12 +220,13 @@ else endif $(D)/autofs: $(ARCHIVE)/autofs-4.1.4.tar.bz2 | $(TARGETPREFIX) $(START_BUILD) + $(REMOVE)/autofs-4.1.4 $(AUTOFS_PREQS) - $(MAKE) $(UNTAR)/autofs-4.1.4.tar.bz2 cd $(BUILD_TMP)/autofs-4.1.4 && \ $(PATCH)/autofs-4.1.4-td.diff && \ - $(BUILDENV) $(MAKE) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip SUBDIRS="lib daemon modules" && \ + $(BUILDENV) && \ + $(MAKE) CC=$(TARGET)-gcc STRIP=$(TARGET)-strip SUBDIRS="lib daemon modules" && \ $(MAKE) install INSTALLROOT=$(TARGETPREFIX) SUBDIRS="lib daemon modules" $(REMOVE)/autofs-4.1.4 $(TOUCH) diff --git a/make/ffmpeg.mk b/make/ffmpeg.mk index e918f7c..555d931 100644 --- a/make/ffmpeg.mk +++ b/make/ffmpeg.mk @@ -433,7 +433,7 @@ FFMPEG_DEP = $(D)/libass $(D)/alsa-lib FFMPEG_CONFIGURE += --cpu=cortex-a15 --disable-vfp --extra-cflags="-Wno-deprecated-declarations -I$(TARGETPREFIX)/include" endif -$(D)/ffmpeg-armbox: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX) +ffmpeg-armbox: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX) $(START_BUILD) $(REMOVE)/ffmpeg-$(FFMPEG_VER) $(UNTAR)/ffmpeg-$(FFMPEG_VER).tar.xz @@ -469,7 +469,7 @@ $(D)/ffmpeg-armbox: $(ARCHIVE)/ffmpeg-$(FFMPEG_VER).tar.xz | $(TARGETPREFIX) test -e $(PKG_CONFIG_PATH)/libswscale.pc && $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswscale.pc || true $(REMOVE)/ffmpeg-$(FFMPEG_VER) $(TARGETPREFIX)/.remove -$(D)/ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-git-$(FFMPEG_GIT).tar.gz | $(TARGETPREFIX) +ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-git-$(FFMPEG_GIT).tar.gz | $(TARGETPREFIX) $(START_BUILD) $(REMOVE)/ffmpeg-git-$(FFMPEG_GIT) $(UNTAR)/ffmpeg-git-$(FFMPEG_GIT).tar.gz @@ -505,6 +505,6 @@ $(D)/ffmpeg-coolstream: $(ARCHIVE)/ffmpeg-git-$(FFMPEG_GIT).tar.gz | $(TARGETPRE test -e $(PKG_CONFIG_PATH)/libswscale.pc && $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libswscale.pc || true $(REMOVE)/ffmpeg-git-$(FFMPEG_GIT) $(TARGETPREFIX)/.remove -$(D)/ffmpeg: $(D)/libxml2 $(D)/librtmp $(D)/libroxml $(FFMPEG_DEP) ffmpeg-$(BOXTYPE) +$(D)/ffmpeg: $(D)/librtmp $(D)/libxml2 $(D)/libroxml $(FFMPEG_DEP) ffmpeg-$(BOXTYPE) $(TOUCH) diff --git a/make/flashimage.mk b/make/flashimage.mk index fce9b3e..43cb019 100755 --- a/make/flashimage.mk +++ b/make/flashimage.mk @@ -112,11 +112,11 @@ flash-finalize: $(START_BUILD) @if [ -x $(BASE_DIR)/customize/version.sh ]; then \ $(BASE_DIR)/customize/version.sh $(PLATFORM) $(BOXMODEL) "finalize"; \ - echo " ============================================================================== "; \ - echo -e " \033[32mCUSTOM FINALIZE DONE :) Have fun\033[0m"; \ - echo " ============================================================================== "; \ - echo ""; \ fi + @echo " ============================================================================== "; + @echo -e " \033[32mCUSTOM FINALIZE DONE :) Have fun\033[0m"; + @echo " ============================================================================== "; + @echo ""; ifeq ($(PLATFORM), $(filter $(PLATFORM), apollo kronos)) FLASHPARAMS = -n @@ -168,19 +168,14 @@ flash: $(D)/host_mtd-utils flash-check: $(START_BUILD) + @RESULT="NOT OK" @if [ "$(FLASHSIZE)" -gt "`stat -c %s $(BUILD_TMP)/$(FLASHIMG_BODY)*.sum.img`" ]; then \ - echo ""; \ - echo " ============================================================================== "; \ - echo -e " \033[32mIMAGE SIZE: `stat -c %s $(BUILD_TMP)/$(FLASHIMG_BODY)*.sum.img` BYTES >> OK (MAX $(FLASHSIZE) BYTES)\033[0m"; \ - echo " ============================================================================== "; \ - echo ""; \ - else \ - echo ""; \ - echo " ============================================================================== "; \ - echo -e " \033[31mIMAGE SIZE: `stat -c %s $(BUILD_TMP)/$(FLASHIMG_BODY)*.sum.img` BYTES >> NOT OK !!! (MAX $(FLASHSIZE) BYTES)\033[0m"; \ - echo " ============================================================================== "; \ - echo ""; \ + RESULT="OK"; \ fi + @echo " ============================================================================== "; + @echo -e " \033[32mIMAGE SIZE: `stat -c %s $(BUILD_TMP)/$(FLASHIMG_BODY)*.sum.img` BYTES >> $(RESULT) (MAX $(FLASHSIZE) BYTES)\033[0m"; + @echo " ============================================================================== "; + @echo ""; flash-full: $(START_BUILD) diff --git a/make/libraries.mk b/make/libraries.mk index 0056855..8b8549c 100755 --- a/make/libraries.mk +++ b/make/libraries.mk @@ -809,7 +809,7 @@ $(D)/gettext: $(ARCHIVE)/gettext-$(GETTEXT_VER).tar.xz | $(TARGETPREFIX) --with-libxml2-prefix=$(TARGETPREFIX) \ ; \ $(MAKE) all; \ - make install DESTDIR=$(TARGETPREFIX) + $(MAKE) install DESTDIR=$(TARGETPREFIX) $(REWRITE_LIBTOOL)/libasprintf.la $(REWRITE_LIBTOOL)/libgettextlib.la $(REWRITE_LIBTOOL)/libgettextpo.la