base.bbclass: Stage etc directory for native packages and add a use_do_install_for_st...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/classes/base.bbclass b/classes/base.bbclass
index c17eaba..31b551a 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -340,7 +340,6 @@ base_do_compile() {
        fi
 }
 
-
 addtask install after do_compile
 do_install[dirs] = "${D} ${S} ${B}"
 # Remove and re-create ${D} so that is it guaranteed to be empty

diff --git a/classes/staging.bbclass b/classes/staging.bbclass
index 32038a5..263ac91 100644 (file)
--- a/classes/staging.bbclass
+++ b/classes/staging.bbclass
@@ -68,6 +68,7 @@ sysroot_stage_dirs() {
                sysroot_stage_dir $from${base_bindir} $to${STAGING_DIR_HOST}${base_bindir}
                sysroot_stage_dir $from${base_sbindir} $to${STAGING_DIR_HOST}${base_sbindir}
                sysroot_stage_dir $from${libexecdir} $to${STAGING_DIR_HOST}${libexecdir}
+               sysroot_stage_dir $from${sysconfdir} $to${STAGING_DIR_HOST}${sysconfdir}
                if [ "${prefix}/lib" != "${libdir}" ]; then
                        # python puts its files in here, make sure they are staged as well
                        autotools_stage_dir $from/${prefix}/lib $to${STAGING_DIR_HOST}${prefix}/lib
@@ -94,6 +95,8 @@ def is_legacy_staging(d):
     legacy = True
     if stagefunc is None:
         legacy = False
+    elif stagefunc.strip() == "use_do_install_for_stage":
+        legacy = False
     elif stagefunc.strip() == "autotools_stage_all":
         legacy = False
     elif stagefunc.strip() == "do_stage_native" and bb.data.getVar('AUTOTOOLS_NATIVE_STAGE_INSTALL', d, 1) == "1":