From fc0152e434307b98e1d16251f92ed81ac617c1db Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Wed, 3 Dec 2025 15:36:59 +0100 Subject: [PATCH] Revert "proj: Fix do_package QA issue for unshipped bash-completion files" This reverts commit 1175d5c8c13d73568d4ab55a3cf628456fcc1a7d. Since this recipe inherits bash-completion, adding ${datadir}/bash-completion to FILES:${PN} should not be needed (in addition to being the wrong thing to do as the files are expected to be packaged in the ${PN}-bash-completion package). The reason the problem addressed in commit 1175d5c8c13d73568d4ab55a3cf628456fcc1a7d turned up is due to the recent change to the bash-completion bbclass, where it started to use PACKAGE_BEFORE_PN. This clashed with the lib_package bbclass, which used to set rather than add to PACKAGE_BEFORE_PN, and since it is inherited after bash-completion, it overrid what bash-completion does. Signed-off-by: Peter Kjellerstedt Signed-off-by: Khem Raj --- meta-oe/recipes-navigation/proj/proj_9.7.0.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-oe/recipes-navigation/proj/proj_9.7.0.bb b/meta-oe/recipes-navigation/proj/proj_9.7.0.bb index eb9fe46f30..2a41f1ec52 100644 --- a/meta-oe/recipes-navigation/proj/proj_9.7.0.bb +++ b/meta-oe/recipes-navigation/proj/proj_9.7.0.bb @@ -12,9 +12,7 @@ inherit bash-completion cmake lib_package pkgconfig EXTRA_OECMAKE = "-DBUILD_TESTING=OFF" -FILES:${PN} += " \ - ${datadir}/proj \ - ${datadir}/bash-completion" +FILES:${PN} += "${datadir}/proj" BBCLASSEXTEND = "native"