diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-10-30 00:33:24 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-11-13 12:15:22 +0000 |
commit | 99cdb59aed345dd616f511686d0b6444830b83a1 (patch) | |
tree | e7a937adc7bb654c56169b5fdc5d895a7eb7533a | |
parent | 7501b625b66be5c6ccf48ba262b67bfbb3441dc4 (diff) | |
download | poky-99cdb59aed345dd616f511686d0b6444830b83a1.tar.gz |
binconfig.bbclass: Convert do_install_append() into a PACKAGE_PREPROCESS_FUNCS
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r-- | meta/classes/binconfig.bbclass | 24 |
1 files changed, 11 insertions, 13 deletions
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): | |||
22 | 22 | ||
23 | BINCONFIG_GLOB ?= "*-config" | 23 | BINCONFIG_GLOB ?= "*-config" |
24 | 24 | ||
25 | do_install_append() { | 25 | PACKAGE_PREPROCESS_FUNCS += "binconfig_package_preprocess" |
26 | 26 | ||
27 | #the 'if' protects native packages, since we can't easily check for bb.data.inherits_class('native', d) in shell | 27 | binconfig_package_preprocess () { |
28 | if [ -e ${D}${bindir} ] ; then | 28 | for config in `find ${PKGD} -name '${BINCONFIG_GLOB}'`; do |
29 | for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do | 29 | sed -i \ |
30 | cat $config | sed \ | 30 | -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ |
31 | -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ | 31 | -e 's:${STAGING_INCDIR}:${includedir}:g;' \ |
32 | -e 's:${STAGING_INCDIR}:${includedir}:g;' \ | 32 | -e 's:${STAGING_DATADIR}:${datadir}:' \ |
33 | -e 's:${STAGING_DATADIR}:${datadir}:' \ | 33 | -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \ |
34 | -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' > ${D}${bindir}/`basename $config` | 34 | $config |
35 | done | 35 | done |
36 | fi | 36 | for lafile in `find ${PKGD} -name "*.la"` ; do |
37 | |||
38 | for lafile in `find ${D} -name *.la` ; do | ||
39 | sed -i \ | 37 | sed -i \ |
40 | -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ | 38 | -e 's:${STAGING_LIBDIR}:${libdir}:g;' \ |
41 | -e 's:${STAGING_INCDIR}:${includedir}:g;' \ | 39 | -e 's:${STAGING_INCDIR}:${includedir}:g;' \ |