fix E2 multiboot detection

Duckbox-Developers · Nov 15, 2019 · 9d04c5c · 9d04c5c
1 parent 03e4eaa
commit 9d04c5c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/make/bootstrap.mk b/make/bootstrap.mk
@@ -338,7 +338,7 @@ $(D)/directories:
 	install -d $(TARGET_DIR)/usr/include/linux
 	install -d $(TARGET_DIR)/usr/include/linux/dvb
 	install -d $(TARGET_DIR)/var/{etc,lib,run}
-	install -d $(TARGET_DIR)/var/lib/{misc,nfs}
+	install -d $(TARGET_DIR)/var/lib/{misc,nfs,opkg}
 	install -d $(TARGET_DIR)/var/bin
 	$(TOUCH)
 

diff --git a/make/neutrino-release.mk b/make/neutrino-release.mk
@@ -427,7 +427,7 @@ neutrino-mp-release-base:
 	install -d $(RELEASE_DIR)/usr/share/tuxbox/neutrino/icons/logo
 	install -d $(RELEASE_DIR)/usr/share/lua/5.2
 	install -d $(RELEASE_DIR)/var/{bin,boot,emu,etc,epg,httpd,keys,lib,logos,net,tuxbox,update}
-	install -d $(RELEASE_DIR)/var/lib/{nfs,modules}
+	install -d $(RELEASE_DIR)/var/lib/{nfs,modules,opkg}
 	install -d $(RELEASE_DIR)/var/net/epg
 	install -d $(RELEASE_DIR)/var/tuxbox/{config,fonts,locale,plugins,themes}
 	install -d $(RELEASE_DIR)/var/tuxbox/webtv
@@ -828,7 +828,7 @@ $(D)/neutrino-mp-release: neutrino-mp-release-base neutrino-mp-release-$(BOXTYPE
 #
 	cp -dpfr $(RELEASE_DIR)/etc $(RELEASE_DIR)/var
 	rm -fr $(RELEASE_DIR)/etc
-	ln -sf /var/etc $(RELEASE_DIR)
+	ln -sf var/etc $(RELEASE_DIR)/etc
 #
 	ln -s /tmp $(RELEASE_DIR)/lib/init
 	ln -s /tmp $(RELEASE_DIR)/var/lib/urandom

diff --git a/make/neutrino.mk b/make/neutrino.mk
@@ -10,6 +10,14 @@ $(TARGET_DIR)/.version:
 	echo "version=0200`date +%Y%m%d%H%M`" >> $@
 	echo "git=`git log | grep "^commit" | wc -l`" >> $@
 
+# -----------------------------------------------------------------------------
+e2-multiboot:
+	touch $(TARGET_DIR)/usr/bin/enigma2
+	echo -e "$(FLAVOUR) `sed -n 's/\#define PACKAGE_VERSION "//p' $(N_OBJDIR)/config.h | sed 's/"//'` \\\n \\\l\n" > $(TARGET_DIR)/etc/issue
+	touch $(TARGET_DIR)/var/lib/opkg/status
+	cp -a $(TARGET_DIR)/.version $(TARGET_DIR)/etc/image-version
+# -----------------------------------------------------------------------------
+
 AUDIODEC = ffmpeg
 
 NEUTRINO_DEPS  = $(D)/bootstrap $(KERNEL) $(D)/system-tools
@@ -305,6 +313,7 @@ neutrino-mp: $(D)/neutrino-mp.do_prepare $(D)/neutrino-mp.config.status $(D)/neu
 	PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) \
 	$(MAKE) -C $(N_OBJDIR) install DESTDIR=$(TARGET_DIR)
 	make $(TARGET_DIR)/.version
+	make e2-multiboot
 	touch $(D)/$(notdir $@)
 	make neutrino-mp-release
 	$(TUXBOX_CUSTOMIZE)