[oe-commits] org.oe.packaged-staging packaged-staging.bbclass: fixes

[koen commit]

packaged-staging.bbclass: fixes
* blacklist dbg, gconf and charmap packages
* fix up libc.so linker script with sed

Author: koen at openembedded.org
Branch: org.openembedded.packaged-staging
Revision: 0ca9b992811584521f36865deaeb9cfeb1e9008a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0ca9b992811584521f36865deaeb9cfeb1e9008a
Files:
1
classes/packaged-staging.bbclass
Diffs:

#
# mt diff -r067e01b9b06d960878eb8d79c93318e74914e818 -r0ca9b992811584521f36865deaeb9cfeb1e9008a
#
# 
# 
# patch "classes/packaged-staging.bbclass"
#  from [47644a8bd67f0ea16fd99b6b95e742716a72ea21]
#    to [beaf8471c7179f603c1dea9c00278257927b66ba]
# 
============================================================
--- classes/packaged-staging.bbclass	47644a8bd67f0ea16fd99b6b95e742716a72ea21
+++ classes/packaged-staging.bbclass	beaf8471c7179f603c1dea9c00278257927b66ba
@@ -123,13 +123,19 @@ do_stage_prepend() {
 	#check for generated packages
 	if [ -e ${SPAWNFILE} ]; then
         	oenote "List of spawned packages found: ${P}.spawn"
-        	for spawn in `cat ${SPAWNFILE} | grep -v locale` ; do \
+        	for spawn in `cat ${SPAWNFILE} | grep -v locale | grep -v dbg | grep -v gconv | grep -v charmap` ; do \
 			if [ -e ${DEPLOY_DIR_IPK}/${spawn}_* ]; then
                	 		${PSTAGE_INSTALL_CMD} ${STAGING_BASEDIR} ${spawn}          
 				# clean up .la files to avoid having references to the builddirs in the binaries
 				for lafile in ${STAGING_LIBDIR}/*.la ; do \
 					sed -i s:installed=yes:installed=no:g ${lafile} || true
 				done
+
+				#fix up linker script to poin to staging
+				if [ -e ${STAGING_LIBDIR}/libc.so ]; then
+					sed -i s:\ /lib:\ ${STAGING_LIBDIR}:g ${STAGING_LIBDIR}/libc.so
+					sed -i s:\ /usr/lib:\ ${STAGING_LIBDIR}:g ${STAGING_LIBDIR}/libc.so
+				fi
 			else
 				oenote "${spawn} not found, probably empty package"
 			fi