From: Tomasz Maciej Nowak Date: Tue, 20 Nov 2018 16:20:41 +0000 (+0100) Subject: x86: add packages files to image bootfs X-Git-Tag: v19.07.0-rc1~2131 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=51e199fbe80acb6e95dff942280b0396e094032b;p=oweals%2Fopenwrt.git x86: add packages files to image bootfs Add files to bootfs image from selected as built-in packages, which want to install files to targets boot file system. Signed-off-by: Tomasz Maciej Nowak --- diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile index b537c40f24..dbf8a8594b 100644 --- a/target/linux/x86/image/Makefile +++ b/target/linux/x86/image/Makefile @@ -85,6 +85,7 @@ ifneq ($(CONFIG_GRUB_IMAGES),) -e 's#@ROOT@#$(GRUB_ROOT)#g' \ -e 's#@TITLE@#$(GRUB_TITLE)#g' \ ./grub.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg + -$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/ PADDING="$(CONFIG_TARGET_IMAGES_PAD)" SIGNATURE="$(SIGNATURE)" PATH="$(TARGET_PATH)" $(SCRIPT_DIR)/gen_image_generic.sh \ $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $(KDIR)/root.grub \ @@ -123,6 +124,7 @@ define Image/Build/iso -e 's#@TIMEOUT@#$(GRUB_TIMEOUT)#g' \ -e 's#@TITLE@#$(GRUB_TITLE)#g' \ ./grub-iso.cfg > $(KDIR)/root.grub/boot/grub/grub.cfg + -$(CP) $(STAGING_DIR_ROOT)/boot/. $(KDIR)/root.grub/boot/ mkisofs -R -b boot/grub/eltorito.img -no-emul-boot -boot-info-table \ -o $(KDIR)/root.iso $(KDIR)/root.grub $(TARGET_DIR) endef