aboutsummaryrefslogtreecommitdiffstats
path: root/conf/distro/shr.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/distro/shr.conf
parentf641c14f2d22d09a9055e085444fba12001ab49f (diff)
downloadopenembedded-8cfa7531a02e1c8380508b3dbed653427bf04c36.tar.gz
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/distro/shr.conf')
-rw-r--r--conf/distro/shr.conf6
1 files changed, 0 insertions, 6 deletions
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