diff options
| author | Ross Burton <ross@burtonini.com> | 2020-12-01 15:23:02 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-18 14:20:19 +0000 |
| commit | 2dade7dd12ae26fa05407877a8813f7601bf67f7 (patch) | |
| tree | b214148e756ba448ea82e3ce6efc9f7bcdafdb15 /meta | |
| parent | 5d93870049ae4c0a1c3fa79453017e0fffb56164 (diff) | |
| download | poky-2dade7dd12ae26fa05407877a8813f7601bf67f7.tar.gz | |
image_types: sort tarball file listings
Help rootfs tarballs be reproducible by sorting the file listing.
(From OE-Core rev: 568afcef83ece5f8cb988dd0ad642feeec5c9656)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 4fa68626bbcfd9795577e1426c27d00f4d9d1c17)
Signed-off-by: Steve Sakoman <steve@sakoman.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 f82f1d8862..d81747527b 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass | |||
| @@ -126,7 +126,7 @@ IMAGE_CMD_squashfs-lz4 = "mksquashfs ${IMAGE_ROOTFS} ${IMGDEPLOYDIR}/${IMAGE_NAM | |||
| 126 | # required when extracting, but it seems prudent to use it in both cases. | 126 | # required when extracting, but it seems prudent to use it in both cases. |
| 127 | IMAGE_CMD_TAR ?= "tar" | 127 | IMAGE_CMD_TAR ?= "tar" |
| 128 | # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs | 128 | # ignore return code 1 "file changed as we read it" as other tasks(e.g. do_image_wic) may be hardlinking rootfs |
| 129 | IMAGE_CMD_tar = "${IMAGE_CMD_TAR} --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" | 129 | IMAGE_CMD_tar = "${IMAGE_CMD_TAR} --sort=name --numeric-owner -cf ${IMGDEPLOYDIR}/${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.tar -C ${IMAGE_ROOTFS} . || [ $? -eq 1 ]" |
| 130 | 130 | ||
| 131 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" | 131 | do_image_cpio[cleandirs] += "${WORKDIR}/cpio_append" |
| 132 | IMAGE_CMD_cpio () { | 132 | IMAGE_CMD_cpio () { |