summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2020-11-21 14:47:54 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-12-03 23:02:08 +0000
commit3f2bc0a2e11ee7c03856055a5490ff267bf260a4 (patch)
tree4a6c4e5aedd874245a3bfb4a6c440786674ca5ce /meta
parentcbd023e0db766ca30ab640274db3a7801ab19e04 (diff)
downloadpoky-3f2bc0a2e11ee7c03856055a5490ff267bf260a4.tar.gz
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: b99796ec9436b63e4fc7cb7d12c0c9bcceef5d4b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 37f37f4a52de3711973b372160f23672b61ff6ad) 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/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb
index 15054768dd..e6a4bd1f8c 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.6.bb
@@ -125,6 +125,8 @@ do_compile_ptest() {
125} 125}
126 126
127do_install_ptest() { 127do_install_ptest() {
128 # This file's permissions depends on the host umask so be deterministic
129 chmod 0644 ${B}/tests/test_data.tmp
128 cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test 130 cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test
129 cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test 131 cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test
130 sed -e 's!../e2fsck/e2fsck!e2fsck!g' \ 132 sed -e 's!../e2fsck/e2fsck!e2fsck!g' \