From 4b76eadda30ec23c2294ef82b8947d9be8e97002 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Tue, 23 Feb 2021 23:17:09 +0100
Subject: [PATCH] - hd6x: move bootmenu to package directory

---
 make/environment-build.mk                               | 1 -
 make/flash-images.mk                                    | 2 +-
 {bootmenu => package/bootmenu/files}/hd60/bootmenu.conf | 2 +-
 {bootmenu => package/bootmenu/files}/hd60/images        | 0
 {bootmenu => package/bootmenu/files}/hd61/bootmenu.conf | 2 +-
 {bootmenu => package/bootmenu/files}/hd61/images        | 0
 6 files changed, 3 insertions(+), 4 deletions(-)
 rename {bootmenu => package/bootmenu/files}/hd60/bootmenu.conf (82%)
 rename {bootmenu => package/bootmenu/files}/hd60/images (100%)
 rename {bootmenu => package/bootmenu/files}/hd61/bootmenu.conf (82%)
 rename {bootmenu => package/bootmenu/files}/hd61/images (100%)

diff --git a/make/environment-build.mk b/make/environment-build.mk
index 8a9358e1..ef02b5eb 100644
--- a/make/environment-build.mk
+++ b/make/environment-build.mk
@@ -128,7 +128,6 @@ ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuz
   SKEL_ROOT   = $(BASE_DIR)/skel-root/vuplus
 endif
 TARGET_FILES  = $(BASE_DIR)/skel-root/general
-BOOTMENU_DIR  = $(BASE_DIR)/bootmenu
 PACKAGE_DIR   = $(BASE_DIR)/package
 
 BUILD        ?= $(shell /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess 2>/dev/null)
diff --git a/make/flash-images.mk b/make/flash-images.mk
index bccb2a0a..24d73dad 100644
--- a/make/flash-images.mk
+++ b/make/flash-images.mk
@@ -289,7 +289,7 @@ flash-image-hd6x-multi-recovery: | $(IMAGE_DIR)
 	echo "bootargs=root=/dev/mmcblk0p23 rootsubdir=linuxrootfs4 rootfstype=ext4 kernel=/dev/mmcblk0p22" >> $(IMAGE_BUILD_DIR)/STARTUP_LINUX_4
 	echo "bootcmd=setenv bootargs \$$(bootargs_common); mmc read 0 0x1000000 0x1000 0x9000; bootm 0x1000000" > $(IMAGE_BUILD_DIR)/STARTUP_RECOVERY
 	echo "bootcmd=setenv bootargs \$$(bootargs_common); mmc read 0 0x1000000 0x1000 0x9000; bootm 0x1000000" > $(IMAGE_BUILD_DIR)/STARTUP_ONCE
-	$(INSTALL_DATA) -D $(BOOTMENU_DIR)/$(BOXMODEL)/bootmenu.conf $(IMAGE_BUILD_DIR)/bootmenu.conf
+	$(INSTALL_DATA) -D $(PACKAGE_DIR)/bootmenu/files/$(BOXMODEL)/bootmenu.conf $(IMAGE_BUILD_DIR)/bootmenu.conf
 	mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(HD6x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP ::
 	mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(HD6x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_ANDROID ::
 	mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(HD6x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_ANDROID_DISABLE_LINUXSE ::
diff --git a/bootmenu/hd60/bootmenu.conf b/package/bootmenu/files/hd60/bootmenu.conf
similarity index 82%
rename from bootmenu/hd60/bootmenu.conf
rename to package/bootmenu/files/hd60/bootmenu.conf
index 702f4d14..60c45db8 100644
--- a/bootmenu/hd60/bootmenu.conf
+++ b/package/bootmenu/files/hd60/bootmenu.conf
@@ -1,4 +1,4 @@
-imageurl https://raw.githubusercontent.com/neutrino-images/ni-buildsystem/master/bootmenu/hd60/images
+imageurl https://raw.githubusercontent.com/neutrino-images/ni-buildsystem/master/package/bootmenu/files/hd60/images
 # 
 iface eth0
 dhcp yes
diff --git a/bootmenu/hd60/images b/package/bootmenu/files/hd60/images
similarity index 100%
rename from bootmenu/hd60/images
rename to package/bootmenu/files/hd60/images
diff --git a/bootmenu/hd61/bootmenu.conf b/package/bootmenu/files/hd61/bootmenu.conf
similarity index 82%
rename from bootmenu/hd61/bootmenu.conf
rename to package/bootmenu/files/hd61/bootmenu.conf
index 6ca81e31..73fd3c74 100644
--- a/bootmenu/hd61/bootmenu.conf
+++ b/package/bootmenu/files/hd61/bootmenu.conf
@@ -1,4 +1,4 @@
-imageurl https://raw.githubusercontent.com/neutrino-images/ni-buildsystem/master/bootmenu/hd61/images
+imageurl https://raw.githubusercontent.com/neutrino-images/ni-buildsystem/master/package/bootmenu/files/hd61/images
 # 
 iface eth0
 dhcp yes
diff --git a/bootmenu/hd61/images b/package/bootmenu/files/hd61/images
similarity index 100%
rename from bootmenu/hd61/images
rename to package/bootmenu/files/hd61/images