binconfig.bbclass: introduce BINCONFIG_FILES variable

PATCH New Ming Liu 1 participant 3 messages Nov 22, 2014

lore

Share & tools

lore

Ming Liu

author

2014-11-22 04:35 UTC #0 lore raw

PATCH 1/3 binconfig.bbclass: introduce BINCONFIG_FILES variable

This allows binary configs being able to be overridden in recipes.

Signed-off-by Ming Liu <[email protected]>

---
 meta/classes/binconfig.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

meta/classes/binconfig.bbclass +2 -1

index cbc4173..db25b77 100644
@@ -1,4 +1,5 @@
-FILES_${PN}-dev += "${bindir}/*-config"
+BINCONFIG_FILES ?= "${bindir}/*-config"
+FILES_${PN}-dev += "${BINCONFIG_FILES}"
  
 # The namespaces can clash here hence the two step replace
 def get_binconfig_mangle(d):

Signature · 1 line

1.8.4.1

Ming Liu

author

2014-11-22 04:36 UTC #1 lore raw

PATCH 2/3 binconfig.bbclass: add base_prefix being processed

Add base_prefix to binconfig_package_preprocess, this is necessary to adjust text like "--sysroot=${STAGING_DIR_HOST}" in target binary configs.

Signed-off-by Ming Liu <[email protected]>

---
 meta/classes/binconfig.bbclass | 2 ++
 1 file changed, 2 insertions(+)

meta/classes/binconfig.bbclass +2 -0

index db25b77..abeda57 100644
@@ -39,6 +39,7 @@ binconfig_package_preprocess () {
 		    -e 's:${STAGING_INCDIR}:${includedir}:g;' \
 		    -e 's:${STAGING_DATADIR}:${datadir}:' \
 		    -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
+		    -e 's:${STAGING_DIR_HOST}${base_prefix}:${base_prefix}:' \
                     $config
 	done
 	for lafile in `find ${PKGD} -name "*.la"` ; do

@@ -48,6 +49,7 @@ binconfig_package_preprocess () {
 		    -e 's:${STAGING_INCDIR}:${includedir}:g;' \
 		    -e 's:${STAGING_DATADIR}:${datadir}:' \
 		    -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
+		    -e 's:${STAGING_DIR_HOST}${base_prefix}:${base_prefix}:' \
 		    $lafile
 	done	    
 }

Signature · 1 line

1.8.4.1

Ming Liu

author

2014-11-22 04:36 UTC #2 lore raw

PATCH 3/3 tcltk: do not deploy bindir_crossscripts to targets

In reply to Ming Liu

It does not make much sense to deploy bindir_crossscripts to targets especially when we have other alternatives, let binconfig handle it.

Signed-off-by Ming Liu <[email protected]>

---
 meta/recipes-devtools/tcltk/tcl_8.6.3.bb | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

meta/recipes-devtools/tcltk/tcl_8.6.3.bb +2 -7

index 73c0d25..27197fa 100644
@@ -58,8 +58,7 @@ do_install() {
 	sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh
 	sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh
 	sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh
-	install -d ${D}${bindir_crossscripts}
-	install -m 0755 tclConfig.sh ${D}${bindir_crossscripts}
+	install -m 0755 tclConfig.sh ${D}${bindir}
 	install -m 0755 tclConfig.sh ${D}${libdir}
 	cd ..
 	for dir in compat generic unix; do

@@ -68,11 +67,6 @@ do_install() {
 	done
 }
 
-SYSROOT_PREPROCESS_FUNCS += "tcl_sysroot_preprocess"
-tcl_sysroot_preprocess () {
-	sysroot_stage_dir ${D}${bindir_crossscripts} ${SYSROOT_DESTDIR}${bindir_crossscripts}
-}
-
 PACKAGES =+ "tcl-lib"
 FILES_tcl-lib = "${libdir}/libtcl8.6.so.*"
 FILES_${PN} += "${libdir}/tcl${VER} ${libdir}/tcl8.6 ${libdir}/tcl8"

@@ -97,6 +91,7 @@ do_install_ptest() {
 
 # Fix some paths that might be used by Tcl extensions
 BINCONFIG_GLOB = "*Config.sh"
+BINCONFIG_FILES = "${bindir}/*Config.sh"
 
 # Fix the path in sstate
 SSTATE_SCAN_FILES += "*Config.sh"

Signature · 1 line

1.8.4.1