diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-11-21 14:47:54 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-09 23:49:01 +0000 |
commit | 9f697736e08a9c1cdc40b30898afb10e41f39655 (patch) | |
tree | 69023a13d1e0d714dc247b4e2fbbd58741af6873 | |
parent | 433c03024126b79e796c9b823ab85eadc7499cb6 (diff) | |
download | poky-9f697736e08a9c1cdc40b30898afb10e41f39655.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: 071806feb195961e59069f778c9ae8f27a739d9a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 37f37f4a52de3711973b372160f23672b61ff6ad)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs_1.45.4.bb | 2 |
1 files changed, 2 insertions, 0 deletions
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() { | |||
128 | } | 128 | } |
129 | 129 | ||
130 | do_install_ptest() { | 130 | do_install_ptest() { |
131 | # This file's permissions depends on the host umask so be deterministic | ||
132 | chmod 0644 ${B}/tests/test_data.tmp | ||
131 | cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test | 133 | cp -R --no-dereference --preserve=mode,links -v ${B}/tests ${D}${PTEST_PATH}/test |
132 | cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test | 134 | cp -R --no-dereference --preserve=mode,links -v ${S}/tests/* ${D}${PTEST_PATH}/test |
133 | sed -e 's!../e2fsck/e2fsck!e2fsck!g' \ | 135 | sed -e 's!../e2fsck/e2fsck!e2fsck!g' \ |