From 99cdb59aed345dd616f511686d0b6444830b83a1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 30 Oct 2009 00:33:24 +0000 Subject: binconfig.bbclass: Convert do_install_append() into a PACKAGE_PREPROCESS_FUNCS Signed-off-by: Richard Purdie --- meta/classes/binconfig.bbclass | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'meta/classes/binconfig.bbclass') diff --git a/meta/classes/binconfig.bbclass b/meta/classes/binconfig.bbclass index 9ebb54887c..55a0b039f2 100644 --- a/meta/classes/binconfig.bbclass +++ b/meta/classes/binconfig.bbclass @@ -22,20 +22,18 @@ def get_binconfig_mangle(d): BINCONFIG_GLOB ?= "*-config" -do_install_append() { +PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess" - #the 'if' protects native packages, since we can't easily check for bb.data.inherits_class('native', d) in shell - if [ -e ${D}${bindir} ] ; then - for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do - cat $config | sed \ - -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ - -e 's:${STAGING_INCDIR}:${includedir}:g;' \ - -e 's:${STAGING_DATADIR}:${datadir}:' \ - -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' > ${D}${bindir}/`basename $config` - done - fi - - for lafile in `find ${D} -name *.la` ; do +binconfig_package_preprocess () { + for config in `find ${PKGD} -name '${BINCONFIG_GLOB}'`; do + sed -i \ + -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ + -e 's:${STAGING_INCDIR}:${includedir}:g;' \ + -e 's:${STAGING_DATADIR}:${datadir}:' \ + -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \ + $config + done + for lafile in `find ${PKGD} -name "*.la"` ; do sed -i \ -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ -e 's:${STAGING_INCDIR}:${includedir}:g;' \ -- cgit 1.2.3-korg