|
@@ -35,47 +35,47 @@ ROOTFS_ISO9660_USE_INITRD = YES
|
|
endif
|
|
endif
|
|
|
|
|
|
ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
|
|
ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
|
|
-ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp
|
|
|
|
|
|
+ROOTFS_ISO9660_TMP_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp
|
|
define ROOTFS_ISO9660_CREATE_TEMPDIR
|
|
define ROOTFS_ISO9660_CREATE_TEMPDIR
|
|
- $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
|
|
|
|
- mkdir -p $(ROOTFS_ISO9660_TARGET_DIR)
|
|
|
|
|
|
+ $(RM) -rf $(ROOTFS_ISO9660_TMP_TARGET_DIR)
|
|
|
|
+ mkdir -p $(ROOTFS_ISO9660_TMP_TARGET_DIR)
|
|
endef
|
|
endef
|
|
ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_CREATE_TEMPDIR
|
|
ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_CREATE_TEMPDIR
|
|
else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION),y)
|
|
else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_TRANSPARENT_COMPRESSION),y)
|
|
ROOTFS_ISO9660_DEPENDENCIES += host-zisofs-tools
|
|
ROOTFS_ISO9660_DEPENDENCIES += host-zisofs-tools
|
|
-ROOTFS_ISO9660_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp
|
|
|
|
|
|
+ROOTFS_ISO9660_TMP_TARGET_DIR = $(FS_DIR)/rootfs.iso9660.tmp
|
|
# This must be early, before we copy the bootloader files.
|
|
# This must be early, before we copy the bootloader files.
|
|
define ROOTFS_ISO9660_MKZFTREE
|
|
define ROOTFS_ISO9660_MKZFTREE
|
|
- $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
|
|
|
|
|
|
+ $(RM) -rf $(ROOTFS_ISO9660_TMP_TARGET_DIR)
|
|
$(HOST_DIR)/bin/mkzftree -X -z 9 -p $(PARALLEL_JOBS) \
|
|
$(HOST_DIR)/bin/mkzftree -X -z 9 -p $(PARALLEL_JOBS) \
|
|
$(TARGET_DIR) \
|
|
$(TARGET_DIR) \
|
|
- $(ROOTFS_ISO9660_TARGET_DIR)
|
|
|
|
|
|
+ $(ROOTFS_ISO9660_TMP_TARGET_DIR)
|
|
endef
|
|
endef
|
|
ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_MKZFTREE
|
|
ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_MKZFTREE
|
|
ROOTFS_ISO9660_GENISOIMAGE_OPTS += -z
|
|
ROOTFS_ISO9660_GENISOIMAGE_OPTS += -z
|
|
else
|
|
else
|
|
-ROOTFS_ISO9660_TARGET_DIR = $(TARGET_DIR)
|
|
|
|
|
|
+ROOTFS_ISO9660_TMP_TARGET_DIR = $(TARGET_DIR)
|
|
endif
|
|
endif
|
|
|
|
|
|
ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB2),y)
|
|
ifeq ($(BR2_TARGET_ROOTFS_ISO9660_GRUB2),y)
|
|
ROOTFS_ISO9660_DEPENDENCIES += grub2
|
|
ROOTFS_ISO9660_DEPENDENCIES += grub2
|
|
ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
|
|
ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
|
|
- $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub.cfg
|
|
|
|
|
|
+ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/grub/grub.cfg
|
|
ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/grub-eltorito.img
|
|
ROOTFS_ISO9660_BOOT_IMAGE = boot/grub/grub-eltorito.img
|
|
define ROOTFS_ISO9660_INSTALL_BOOTLOADER
|
|
define ROOTFS_ISO9660_INSTALL_BOOTLOADER
|
|
$(INSTALL) -D -m 0644 $(BINARIES_DIR)/grub-eltorito.img \
|
|
$(INSTALL) -D -m 0644 $(BINARIES_DIR)/grub-eltorito.img \
|
|
- $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/grub-eltorito.img
|
|
|
|
|
|
+ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/grub/grub-eltorito.img
|
|
endef
|
|
endef
|
|
else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_ISOLINUX),y)
|
|
else ifeq ($(BR2_TARGET_ROOTFS_ISO9660_ISOLINUX),y)
|
|
ROOTFS_ISO9660_DEPENDENCIES += syslinux
|
|
ROOTFS_ISO9660_DEPENDENCIES += syslinux
|
|
ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
|
|
ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH = \
|
|
- $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/isolinux.cfg
|
|
|
|
|
|
+ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/isolinux.cfg
|
|
ROOTFS_ISO9660_BOOT_IMAGE = isolinux/isolinux.bin
|
|
ROOTFS_ISO9660_BOOT_IMAGE = isolinux/isolinux.bin
|
|
define ROOTFS_ISO9660_INSTALL_BOOTLOADER
|
|
define ROOTFS_ISO9660_INSTALL_BOOTLOADER
|
|
$(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/* \
|
|
$(INSTALL) -D -m 0644 $(BINARIES_DIR)/syslinux/* \
|
|
- $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/
|
|
|
|
|
|
+ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/
|
|
$(INSTALL) -D -m 0644 $(HOST_DIR)/share/syslinux/ldlinux.c32 \
|
|
$(INSTALL) -D -m 0644 $(HOST_DIR)/share/syslinux/ldlinux.c32 \
|
|
- $(ROOTFS_ISO9660_TARGET_DIR)/isolinux/ldlinux.c32
|
|
|
|
|
|
+ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/isolinux/ldlinux.c32
|
|
endef
|
|
endef
|
|
endif
|
|
endif
|
|
|
|
|
|
@@ -96,7 +96,7 @@ endef
|
|
# Copy the kernel to temporary filesystem
|
|
# Copy the kernel to temporary filesystem
|
|
define ROOTFS_ISO9660_COPY_KERNEL
|
|
define ROOTFS_ISO9660_COPY_KERNEL
|
|
$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \
|
|
$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) \
|
|
- $(ROOTFS_ISO9660_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
|
|
|
|
|
|
+ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/$(LINUX_IMAGE_NAME)
|
|
endef
|
|
endef
|
|
|
|
|
|
ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
|
|
ifeq ($(ROOTFS_ISO9660_USE_INITRD),YES)
|
|
@@ -111,7 +111,7 @@ else
|
|
ROOTFS_ISO9660_DEPENDENCIES += rootfs-cpio
|
|
ROOTFS_ISO9660_DEPENDENCIES += rootfs-cpio
|
|
define ROOTFS_ISO9660_COPY_INITRD
|
|
define ROOTFS_ISO9660_COPY_INITRD
|
|
$(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
|
|
$(INSTALL) -D -m 0644 $(BINARIES_DIR)/rootfs.cpio$(ROOTFS_CPIO_COMPRESS_EXT) \
|
|
- $(ROOTFS_ISO9660_TARGET_DIR)/boot/initrd
|
|
|
|
|
|
+ $(ROOTFS_ISO9660_TMP_TARGET_DIR)/boot/initrd
|
|
$(SED) "s%__INITRD_PATH__%/boot/initrd%" \
|
|
$(SED) "s%__INITRD_PATH__%/boot/initrd%" \
|
|
$(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
|
|
$(ROOTFS_ISO9660_BOOTLOADER_CONFIG_PATH)
|
|
endef
|
|
endef
|
|
@@ -133,7 +133,7 @@ define ROOTFS_ISO9660_CMD
|
|
$(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
|
|
$(HOST_DIR)/bin/genisoimage -J -R -b $(ROOTFS_ISO9660_BOOT_IMAGE) \
|
|
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
|
-no-emul-boot -boot-load-size 4 -boot-info-table \
|
|
$(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \
|
|
$(ROOTFS_ISO9660_GENISOIMAGE_OPTS) \
|
|
- -o $@ $(ROOTFS_ISO9660_TARGET_DIR)
|
|
|
|
|
|
+ -o $@ $(ROOTFS_ISO9660_TMP_TARGET_DIR)
|
|
endef
|
|
endef
|
|
|
|
|
|
ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y)
|
|
ifeq ($(BR2_TARGET_ROOTFS_ISO9660_HYBRID),y)
|