[oe] [PATCH 1/5] binconfig.bbclass: search configs in D instead of S

Stanislav Brabec utx at penguin.cz
Sat Apr 16 23:23:35 UTC 2011


Searching for binconfig in S makes more problems than it
brings benefits. Searching in the installed root seems to be more logical.

Fixes following subtle breakages:
- binconfig are populated with a different name that upstream intended
- populated binconfig files that were not intended to be populated

It fixes at least ncurses, which populates ncurses-config instead of
ncurses5-config and ncursesw5-config, causing secondary breakages.

Signed-off-by: Stanislav Brabec <utx at penguin.cz>

diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index b3b2236..3d2bf0f 100644
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -49,7 +49,7 @@ binconfig_package_preprocess () {
 SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
 
 binconfig_sysroot_preprocess () {
-	for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
+	for config in `find ${D} -name '${BINCONFIG_GLOB}'`; do
 		configname=`basename $config`
 		install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
 		cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname

-- 

________________________________________________________________________
Stanislav Brabec
http://www.penguin.cz/~utx/zaurus





More information about the Openembedded-devel mailing list