From 37771ef5bd71545ee68197ac237fa17d58327f18 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 23 Mar 2023 19:59:28 +0000 Subject: 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 Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/quilt/quilt.inc | 1 + 1 file changed, 1 insertion(+) 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 () { # The tests need to run as a non-root user, so pull in the ptest user DEPENDS:append:class-target = "${@bb.utils.contains('PTEST_ENABLED', '1', ' ptest-runner', '', d)}" +PACKAGE_WRITE_DEPS += "ptest-runner" do_install_ptest() { install ${WORKDIR}/test.sh ${D}${PTEST_PATH} -- cgit v1.2.3-54-g00ecf