[Buildroot] [PATCH 6/9 v2] fs/cpio: use a post-gen hook rather than a post-target rule
Romain Naour
romain.naour at gmail.com
Mon Mar 28 18:22:28 UTC 2016
Hi Yann, All,
Le 11/03/2016 19:41, Yann E. MORIN a écrit :
> We already have a mechanism for running stuff after the filesystem is
> generated, and that's called post-gen hooks.
>
> Use those hooks.
>
> Note: for cpio (and unlike ext2 previously), the dependency chain was
> correct, in that the post-target rule correctly depended on the image
> rule. Nonetheless, we still want to fix it for consistency.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
> Cc: Arnout Vandecappelle <arnout at mind.be>
> ---
> fs/cpio/cpio.mk | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/fs/cpio/cpio.mk b/fs/cpio/cpio.mk
> index e82167e..c68e0bf 100644
> --- a/fs/cpio/cpio.mk
> +++ b/fs/cpio/cpio.mk
> @@ -31,12 +31,13 @@ define ROOTFS_CPIO_CMD
> cd $(TARGET_DIR) && find . | cpio --quiet -o -H newc > $@
> endef
>
> -$(BINARIES_DIR)/rootfs.cpio.uboot: $(BINARIES_DIR)/rootfs.cpio host-uboot-tools
> - $(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \
> - -C none -d $<$(ROOTFS_CPIO_COMPRESS_EXT) $@
> -
> ifeq ($(BR2_TARGET_ROOTFS_CPIO_UIMAGE),y)
> -ROOTFS_CPIO_POST_TARGETS += $(BINARIES_DIR)/rootfs.cpio.uboot
> +ROOTFS_CPIO_DEPENDENCIES += host-uboot-tools
> +define ROOTFS_CPIO_UBOOT_MKIMAGE
> + $(MKIMAGE) -A $(MKIMAGE_ARCH) -T ramdisk \
> + -C none -d $@$(ROOTFS_CPIO_COMPRESS_EXT) $@.uboot
> +endef
> +ROOTFS_CPIO_POST_GEN_HOOKS += ROOTFS_CPIO_UBOOT_MKIMAGE
> endif
Verified that rootfs.cpio.uboot is still build.
Reviewed-by: Romain Naour <romain.naour at gmail.com>
Best regards,
Romain
>
> $(eval $(call ROOTFS_TARGET,cpio))
>
More information about the buildroot
mailing list