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 <[email protected]>
---

I have sent a patch to openembedded-core to correct lib_package.bbclass,
and it obviously needs to be accepted before this is integrated.

 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"
 
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#122277): 
https://lists.openembedded.org/g/openembedded-devel/message/122277
Mute This Topic: https://lists.openembedded.org/mt/116594502/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub 
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

Reply via email to