- hd6x: move bootmenu to package directory

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)

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 ::

bootmenu/hd60/bootmenu.conf → 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

bootmenu/hd61/bootmenu.conf → 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