From 374e0b4373f2e39e46bb5cfddca0f34febad85aa Mon Sep 17 00:00:00 2001 From: Markham Date: Fri, 9 Oct 2020 18:56:32 +0200 Subject: [PATCH] remove wittinobi from BS --- Makefile | 27 +++++++++++++-------------- make/bootstrap.mk | 2 +- make/neutrino.mk | 16 ++++++++-------- 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index e56d81d..ff7e788 100755 --- a/Makefile +++ b/Makefile @@ -75,11 +75,11 @@ printenv: @echo " * make print-targets - print out all available targets" @echo "" @echo " ...and some more make targets:" - @echo " * make wittinobi-init - builds prerequisites and bootstrap" - @echo " * make wittinobi-neutrino - builds neutrino with a complete filesystem (build_tmp/rootfs)" - @echo " * make wittinobi-neutrino-flash - builds wittinobi-neutrino, creates a tarball (build_tmp/*systemfs*.tar)" + @echo " * make init - builds prerequisites and bootstrap" + @echo " * make neutrino - builds neutrino with a complete filesystem (build_tmp/rootfs)" + @echo " * make neutrino-flash - builds neutrino, creates a tarball (build_tmp/*systemfs*.tar)" @echo " and a flash-image (build_tmp/*systemfs*.img)" - @echo " * make wittinobi-all - builds wittinobi-neutrino, creates a tarball (build_tmp/*systemfs*.tar)" + @echo " * make all - builds neutrino, creates a tarball (build_tmp/*systemfs*.tar)" @echo " and a u-boot-image (build_tmp/*u-boot*.img)" @echo " and a kernel-image (build_tmp/*kernel*.img)" @echo " and a flash-image (build_tmp/*systemfs*.img)" @@ -145,24 +145,23 @@ print-targets: `ls -1 make/*.mk|grep -v make/buildenv.mk|grep -v make/neutrino-release.mk|grep -v make/enigma2-release.mk` | \ sort -u | fold -s -w 65 -# wittinobi -wittinobi-init: +init: $(START_BUILD) $(MAKE) prerequisites bootstrap post-customize @echo "" @echo ' ============================================================================== ' - @echo -e " \033[32mmake wittinobi-init done\033[0m" + @echo -e " \033[32mmake init done\033[0m" @echo -e " \033[32mNOW you can patch your Buildsystem\033[0m" @echo -e " \033[32mor/and the Neutrino-HD sources\033[0m" @echo ' ============================================================================== ' @echo "" -wittinobi-neutrino: +neutrino: $(START_BUILD) $(MAKE) neutrino system-tools applications multimedia plugins skeleton rootfs @echo "" @echo ' ============================================================================== ' - @echo -e " \033[32mmake wittinobi-neutrino done\033[0m" + @echo -e " \033[32mmake neutrino done\033[0m" @echo ' ============================================================================== ' @echo "" @@ -172,21 +171,21 @@ armbox-flashimage: coolstream-flashimage: $(MAKE) flash flash-check flash-finalize -wittinobi-neutrino-flash: +neutrino-flash: $(START_BUILD) $(MAKE) neutrino system-tools applications multimedia plugins skeleton driver rootfs flash-prepare $(BOXTYPE)-flashimage @echo "" @echo ' ============================================================================== ' - @echo -e " \033[32mmake wittinobi-neutrino-flash done\033[0m" + @echo -e " \033[32mmake neutrino-flash done\033[0m" @echo ' ============================================================================== ' @echo "" -wittinobi-all: +all: $(START_BUILD) $(MAKE) neutrino system-tools applications multimedia plugins skeleton bootloader kernel driver drivers rootfs flash-prepare flash flash-full flash-check flash-finalize @echo "" @echo ' ============================================================================== ' - @echo -e " \033[32mmake wittinobi-all done\033[0m" + @echo -e " \033[32mmake all done\033[0m" @echo ' ============================================================================== ' @echo "" @@ -350,7 +349,7 @@ drivers: PHONY += all help printenv .print-phony PHONY += toolcheck update-git update-git-target update-neutrino update-self -PHONY += wittinobi-init wittinobi-neutrino wittinobi-neutrino-flash wittinobi-all +PHONY += init neutrino neutrino-flash all PHONY += prerequisites download PHONY += bootstrap includes-and-libs modules PHONY += neutrino diff --git a/make/bootstrap.mk b/make/bootstrap.mk index a944901..c106dfc 100755 --- a/make/bootstrap.mk +++ b/make/bootstrap.mk @@ -57,7 +57,7 @@ $(TARGETPREFIX): @echo " ******************************************************************************" @echo " !!! TARGETPREFIX does not exist !!!" @echo " ******************************************************************************" - @echo " You probably need to run 'make bootstrap' or 'make wittinobi-init'" + @echo " You probably need to run 'make bootstrap' or 'make init'" @echo "" @false diff --git a/make/neutrino.mk b/make/neutrino.mk index a0cf6f3..70f16dc 100755 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -197,14 +197,14 @@ neutrino-version: $(TARGETPREFIX)/bin/neutrino $(MAKE) $(TARGETPREFIX)/.version; \ fi -$(TARGETPREFIX)/.version: - echo "version=0214`date +%Y%m%d%H%M`" > $@ - echo "creator=`id -un` (wittinobi's BS GIT Build: `cd $(BASE_DIR) && git log | grep "^commit" | wc -l`)" >> $@ - echo "docs=http://wiki.neutrino-hd.de" >> $@ - echo "homepage=http://www.wiki.wittinobi.de" >> $@ - echo "imagename=Neutrino-HD" >> $@ - echo "forum=http://www.dbox2world.net" >> $@ - echo "builddate=`cd $(SOURCE_DIR)/neutrino-hd && git log | grep "^commit" | wc -l` vom `date --reference=$(SOURCE_DIR)/neutrino-hd/.git`" >> $@ +#$(TARGETPREFIX)/.version: +# echo "version=0214`date +%Y%m%d%H%M`" > $@ +# echo "creator=`id -un` (wittinobi's BS GIT Build: `cd $(BASE_DIR) && git log | grep "^commit" | wc -l`)" >> $@ +# echo "docs=http://wiki.neutrino-hd.de" >> $@ +# echo "homepage=http://www.wiki.wittinobi.de" >> $@ +# echo "imagename=Neutrino-HD" >> $@ +# echo "forum=http://www.dbox2world.net" >> $@ +# echo "builddate=`cd $(SOURCE_DIR)/neutrino-hd && git log | grep "^commit" | wc -l` vom `date --reference=$(SOURCE_DIR)/neutrino-hd/.git`" >> $@ $(D)/neutrino-hd-libs: $(START_BUILD) -- 2.39.5