From: Richard Purdie Date: Sat, 30 Jan 2021 17:57:13 +0000 (+0000) Subject: image_types: Ensure tar archives are reproducible X-Git-Tag: 2020-10.2~34 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=a9b4a1e82eb45832dd641a77733737c6fd759890;p=openembedded-core.git image_types: Ensure tar archives are reproducible The tar output seems to vary depending on the version of tar used and distro configuration. Be explict about the output format to avoid this and be determinstic. (From OE-Core rev: c56f3c9febc1732aa1302524c6c4da36f16bd1f7) Signed-off-by: Richard Purdie (cherry picked from commit 9dbe0f69f874d3687ae1accc19116570bad86c04) Signed-off-by: Anuj Mittal --- diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 286009057e..85d619ca89 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -110,7 +110,7 @@ IMAGE_CMD_squashfs-lz4 = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAM IMAGE_CMD_TAR ?= "tar" # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs -IMAGE_CMD_tar = "${IMAGE_CMD_TAR} --sort=name --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" +IMAGE_CMD_tar = "${IMAGE_CMD_TAR} --sort=name --format=gnu --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" IMAGE_CMD_cpio () {