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  ]

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>

diff --git a/meta/recipes-devtools/quilt/quilt.inc b/meta/recipes-devtools/quilt/quilt.inc
index 01fc22e99633678d366e69b97b4b958cfd6cdb43..c93c38b83ca4b660f4d93fd4d432aa5390b2b343 100644 (file)
--- 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}