aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2010-09-09 11:03:57 -0700
committerChris Larson <chris_larson@mentor.com>2010-09-09 11:05:38 -0700
commit8cfa7531a02e1c8380508b3dbed653427bf04c36 (patch)
treeedd95fef2b1e9f66ef2cc50958b42cc4f5102bed /conf
parentf641c14f2d22d09a9055e085444fba12001ab49f (diff)
downloadopenembedded-8cfa7531a02e1c8380508b3dbed653427bf04c36.tar.gz
openembedded-8cfa7531a02e1c8380508b3dbed653427bf04c36.tar.bz2
openembedded-8cfa7531a02e1c8380508b3dbed653427bf04c36.zip
Per the TSC decision, make packaged-staging default
For now, just ensures its inherited. In the future, we can merge / simplify staging.bbclass with packaged-staging.bbclass as appropriate. Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/distro/angstrom-2008.1.conf3
-rw-r--r--conf/distro/angstrom-2010.x.conf3
-rw-r--r--conf/distro/include/slugos.inc2
-rw-r--r--conf/distro/kaeilos-2010.conf3
-rw-r--r--conf/distro/kaeilos.conf3
-rw-r--r--conf/distro/minimal.conf6
-rw-r--r--conf/distro/shr.conf6
7 files changed, 1 insertions, 25 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 8f66ae929b..ec4f21e864 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -20,9 +20,6 @@ DISTRO_PR = ".6"
OLDEST_KERNEL ?= "2.6.16"
-#build staging from packages
-INHERIT += "packaged-staging"
-
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/angstrom-2008-preferred-versions.inc
diff --git a/conf/distro/angstrom-2010.x.conf b/conf/distro/angstrom-2010.x.conf
index 8260647517..b8724503e8 100644
--- a/conf/distro/angstrom-2010.x.conf
+++ b/conf/distro/angstrom-2010.x.conf
@@ -25,9 +25,6 @@ DISTRO_PR = ".7"
OLDEST_KERNEL ?= "2.6.16"
-#build staging from packages
-INHERIT += "packaged-staging"
-
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/angstrom-2010-preferred-versions.inc
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 430e85904d..4c509c6aef 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -53,7 +53,7 @@ USE_NLS_glib-2.0 = "yes"
USE_NLS_glib-2.0-native = "yes"
USE_NLS_gcc-cross = "no"
-INHERIT += "package_ipk debian testlab packaged-staging siteinfo"
+INHERIT += "package_ipk debian testlab siteinfo"
# FULL_OPTIMIZATION
# Optimization settings. Os works fine and is significantly better than O2.
diff --git a/conf/distro/kaeilos-2010.conf b/conf/distro/kaeilos-2010.conf
index 4828dce873..0101705dc7 100644
--- a/conf/distro/kaeilos-2010.conf
+++ b/conf/distro/kaeilos-2010.conf
@@ -18,9 +18,6 @@ DISTRO_PR = ".1"
OLDEST_KERNEL ?= "2.6.28"
-#build staging from packages
-INHERIT += "packaged-staging"
-
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/kaeilos-2009-preferred-versions.inc
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 78a69f110f..1287ea1dac 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -20,9 +20,6 @@ DISTRO_PR = ".5"
OLDEST_KERNEL ?= "2.6.16"
-#build staging from packages
-INHERIT += "packaged-staging"
-
require conf/distro/include/sane-srcdates.inc
require conf/distro/include/sane-srcrevs.inc
require conf/distro/include/kaeilos-2009-preferred-versions.inc
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 2f3a8217a8..376ffdee02 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -46,12 +46,6 @@ DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK'
INHERIT += "debian"
#############################################################################
-# STAGING AREA
-#############################################################################
-# Controlled by packaging system
-INHERIT += "packaged-staging"
-
-#############################################################################
# PACKAGING & FEEDS
#############################################################################
# Chose the packaging system
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 1191d8c88c..9dd1c3e30d 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -122,12 +122,6 @@ DISTRO_FEATURES += " tk "
INHERIT += "debian"
#############################################################################
-# STAGING AREA
-#############################################################################
-# Controlled by packaging system
-INHERIT += "packaged-staging"
-
-#############################################################################
# PACKAGING & FEEDS
#############################################################################
# Chose the packaging system