topaLE
/
ni-buildsystem
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

- hd6x: move bootmenu to package directory

master
vanhofen 4 years ago
parent
63c7dc536a
commit
4b76eadda3
6 changed files with 3 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      make/environment-build.mk
  2. 2
      make/flash-images.mk
  3. 2
      package/bootmenu/files/hd60/bootmenu.conf
  4. 0
      package/bootmenu/files/hd60/images
  5. 2
      package/bootmenu/files/hd61/bootmenu.conf
  6. 0
      package/bootmenu/files/hd61/images

1
make/environment-build.mk
View File

@ -128,7 +128,6 @@ ifeq ($(BOXMODEL),$(filter $(BOXMODEL),vusolo4k vuduo4k vuduo4kse vuultimo4k vuz
SKEL_ROOT = $(BASE_DIR)/skel-root/vuplus SKEL_ROOT = $(BASE_DIR)/skel-root/vuplus
endif endif
TARGET_FILES = $(BASE_DIR)/skel-root/general TARGET_FILES = $(BASE_DIR)/skel-root/general
BOOTMENU_DIR = $(BASE_DIR)/bootmenu
PACKAGE_DIR = $(BASE_DIR)/package PACKAGE_DIR = $(BASE_DIR)/package
BUILD ?= $(shell /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess 2>/dev/null) BUILD ?= $(shell /usr/share/libtool/config/config.guess 2>/dev/null || /usr/share/misc/config.guess 2>/dev/null)

2
make/flash-images.mk
View File

@ -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 "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_RECOVERY
echo "bootcmd=setenv bootargs \$$(bootargs_common); mmc read 0 0x1000000 0x1000 0x9000; bootm 0x1000000" > $(IMAGE_BUILD_DIR)/STARTUP_ONCE 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 ::
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 ::
mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(HD6x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_ANDROID_DISABLE_LINUXSE :: mcopy -i $(IMAGE_BUILD_DIR)/$(IMAGE_SUBDIR)/$(HD6x_BOOT_IMAGE) -v $(IMAGE_BUILD_DIR)/STARTUP_ANDROID_DISABLE_LINUXSE ::

2
bootmenu/hd60/bootmenu.conf → package/bootmenu/files/hd60/bootmenu.conf
View File

@ -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 iface eth0
dhcp yes dhcp yes

0
bootmenu/hd60/images → package/bootmenu/files/hd60/images
View File

2
bootmenu/hd61/bootmenu.conf → package/bootmenu/files/hd61/bootmenu.conf
View File

@ -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 iface eth0
dhcp yes dhcp yes

0
bootmenu/hd61/images → package/bootmenu/files/hd61/images
View File

Write Preview
Loading…
Cancel
Save