diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-10-30 00:33:40 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-10 13:44:14 +0000 |
| commit | 6c47bea276c5a5bc97abb81bae9288421ae89607 (patch) | |
| tree | 07525afd16a28389205b31de9e5b4853a69fd4e3 | |
| parent | bea72c2fecde175add169bb55df1922b048030c8 (diff) | |
binconfig.bbclass: Convert do_install_append() into a PACKAGE_PREPROCESS_FUNCS (from Poky)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
| -rw-r--r-- | classes/binconfig.bbclass | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass index 04268c7f07..69374528dd 100644 --- a/classes/binconfig.bbclass +++ b/classes/binconfig.bbclass @@ -1,5 +1,3 @@ -inherit base - FILES_${PN}-dev += "${bindir}/*-config" # The namespaces can clash here hence the two step replace @@ -28,20 +26,18 @@ def get_binconfig_mangle(d): BINCONFIG_GLOB ?= "*-config" -do_install_append() { - - #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 +PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess" - 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;' \ |