Skip to contentSkip to conversation

fs: prepare temp directory before running PRE_GEN hooks

PATCH New Yann E. MORIN 2 participants 2 messages Dec 2, 2017 VFS

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 fs: prepare temp directory before running PRE_GEN hooks

Some filesystems have PRE_GEN hooks that create a directory structure under the temporary directory.

For example, iso9660 will create a sub-directory where it stores the kernel (in case of initramfs or initrd).

So, we must run the PRE_GEN hooks after we cleanup/create the temporary directory.

Fixes:

    https://gitlab.com/buildroot.org/buildroot/-/jobs/42835965
    https://gitlab.com/buildroot.org/buildroot/-/jobs/42835967
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
---
 fs/common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/common.mk +1 -1
index c17c4585ff..b06e9b5597 100644
@@ -69,9 +69,9 @@ endif
 
 $$(BINARIES_DIR)/rootfs.$(1): target-finalize $$(ROOTFS_$(2)_DEPENDENCIES)
 	@$$(call MESSAGE,"Generating root filesystem image rootfs.$(1)")
-	$$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
 	rm -rf $(FS_DIR)
 	mkdir -p $(FS_DIR)
+	$$(foreach hook,$$(ROOTFS_$(2)_PRE_GEN_HOOKS),$$(call $$(hook))$$(sep))
 	echo '#!/bin/sh' > $$(FAKEROOT_SCRIPT)
 	echo "set -e" >> $$(FAKEROOT_SCRIPT)
 	echo "chown -h -R 0:0 $$(TARGET_DIR)" >> $$(FAKEROOT_SCRIPT)
Signature · 1 line
2.11.0
Applied
#1 lore raw

PATCH 1/1 fs: prepare temp directory before running PRE_GEN hooks

Hello,

Quoted 10 lines · Yann E. MORIN

Some filesystems have PRE_GEN hooks that create a directory structure under the temporary directory.

For example, iso9660 will create a sub-directory where it stores the kernel (in case of initramfs or initrd).

So, we must run the PRE_GEN hooks after we cleanup/create the temporary directory.

Fixes:

Quoted 8 lines
    https://gitlab.com/buildroot.org/buildroot/-/jobs/42835965
    https://gitlab.com/buildroot.org/buildroot/-/jobs/42835967
Signed-off-by "Yann E. MORIN" <[email protected]>
Cc Thomas Petazzoni <[email protected]>
---
 fs/common.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

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