Skip to contentSkip to conversation

fs/initramfs: fix initramfs support

PATCH New Gustavo Zacarias 2 participants 3 messages Mar 6, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 fs/initramfs: fix initramfs support

On commit a24877586a566e052897e50e6a0c2f53cfb029f TARGETS_ROOTFS was introduced, however fs/initramfs/initramfs.mk was never updated, hence a show-targets would be rootfs-initramfs with rootfs-cpio afterwards hence never rebuilding the kernel with a proper cpio archive since TARGETS is always before rootfs-* as stated in the commit description.

---
 fs/initramfs/initramfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/initramfs/initramfs.mk +1 -1
index 7820d65..5d3ea89 100644
@@ -18,5 +18,5 @@ rootfs-initramfs-show-depends:
 	@echo $(ROOTFS_INITRAMFS_DEPENDENCIES)
 
 ifeq ($(BR2_TARGET_ROOTFS_INITRAMFS),y)
-TARGETS += rootfs-initramfs
+TARGETS_ROOTFS += rootfs-initramfs
 endif
Signature · 1 line
1.8.3.2
#1 lore raw

PATCH 2/2 fs/iso9660: fix iso9660 support

Similar to the "fs/initramfs: fix initramfs support" commit the same problem applies to iso9660 in a different way. By adding iso9660 to TARGETS it gets called before target-finalize with obvious consequences.

---
 fs/iso9660/iso9660.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/iso9660/iso9660.mk +1 -1
index a6a9c95..6c8ace0 100644
@@ -47,5 +47,5 @@ rootfs-iso9660: $(BINARIES_DIR)/rootfs.iso9660
 #
 ################################################################################
 ifeq ($(BR2_TARGET_ROOTFS_ISO9660),y)
-TARGETS += rootfs-iso9660
+TARGETS_ROOTFS += rootfs-iso9660
 endif
Signature · 1 line
1.8.3.2
#2 lore raw

PATCH 1/2 fs/initramfs: fix initramfs support

In reply to Gustavo Zacarias

Dear Gustavo Zacarias,

Quoted 10 lines · Gustavo Zacarias

On commit a24877586a566e052897e50e6a0c2f53cfb029f TARGETS_ROOTFS was introduced, however fs/initramfs/initramfs.mk was never updated, hence a show-targets would be rootfs-initramfs with rootfs-cpio afterwards hence never rebuilding the kernel with a proper cpio archive since TARGETS is always before rootfs-* as stated in the commit description.

---
 fs/initramfs/initramfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Both applied, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com