Update drivers

[vuplus_openembedded] / classes / binconfig.bbclass

diff --git a/classes/binconfig.bbclass b/classes/binconfig.bbclass
index 5ce9ff6..b3b2236 100644 (file)
--- a/classes/binconfig.bbclass
+++ b/classes/binconfig.bbclass
@@ -1,23 +1,22 @@
-inherit base
+FILES_${PN}-dev += "${bindir}/*-config"
 
 # The namespaces can clash here hence the two step replace
 def get_binconfig_mangle(d):
-       import bb.data
        s = "-e ''"
        if not bb.data.inherits_class('native', d):
                optional_quote = r"\(\"\?\)"
                s += " -e 's:=%s${libdir}:=\\1OELIBDIR:;'" % optional_quote
                s += " -e 's:=%s${includedir}:=\\1OEINCDIR:;'" % optional_quote
                s += " -e 's:=%s${datadir}:=\\1OEDATADIR:'" % optional_quote
-               s += " -e 's:=%s${prefix}:=\\1OEPREFIX:'" % optional_quote
-               s += " -e 's:=%s${exec_prefix}:=\\1OEEXECPREFIX:'" % optional_quote
+               s += " -e 's:=%s${prefix}/:=\\1OEPREFIX/:'" % optional_quote
+               s += " -e 's:=%s${exec_prefix}/:=\\1OEEXECPREFIX/:'" % optional_quote
                s += " -e 's:-L${libdir}:-LOELIBDIR:;'"
                s += " -e 's:-I${includedir}:-IOEINCDIR:;'"
                s += " -e 's:OELIBDIR:${STAGING_LIBDIR}:;'"
                s += " -e 's:OEINCDIR:${STAGING_INCDIR}:;'"
                s += " -e 's:OEDATADIR:${STAGING_DATADIR}:'"
-               s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${layout_prefix}:'"
-               s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${layout_exec_prefix}:'"
+               s += " -e 's:OEPREFIX:${STAGING_DIR_HOST}${prefix}:'"
+               s += " -e 's:OEEXECPREFIX:${STAGING_DIR_HOST}${exec_prefix}:'"
                s += " -e 's:-I${WORKDIR}:-I${STAGING_INCDIR}:'"
                s += " -e 's:-L${WORKDIR}:-L${STAGING_LIBDIR}:'"
                if bb.data.getVar("OE_BINCONFIG_EXTRA_MANGLE", d):
@@ -26,34 +25,34 @@ 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}${layout_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;' \
                    -e 's:${STAGING_DATADIR}:${datadir}:' \
-                   -e 's:${STAGING_DIR_HOST}${layout_prefix}:${prefix}:' \
+                   -e 's:${STAGING_DIR_HOST}${prefix}:${prefix}:' \
                    $lafile
        done        
 }
 
-do_stage_append() {
+SYSROOT_PREPROCESS_FUNCS += "binconfig_sysroot_preprocess"
+
+binconfig_sysroot_preprocess () {
        for config in `find ${S} -name '${BINCONFIG_GLOB}'`; do
                configname=`basename $config`
-               install -d ${STAGING_BINDIR_CROSS}
-               cat $config | sed ${@get_binconfig_mangle(d)} > ${STAGING_BINDIR_CROSS}/$configname
-               chmod u+x ${STAGING_BINDIR_CROSS}/$configname
+               install -d ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}
+               cat $config | sed ${@get_binconfig_mangle(d)} > ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname
+               chmod u+x ${SYSROOT_DESTDIR}${STAGING_BINDIR_CROSS}/$configname
        done
 }