bitbake.conf/base.bbclass: Rename the staging directory to sysroots and the populate_staging task to populate_sysroot

This change, pulled from Poky, makes the purpose of the staging directory more
obvious and the taskname more true to what it now actually does.

The layout version number is increased due to the change in layout but code to
convert existing directories and insert a symlink for backwards compatibility
is included.

This patch also includes fixes for all recipes which reference the directory.

Signed-off-by: Joshua Lock <josh@linux.intel.com>

1 files changed, 13 insertions, 13 deletions

diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass
index 98623a0fc2..bcc4ff4f52 100644
--- a/classes/packaged-staging.bbclass
+++ b/classes/packaged-staging.bbclass
@@ -65,7 +65,7 @@ python () {
     # as inactive.
     if pstage_allowed:
         deps = bb.data.getVarFlag('do_setscene', 'depends', d) or ""
-        deps += " stagemanager-native:do_populate_staging"
+        deps += " stagemanager-native:do_populate_sysroot"
         bb.data.setVarFlag('do_setscene', 'depends', deps, d)
 
         policy = bb.data.getVar("BB_STAMP_POLICY", d, True)
@@ -127,7 +127,7 @@ def pstage_cleanpackage(pkgname, d):
 			bb.note("Failure removing staging package")
 	else:
 		bb.debug(1, "Manually removing any installed files from staging...")
-		pstage_manualclean("staging", "STAGING_DIR", d)
+		pstage_manualclean("sysroots", "STAGING_DIR", d)
 		pstage_manualclean("cross", "CROSS_DIR", d)
 		pstage_manualclean("deploy", "DEPLOY_DIR", d)
 
@@ -277,14 +277,14 @@ python packagedstage_stampfixing_eventhandler() {
 		    _package_unlink(stamp)
 }
 
-populate_staging_preamble () {
+populate_sysroot_preamble () {
 	if [ "$PSTAGING_ACTIVE" = "1" ]; then
 		stage-manager -p ${STAGING_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-staging -u || true
 		stage-manager -p ${CROSS_DIR} -c ${DEPLOY_DIR_PSTAGE}/stamp-cache-cross -u || true
 	fi
 }
 
-populate_staging_postamble () {
+populate_sysroot_postamble () {
 	if [ "$PSTAGING_ACTIVE" = "1" ]; then
 		# list the packages currently installed in staging
 		# ${PSTAGE_LIST_CMD} | awk '{print $1}' > ${DEPLOY_DIR_PSTAGE}/installed-list         
@@ -306,20 +306,20 @@ populate_staging_postamble () {
 
 packagedstaging_fastpath () {
 	if [ "$PSTAGING_ACTIVE" = "1" ]; then
-		mkdir -p ${PSTAGE_TMPDIR_STAGE}/staging/
+		mkdir -p ${PSTAGE_TMPDIR_STAGE}/sysroots/
 		mkdir -p ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/
-		cp -fpPR ${SYSROOT_DESTDIR}${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/staging/ || /bin/true
-		cp -fpPR ${SYSROOT_DESTDIR}${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true
+		cp -fpPR ${SYSROOT_DESTDIR}/${STAGING_DIR}/* ${PSTAGE_TMPDIR_STAGE}/sysroots/ || /bin/true
+		cp -fpPR ${SYSROOT_DESTDIR}/${CROSS_DIR}/* ${PSTAGE_TMPDIR_STAGE}/cross/${BASE_PACKAGE_ARCH}/ || /bin/true
 	fi
 }
 
-do_populate_staging[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
+    bb.build.exec_func("populate_sysroot_preamble", d)
+do_populate_sysroot[dirs] =+ "${DEPLOY_DIR_PSTAGE}"
 python populate_staging_prehook() {
-    bb.build.exec_func("populate_staging_preamble", d)
 }
 
-python populate_staging_posthook() {
-    bb.build.exec_func("populate_staging_postamble", d)
+python populate_sysroot_posthook() {
+    bb.build.exec_func("populate_sysroot_postamble", d)
 }
 
 
@@ -447,9 +447,9 @@ python do_package_stage () {
 }
 
 #
-# Note an assumption here is that do_deploy runs before do_package_write/do_populate_staging
+# Note an assumption here is that do_deploy runs before do_package_write/do_populate_sysroot
 #
-addtask package_stage after do_package_write do_populate_staging before do_build
+addtask package_stage after do_package_write do_populate_sysroot before do_build
 
 do_package_stage_all () {
 	: