From 9f697736e08a9c1cdc40b30898afb10e41f39655 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 21 Nov 2020 14:47:54 +0000 Subject: e2fsprogs: Fix a ptest permissions determinism issue When comparing builds built with different host umasks, this file jumped out. The umask from do_compile was influencing ${D} and as cp was used to add the file it wasn't deterministic. Fix the file mode to ensure determinism. (From OE-Core rev: 071806feb195961e59069f778c9ae8f27a739d9a) Signed-off-by: Richard Purdie (cherry picked from commit 37f37f4a52de3711973b372160f23672b61ff6ad) Signed-off-by: Steve Sakoman Signed-off-by: Richard Purdie --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'meta/recipes-devtools') diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb index 4f7cafeac9..439928e433 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb @@ -128,6 +128,8 @@ do_compile_ptest() { } do_install_ptest() { + # This file's permissions depends on the host umask so be deterministic + chmod 0644 ${B}/tests/test_data.tmp cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test sed -e 's!../e2fsck/e2fsck!e2fsck!g' \ -- cgit v1.2.3-54-g00ecf