From 524fb10bbe2038ea7ca45493193073d31732d1de Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Mon, 3 Dec 2018 20:12:19 +0100 Subject: [PATCH] linux: ensure images/ exist before creating files there When using an initramfs, on the first-pass build, we create a dummy cpio so that the build succeeeds. The real cpio will come later, and we'll do a second-pass build to use the actual cpio. However, when we touch that dummy cpio, the images/ directory may not yet exist, since commit d0f4f95e39 (Makefile: rework main directory creation logic) removed its creation at the begining of the build, to only at the moment we need it, i.e. during the *_INSTALL_IMAGES_CMDS steps. However, the linux build is not a _INSTALL_IMAGES_CMDS step, so there is no guarantee that images/ already exist at that time. Fix that by explicitly creating images/ before touching the dummy cpio. Reported-by: Matthew Weber Signed-off-by: "Yann E. MORIN" Cc: Matthew Weber Cc: Thomas Petazzoni Reviewed-by: Matthew Weber Signed-off-by: Thomas Petazzoni --- linux/linux.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/linux/linux.mk b/linux/linux.mk index c00b326e8a..110260723b 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -311,6 +311,7 @@ define LINUX_KCONFIG_FIXUP_CMDS # replaced later by the real cpio archive, and the kernel will be # rebuilt using the linux-rebuild-with-initramfs target. $(if $(BR2_TARGET_ROOTFS_INITRAMFS), + mkdir -p $(BINARIES_DIR) touch $(BINARIES_DIR)/rootfs.cpio $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_SOURCE,"$${BR_BINARIES_DIR}/rootfs.cpio",$(@D)/.config) $(call KCONFIG_SET_OPT,CONFIG_INITRAMFS_ROOT_UID,0,$(@D)/.config)