From 0dca21fbad7375ca8f626e504829e8919300d78b Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 13 Nov 2018 00:22:41 +0100 Subject: [PATCH] - fix handling of ./version file and neutrino's version.h --- make/image-update.mk | 2 -- make/neutrino.mk | 2 -- 2 files changed, 4 deletions(-) diff --git a/make/image-update.mk b/make/image-update.mk index 32dcaefa..cd28226e 100644 --- a/make/image-update.mk +++ b/make/image-update.mk @@ -37,7 +37,6 @@ u-neutrino: neutrino-clean echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH) echo "sync; /bin/busybox reboot" >> $(POSTINSTALL_SH) $(MAKE) neutrino - install -D -m 0644 $(TARGET_DIR)/.version $(UPDATE_INST_DIR)/.version install -D -m 0755 $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino install -D -m 0755 $(TARGET_DIR)/bin/neutrino $(UPDATE_INST_DIR)/bin/neutrino install -D -m 0644 $(TARGET_DIR)/share/tuxbox/neutrino/locale/deutsch.locale $(UPDATE_INST_DIR)/share/tuxbox/neutrino/locale/deutsch.locale @@ -55,7 +54,6 @@ u-neutrino-full: neutrino-clean echo "killall start_neutrino neutrino; sleep 5" >> $(PREINSTALL_SH) echo "sync; /bin/busybox reboot" >> $(POSTINSTALL_SH) $(MAKE) neutrino NEUTRINO_INST_DIR=$(UPDATE_INST_DIR) - install -D -m 0644 $(TARGET_DIR)/.version $(UPDATE_INST_DIR)/.version install -D -m 0755 $(TARGET_DIR)/etc/init.d/start_neutrino $(UPDATE_INST_DIR)/etc/init.d/start_neutrino ifneq ($(DEBUG), yes) find $(UPDATE_INST_DIR)/bin -type f ! -name *.sh -print0 | xargs -0 $(TARGET)-strip || true diff --git a/make/neutrino.mk b/make/neutrino.mk index fe4a031d..98fabad1 100644 --- a/make/neutrino.mk +++ b/make/neutrino.mk @@ -111,7 +111,6 @@ $(N_OBJDIR)/config.status: $(N_DEPS) $(MAKE_DIR)/neutrino.mk git checkout $(NI_NEUTRINO_BRANCH) $(SOURCE_DIR)/$(NI_NEUTRINO)/autogen.sh pushd $(N_OBJDIR) && \ - test -e version.h || touch version.h && \ export PKG_CONFIG=$(PKG_CONFIG) && \ export PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) && \ $(N_BUILDENV) \ @@ -182,7 +181,6 @@ $(D)/neutrino: $(N_OBJDIR)/config.status PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \ $(MAKE) -C $(N_OBJDIR) all DESTDIR=$(TARGET_DIR) $(MAKE) -C $(N_OBJDIR) install DESTDIR=$(NEUTRINO_INST_DIR) - make $(TARGET_DIR)/.version $(TOUCH) $(D)/libstb-hal: $(LH_OBJDIR)/config.status