aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-12-17 20:42:34 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-05-05 14:44:50 +0100
commit6ccaf4b86c84338e8a7c97cca055b7f899ea83ee (patch)
treecd7bbaedbbc8931929c0602487291917d6068b01 /classes
parent4194eae293b03aefd099c5a07f3c83da4cc410ea (diff)
downloadopenembedded-6ccaf4b86c84338e8a7c97cca055b7f899ea83ee.tar.gz
base.bbclass: Stage etc directory for native packages and add a use_do_install_for_stage special staging hint (from poky)
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'classes')
-rw-r--r--classes/base.bbclass1
-rw-r--r--classes/staging.bbclass3
2 files changed, 3 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass
index c17eaba75e..31b551a9a2 100644
--- 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 32038a5076..263ac915f2 100644
--- 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":