From 2cc9f1f82f45dcf9d7efc0d55d6c1892d03dee1f Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 13 Jul 2022 11:53:18 +0000 Subject: [PATCH] prod_image_util: unpack SLSA report along with gcc when building image Prod images need libstdc++.so and other libraries produced by sys-devel/gcc build, but because we don't want all of gcc in the image, the binpkg is manually unpacked instead of installed with emerge. Make sure to preserve SLSA metadata when unpacking as well. --- build_library/prod_image_util.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build_library/prod_image_util.sh b/build_library/prod_image_util.sh index 935c9aaf49..21fcf9ed6b 100755 --- a/build_library/prod_image_util.sh +++ b/build_library/prod_image_util.sh @@ -46,7 +46,8 @@ extract_prod_gcc() { qtbz2 -O -t "${pkg}" | \ sudo tar -C "${root_fs_dir}" -xj \ --transform 's#/usr/lib/.*/#/usr/lib/#' \ - --wildcards './usr/lib/gcc/*.so*' + --wildcards './usr/lib/gcc/*.so*' \ + --wildcards './usr/share/SLSA' package_provided "${gcc}" }