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

This change 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.

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

6 files changed, 6 insertions, 6 deletions

diff --git a/meta/packages/linux/linux-mx31.inc b/meta/packages/linux/linux-mx31.inc
index 561dfea683..7df02c9b20 100644
--- a/meta/packages/linux/linux-mx31.inc
+++ b/meta/packages/linux/linux-mx31.inc
@@ -38,4 +38,4 @@ do_deploy() {
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_populate_staging after do_install
+addtask deploy before do_populate_sysroot after do_install
diff --git a/meta/packages/linux/linux-nokia800.inc b/meta/packages/linux/linux-nokia800.inc
index 132bbfcc66..d373e4c907 100644
--- a/meta/packages/linux/linux-nokia800.inc
+++ b/meta/packages/linux/linux-nokia800.inc
@@ -43,4 +43,4 @@ do_deploy() {
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_populate_staging after do_install
+addtask deploy before do_populate_sysroot after do_install
diff --git a/meta/packages/linux/linux-omap.inc b/meta/packages/linux/linux-omap.inc
index 6037ee6408..6668deb154 100644
--- a/meta/packages/linux/linux-omap.inc
+++ b/meta/packages/linux/linux-omap.inc
@@ -38,5 +38,5 @@ do_deploy() {
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_populate_staging after do_install
+addtask deploy before do_populate_sysroot after do_install
 
diff --git a/meta/packages/linux/linux-simtec.inc b/meta/packages/linux/linux-simtec.inc
index b9503cef96..b9a65cc26b 100644
--- a/meta/packages/linux/linux-simtec.inc
+++ b/meta/packages/linux/linux-simtec.inc
@@ -19,4 +19,4 @@ do_deploy() {
 
 do_deploy[dirs] = "${S}"
 
-addtask deploy before do_populate_staging after do_install
+addtask deploy before do_populate_sysroot after do_install
diff --git a/meta/packages/uclibc/uclibc.inc b/meta/packages/uclibc/uclibc.inc
index d0afff5f3c..bb0b3643bc 100644
--- a/meta/packages/uclibc/uclibc.inc
+++ b/meta/packages/uclibc/uclibc.inc
@@ -73,7 +73,7 @@ UCLIBC_STAGE_PREFIX = "${STAGING_DIR_HOST}${prefix}"
 OEMAKE_NO_CC = "'OPTIMIZATION=' 'CPU_CFLAGS=${CFLAGS}' 'STRIPTOOL=true' 'LD=${LD}' \
                 'LOCALE_DATA_FILENAME=${UCLIBC_LOCALE_FILE}'"
 EXTRA_OEMAKE = "${OEMAKE_NO_CC} 'CC=${CC}' HOSTCFLAGS='-I${STAGING_INCDIR_NATIVE}'"
-EXTRA_OEMAKE_task_do_populate_staging = "${OEMAKE_NO_CC}"
+EXTRA_OEMAKE_task_do_populate_sysroot = "${OEMAKE_NO_CC}"
 EXTRA_OEMAKE_task_do_package = "${OEMAKE_NO_CC}"
 
 KERNEL_SOURCE = "${STAGING_INCDIR}"
diff --git a/meta/packages/zaurus-updater/zaurus-updater.bb b/meta/packages/zaurus-updater/zaurus-updater.bb
index 0db411d750..4ab6fc43c4 100644
--- a/meta/packages/zaurus-updater/zaurus-updater.bb
+++ b/meta/packages/zaurus-updater/zaurus-updater.bb
@@ -32,4 +32,4 @@ do_deploy() {
         esac
 }
 
-addtask deploy before do_populate_staging after do_compile
+addtask deploy before do_populate_sysroot after do_compile