summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-08-19 22:48:17 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-19 22:48:17 +0100
commitf070ee959c8eb4d49f820ec46f22be221b46485a (patch)
tree2ec8c060e4c49e01009d8b281046b5519b0d6ee8 /meta
parent657188bfef94fd0e124fb6415051a83e99db7563 (diff)
downloadpoky-f070ee959c8eb4d49f820ec46f22be221b46485a.tar.gz
Rename packaged-staging2 -> sstate and remove the old empty class
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/packaged-staging.bbclass2
-rw-r--r--meta/classes/sstate.bbclass (renamed from meta/classes/packaged-staging2.bbclass)0
-rw-r--r--meta/conf/distro/poky.conf2
3 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
deleted file mode 100644
index 139597f9cb..0000000000
--- a/meta/classes/packaged-staging.bbclass
+++ /dev/null
@@ -1,2 +0,0 @@
1
2
diff --git a/meta/classes/packaged-staging2.bbclass b/meta/classes/sstate.bbclass
index 6476257fc8..6476257fc8 100644
--- a/meta/classes/packaged-staging2.bbclass
+++ b/meta/classes/sstate.bbclass
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index d6d335e5a6..cd2067d405 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -11,7 +11,7 @@ USER_CLASSES ?= ""
11 11
12PACKAGE_CLASSES ?= "package_ipk" 12PACKAGE_CLASSES ?= "package_ipk"
13INHERIT_INSANE ?= "insane" 13INHERIT_INSANE ?= "insane"
14INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian poky devshell ${INHERIT_INSANE} packaged-staging packaged-staging2" 14INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian poky devshell ${INHERIT_INSANE} sstate"
15# For some reason, this doesn't work 15# For some reason, this doesn't work
16# TARGET_OS ?= "linux" 16# TARGET_OS ?= "linux"
17# TARGET_VENDOR ?= "-poky" 17# TARGET_VENDOR ?= "-poky"