From 8cfa7531a02e1c8380508b3dbed653427bf04c36 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Sep 2010 11:03:57 -0700 Subject: 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 --- conf/distro/angstrom-2008.1.conf | 3 --- conf/distro/angstrom-2010.x.conf | 3 --- conf/distro/include/slugos.inc | 2 +- conf/distro/kaeilos-2010.conf | 3 --- conf/distro/kaeilos.conf | 3 --- conf/distro/minimal.conf | 6 ------ conf/distro/shr.conf | 6 ------ 7 files changed, 1 insertion(+), 25 deletions(-) (limited to 'conf') 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 @@ -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 1191d8c88c..9dd1c3e30d 100644 --- 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 ############################################################################# -- cgit 1.2.3-korg