diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-30 17:57:13 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-11 17:46:11 +0000 |
| commit | 2cf4a6a6306228204574a60724d4e58debb26317 (patch) | |
| tree | d9cccd6099bcdc0cb297f1381abb9e8b9da083c7 /meta | |
| parent | 708f3ca9ac63cadc00cac0bf311115f0bf059b27 (diff) | |
| download | poky-2cf4a6a6306228204574a60724d4e58debb26317.tar.gz | |
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)
(From OE-Core rev: a9b4a1e82eb45832dd641a77733737c6fd759890)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 9dbe0f69f874d3687ae1accc19116570bad86c04)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image_types.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
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 | |||
| 110 | 110 | ||
| 111 | IMAGE_CMD_TAR ?= "tar" | 111 | IMAGE_CMD_TAR ?= "tar" |
| 112 | # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs | 112 | # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs |
| 113 | IMAGE_CMD_tar = "${IMAGE_CMD_TAR} --sort=name --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" | 113 | 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 ]" |
| 114 | 114 | ||
| 115 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" | 115 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" |
| 116 | IMAGE_CMD_cpio () { | 116 | IMAGE_CMD_cpio () { |