aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2017-12-02 12:55:05 +0100
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-12-02 14:37:53 +0100
commit423b01ecc24d787ceb84e4d56d7a9558febb25b8 (patch)
tree5ca838de538d7806af5bf2517670c68c5cc5b574 /fs
parenta59e4b0dd86eb8b4051d67b43b0386b4a1c03579 (diff)
downloadbuildroot-423b01ecc24d787ceb84e4d56d7a9558febb25b8.tar.gz
buildroot-423b01ecc24d787ceb84e4d56d7a9558febb25b8.tar.bz2
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" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'fs')
-rw-r--r--fs/common.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/common.mk b/fs/common.mk
index c17c4585ff..b06e9b5597 100644
--- a/fs/common.mk
+++ b/fs/common.mk
@@ -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)