jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fs/iso9660: rename all variables to use the ROOTFS_ISO9660 prefix

Browse Source 
For consistency reasons, this commit renames all internal variables of
iso9660.mk to use the ROOTFS_ISO9660 prefix.

While we're at it, replace a useless ':=' by '='.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: Samuel Martin <s.martin49@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
This commit is contained in:
Thomas Petazzoni 2015-06-09 00:21:37 +02:00
parent 818fe5e596
commit 0cfc57a8b3
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/iso9660/iso9660.mk
View File

@ -4,41 +4,41 @@
# #
################################################################################ ################################################################################
ISO9660_TARGET_DIR = $(BUILD_DIR)/rootfs-iso9660.tmp ROOTFS_ISO9660_TARGET_DIR = $(BUILD_DIR)/rootfs-iso9660.tmp
ISO9660_BOOT_MENU := $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU)) ROOTFS_ISO9660_BOOT_MENU = $(call qstrip,$(BR2_TARGET_ROOTFS_ISO9660_BOOT_MENU))
ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux rootfs-cpio ROOTFS_ISO9660_DEPENDENCIES = grub host-cdrkit host-fakeroot linux rootfs-cpio
ifeq ($(BR2_TARGET_GRUB_SPLASH),y) ifeq ($(BR2_TARGET_GRUB_SPLASH),y)
define ROOTFS_ISO9660_SPLASHSCREEN define ROOTFS_ISO9660_SPLASHSCREEN
$(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \ $(INSTALL) -D -m 0644 boot/grub/splash.xpm.gz \
$(ISO9660_TARGET_DIR)/splash.xpm.gz $(ROOTFS_ISO9660_TARGET_DIR)/splash.xpm.gz
endef endef
else else
define ROOTFS_ISO9660_SPLASHSCREEN define ROOTFS_ISO9660_SPLASHSCREEN
$(SED) '/^splashimage/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst $(SED) '/^splashimage/d' $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
endef endef
endif endif
ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
define ROOTFS_ISO9660_INITRD define ROOTFS_ISO9660_INITRD
$(SED) '/initrd/d' $(ISO9660_TARGET_DIR)/boot/grub/menu.lst $(SED) '/initrd/d' $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
endef endef
else else
define ROOTFS_ISO9660_INITRD define ROOTFS_ISO9660_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) \
$(ISO9660_TARGET_DIR)/initrd $(ROOTFS_ISO9660_TARGET_DIR)/initrd
endef endef
endif endif
define ROOTFS_ISO9660_PREPARATION define ROOTFS_ISO9660_PREPARATION
$(RM) -rf $(ISO9660_TARGET_DIR) $(RM) -rf $(ROOTFS_ISO9660_TARGET_DIR)
mkdir -p $(ISO9660_TARGET_DIR) mkdir -p $(ROOTFS_ISO9660_TARGET_DIR)
$(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \ $(INSTALL) -D -m 0644 $(GRUB_DIR)/stage2/stage2_eltorito \
$(ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/stage2_eltorito
$(INSTALL) -D -m 0644 $(ISO9660_BOOT_MENU) \ $(INSTALL) -D -m 0644 $(ROOTFS_ISO9660_BOOT_MENU) \
$(ISO9660_TARGET_DIR)/boot/grub/menu.lst $(ROOTFS_ISO9660_TARGET_DIR)/boot/grub/menu.lst
$(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ISO9660_TARGET_DIR)/kernel $(INSTALL) -D -m 0644 $(LINUX_IMAGE_PATH) $(ROOTFS_ISO9660_TARGET_DIR)/kernel
$(ROOTFS_ISO9660_SPLASHSCREEN) $(ROOTFS_ISO9660_SPLASHSCREEN)
$(ROOTFS_ISO9660_INITRD) $(ROOTFS_ISO9660_INITRD)
endef endef
@ -48,7 +48,7 @@ ROOTFS_ISO9660_PRE_GEN_HOOKS += ROOTFS_ISO9660_PREPARATION
define ROOTFS_ISO9660_CMD define ROOTFS_ISO9660_CMD
$(HOST_DIR)/usr/bin/genisoimage -J -R -b boot/grub/stage2_eltorito \ $(HOST_DIR)/usr/bin/genisoimage -J -R -b boot/grub/stage2_eltorito \
-no-emul-boot -boot-load-size 4 -boot-info-table \ -no-emul-boot -boot-load-size 4 -boot-info-table \
-o $@ $(ISO9660_TARGET_DIR) -o $@ $(ROOTFS_ISO9660_TARGET_DIR)
endef endef
$(eval $(call ROOTFS_TARGET,iso9660)) $(eval $(call ROOTFS_TARGET,iso9660))