bitbake.conf: add nonarch_base_lib variable

Adapt stagging.bbclass to this change

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index 82624cba9c79f9911ad9e13093a8f35ca9e3c007..1a078b415bb1369b2000c89b8c957b94cc33671c 100644 (file)
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -50,6 +50,10 @@ sysroot_stage_dirs() {
        then
                sysroot_stage_libdir $from${base_libdir} $to${base_libdir}
        fi
+       if [ -d $from${nonarch_base_libdir} ]
+       then
+               sysroot_stage_libdir $from${nonarch_base_libdir} $to${nonarch_base_libdir}
+       fi
        sysroot_stage_dir $from${datadir} $to${datadir}
        # We don't care about docs/info/manpages/locales
        rm -rf $to${mandir}/ $to${docdir}/ $to${infodir}/ ${to}${datadir}/locale/

diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 578c29f46c1b0dedd75d584843b306d8fea169a7..2e3856a2d1de1a9eff3bd180c324af48ae4cd4a8 100644 (file)
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -21,6 +21,7 @@ export exec_prefix = "/usr"
 export base_bindir = "${base_prefix}/bin"
 export base_sbindir = "${base_prefix}/sbin"
 export base_libdir = "${base_prefix}/${baselib}"
+export nonarch_base_libdir = "${base_prefix}/lib"
 
 # Architecture independent paths
 export datadir = "${prefix}/share"