From 838a58ab01a9f325430fe6c4cc1dac7c2255a69c Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Tue, 30 Mar 2010 14:47:57 +0100 Subject: 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 --- recipes/ixp4xx/ixp4xx-npe-native_2.1.bb | 2 +- recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb | 2 +- recipes/ixp4xx/ixp4xx-npe-native_2.4.bb | 2 +- recipes/ixp4xx/ixp4xx-npe_2.1.bb | 2 +- recipes/ixp4xx/ixp4xx-npe_2.3.2.bb | 2 +- recipes/ixp4xx/ixp4xx-npe_2.4.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'recipes/ixp4xx') diff --git a/recipes/ixp4xx/ixp4xx-npe-native_2.1.bb b/recipes/ixp4xx/ixp4xx-npe-native_2.1.bb index 1510a750a9..f7ff764765 100644 --- a/recipes/ixp4xx/ixp4xx-npe-native_2.1.bb +++ b/recipes/ixp4xx/ixp4xx-npe-native_2.1.bb @@ -4,7 +4,7 @@ PR = "r3" SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip" SRC_URI += "file://IxNpeMicrocode.h" -do_unpack[depends] += "unzip-native:do_populate_staging" +do_unpack[depends] += "unzip-native:do_populate_sysroot" inherit native S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl" diff --git a/recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb b/recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb index 926fa98dcc..aabc043c6c 100644 --- a/recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb +++ b/recipes/ixp4xx/ixp4xx-npe-native_2.3.2.bb @@ -4,7 +4,7 @@ PR = "r1" SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip" SRC_URI += "file://IxNpeMicrocode.h" -do_unpack[depends] += "unzip-native:do_populate_staging" +do_unpack[depends] += "unzip-native:do_populate_sysroot" inherit native S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl" diff --git a/recipes/ixp4xx/ixp4xx-npe-native_2.4.bb b/recipes/ixp4xx/ixp4xx-npe-native_2.4.bb index 7bc28e6181..1ac22b2cdb 100644 --- a/recipes/ixp4xx/ixp4xx-npe-native_2.4.bb +++ b/recipes/ixp4xx/ixp4xx-npe-native_2.4.bb @@ -4,7 +4,7 @@ PR = "r0" SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip" SRC_URI += "file://IxNpeMicrocode.h" -do_unpack[depends] += "unzip-native:do_populate_staging" +do_unpack[depends] += "unzip-native:do_populate_sysroot" inherit native S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl" diff --git a/recipes/ixp4xx/ixp4xx-npe_2.1.bb b/recipes/ixp4xx/ixp4xx-npe_2.1.bb index 7eb3a3dbe0..ff10ff040c 100644 --- a/recipes/ixp4xx/ixp4xx-npe_2.1.bb +++ b/recipes/ixp4xx/ixp4xx-npe_2.1.bb @@ -4,7 +4,7 @@ PR = "r6" DEPENDS = "ixp4xx-npe-native" SRC_URI = "http://www.intel.com/Please-Read-The-BB-File/IPL_ixp400NpeLibrary-2_1.zip" -do_unpack[depends] += "unzip-native:do_populate_staging" +do_unpack[depends] += "unzip-native:do_populate_sysroot" S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl" COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" diff --git a/recipes/ixp4xx/ixp4xx-npe_2.3.2.bb b/recipes/ixp4xx/ixp4xx-npe_2.3.2.bb index 40ef4e653f..540528b2a6 100644 --- a/recipes/ixp4xx/ixp4xx-npe_2.3.2.bb +++ b/recipes/ixp4xx/ixp4xx-npe_2.3.2.bb @@ -9,7 +9,7 @@ DEPENDS = "ixp4xx-npe-native" # Make sure you *read* and accept the license - it is not a standard one. SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.3.2.bb-For-Instructions/IPL_ixp400NpeLibrary-2_3_2.zip" -do_unpack[depends] += "unzip-native:do_populate_staging" +do_unpack[depends] += "unzip-native:do_populate_sysroot" S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl" COMPATIBLE_MACHINE = "(nslu2|ixp4xx)" diff --git a/recipes/ixp4xx/ixp4xx-npe_2.4.bb b/recipes/ixp4xx/ixp4xx-npe_2.4.bb index 900ef8928a..bae416d121 100644 --- a/recipes/ixp4xx/ixp4xx-npe_2.4.bb +++ b/recipes/ixp4xx/ixp4xx-npe_2.4.bb @@ -11,7 +11,7 @@ DEPENDS = "ixp4xx-npe-native" SRC_URI = "http://You-Have-To-Download-The-Microcode-Manually-So-Please-Read-ixp4xx-npe_2.4.bb-For-Instructions/IPL_ixp400NpeLibrary-2_4.zip \ file://Intel" -do_unpack[depends] += "unzip-native:do_populate_staging" +do_unpack[depends] += "unzip-native:do_populate_sysroot" S = "${WORKDIR}/ixp400_xscale_sw/src/npeDl" COMPATIBLE_MACHINE = "(nslu2|ixp4xx|kixrp435)" -- cgit 1.2.3-korg