summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <pkj@axis.com>2025-12-03 15:36:59 +0100
committerKhem Raj <raj.khem@gmail.com>2025-12-11 09:32:46 -0800
commitfc0152e434307b98e1d16251f92ed81ac617c1db (patch)
tree192bbd08cd14ac9b38fd8f0495751c53579da897
parent7a14123a666e930f9e7649166a84a958e23ba29e (diff)
downloadmeta-openembedded-fc0152e434307b98e1d16251f92ed81ac617c1db.tar.gz
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 <peter.kjellerstedt@axis.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-navigation/proj/proj_9.7.0.bb4
1 files changed, 1 insertions, 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
12 12
13EXTRA_OECMAKE = "-DBUILD_TESTING=OFF" 13EXTRA_OECMAKE = "-DBUILD_TESTING=OFF"
14 14
15FILES:${PN} += " \ 15FILES:${PN} += "${datadir}/proj"
16 ${datadir}/proj \
17 ${datadir}/bash-completion"
18 16
19BBCLASSEXTEND = "native" 17BBCLASSEXTEND = "native"
20 18