Rename packaged-staging2 -> sstate and remove the old empty class

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
deleted file mode 100644 (file)
index 139597f..0000000
--- a/meta/classes/packaged-staging.bbclass
+++ /dev/null
@@ -1,2 +0,0 @@
-
-

diff --git a/meta/classes/packaged-staging2.bbclass b/meta/classes/sstate.bbclass
similarity index 100%
rename from meta/classes/packaged-staging2.bbclass
rename to meta/classes/sstate.bbclass

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index d6d335e5a6c2d703ed31939dfad6f975b6eec3c2..cd2067d40562252599f376c0d7752e311239f65c 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -11,7 +11,7 @@ USER_CLASSES ?= ""
 
 PACKAGE_CLASSES ?= "package_ipk"
 INHERIT_INSANE ?= "insane"
-INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian poky devshell ${INHERIT_INSANE} packaged-staging packaged-staging2"
+INHERIT += "${PACKAGE_CLASSES} ${USER_CLASSES} debian poky devshell ${INHERIT_INSANE} sstate"
 # For some reason, this doesn't work
 # TARGET_OS ?= "linux"
 # TARGET_VENDOR ?= "-poky"