diff options
author | Ross Burton <ross.burton@arm.com> | 2023-03-23 19:59:28 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-25 09:39:28 +0000 |
commit | 37771ef5bd71545ee68197ac237fa17d58327f18 (patch) | |
tree | b85d771a1ac29d2d5986d4bd740a1929672aa099 /meta | |
parent | 92993b4f77ec49b7f04458b722ede0f8a218e0e8 (diff) | |
download | poky-37771ef5bd71545ee68197ac237fa17d58327f18.tar.gz |
quilt: fix non-deterministic ownership in ptest package
The quilt package files are owned by the ptest user, which is provided
by the ptest-runner package. The quilt recipe depends on ptest-runner
but there have been instances where rebuilds of quilt end up without the
right passwd being present, so the files are not owned by ptest.
I suspect what's happening is that the re-package is happening without
the ptest-runner package being present (reproducible with bitbake quilt;
bitbake quilt -cclean; bitbake quilt -Cpackage_write_rpm), so add an
explicit dependency on ptest-runner in the packaging dependencies to
ensure this doesn't happen.
[ YOCTO #15062 ]
(From OE-Core rev: 6a7c17065aa1b107a8ff43de7c9097246b1316be)
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-devtools/quilt/quilt.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc index 01fc22e996..c93c38b83c 100644 --- a/meta/recipes-devtools/quilt/quilt.inc +++ b/meta/recipes-devtools/quilt/quilt.inc | |||
@@ -63,6 +63,7 @@ do_install:append:class-native () { | |||
63 | 63 | ||
64 | # The tests need to run as a non-root user, so pull in the ptest user | 64 | # The tests need to run as a non-root user, so pull in the ptest user |
65 | DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" | 65 | DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" |
66 | PACKAGE_WRITE_DEPS += "ptest-runner" | ||
66 | 67 | ||
67 | do_install_ptest() { | 68 | do_install_ptest() { |
68 | install ${WORKDIR}/test.sh ${D}${PTEST_PATH} | 69 | install ${WORKDIR}/test.sh ${D}${PTEST_PATH} |