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>

diff --git a/classes/base.bbclass b/classes/base.bbclass
index 299e875..1ffbe01 100644 (file)
--- a/classes/base.bbclass
+++ b/classes/base.bbclass
@@ -2,6 +2,7 @@ BB_DEFAULT_TASK ?= "build"
 
 inherit patch
 inherit staging
+inherit packaged-staging
 
 inherit packagedata
 inherit mirrors

diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index 8f66ae9..ec4f21e 100644 (file)
--- 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 8260647..b872450 100644 (file)
--- 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 430e859..4c509c6 100644 (file)
--- 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 4828dce..0101705 100644 (file)
--- 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 78a69f1..1287ea1 100644 (file)
--- 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 2f3a821..376ffde 100644 (file)
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -45,12 +45,6 @@ DISTRO_FEATURES += ' ${@["", "thumb-interwork"][bb.data.getVar('THUMB_INTERWORK'
 # libfoo -> libfoo0-2 (etc)
 INHERIT += "debian"
 
-#############################################################################
-# STAGING AREA
-#############################################################################
-# Controlled by packaging system
-INHERIT += "packaged-staging"
-
 #############################################################################
 # PACKAGING & FEEDS
 #############################################################################

diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 1191d8c..9dd1c3e 100644 (file)
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -121,12 +121,6 @@ DISTRO_FEATURES += " tk "
 # libfoo -> libfoo0-2 (etc)
 INHERIT += "debian"
 
-#############################################################################
-# STAGING AREA
-#############################################################################
-# Controlled by packaging system
-INHERIT += "packaged-staging"
-
 #############################################################################
 # PACKAGING & FEEDS
 #############################################################################