From 4d609d502161137620c4b1901cc225f9e871c3dc Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Apr 2011 16:56:03 +0100 Subject: Replace POKYBASE with COREBASE (From OE-Core rev: 607a7657715f6fcba467a4e55ba64f41f4e13a15) Signed-off-by: Richard Purdie --- scripts/creat-lsb-image | 2 +- scripts/poky-setup-builddir | 2 +- scripts/qemuimage-testlib | 2 +- scripts/qemuimage-tests/sanity/boot | 2 +- scripts/qemuimage-tests/sanity/compiler | 2 +- scripts/qemuimage-tests/sanity/connman | 2 +- scripts/qemuimage-tests/sanity/dmesg | 2 +- scripts/qemuimage-tests/sanity/rpm_query | 2 +- scripts/qemuimage-tests/sanity/scp | 2 +- scripts/qemuimage-tests/sanity/shutdown | 2 +- scripts/qemuimage-tests/sanity/ssh | 2 +- scripts/qemuimage-tests/sanity/zypper_help | 2 +- scripts/qemuimage-tests/sanity/zypper_search | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'scripts') diff --git a/scripts/creat-lsb-image b/scripts/creat-lsb-image index 3802e2f344..1dc48dd54c 100755 --- a/scripts/creat-lsb-image +++ b/scripts/creat-lsb-image @@ -21,7 +21,7 @@ green='\E[32;40m' USER=`whoami` ARCH=$1 MACHINE_ARCH=` bitbake -e | grep ^MACHINE_ARCH | cut -d '=' -f2 | cut -d '"' -f2` -IMAGE_PATH=` bitbake -e | grep ^POKYBASE | cut -d '=' -f2 | cut -d '"' -f2`/build/tmp/deploy/images/ +IMAGE_PATH=` bitbake -e | grep ^COREBASE | cut -d '=' -f2 | cut -d '"' -f2`/build/tmp/deploy/images/ ECHO() diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir index 5890eb0da3..aabf358e13 100755 --- a/scripts/poky-setup-builddir +++ b/scripts/poky-setup-builddir @@ -89,7 +89,7 @@ EOM # Put the abosolute path to the layers in bblayers.conf so we can run # bitbake without the init script after the first run - sed "s|##POKYBASE##|$OEROOT|g" $POKYLAYERCONF > $BUILDDIR/conf/bblayers.conf + sed "s|##COREBASE##|$OEROOT|g" $POKYLAYERCONF > $BUILDDIR/conf/bblayers.conf fi # Prevent disturbing a new GIT clone in same console diff --git a/scripts/qemuimage-testlib b/scripts/qemuimage-testlib index c3cf7c1ec2..5318ca636c 100644 --- a/scripts/qemuimage-testlib +++ b/scripts/qemuimage-testlib @@ -17,7 +17,7 @@ TYPE="ext3" # The folder to hold all scripts running on targets -TOOLS="$POKYBASE/scripts/qemuimage-tests/tools" +TOOLS="$COREBASE/scripts/qemuimage-tests/tools" # Test Directory on target for testing TARGET_TEST_DIR="/opt/test" diff --git a/scripts/qemuimage-tests/sanity/boot b/scripts/qemuimage-tests/sanity/boot index d3414d33d3..cf8aafbc50 100755 --- a/scripts/qemuimage-tests/sanity/boot +++ b/scripts/qemuimage-tests/sanity/boot @@ -9,7 +9,7 @@ # This file is licensed under the GNU General Public License, # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=120 diff --git a/scripts/qemuimage-tests/sanity/compiler b/scripts/qemuimage-tests/sanity/compiler index d224f33571..ef0700732d 100755 --- a/scripts/qemuimage-tests/sanity/compiler +++ b/scripts/qemuimage-tests/sanity/compiler @@ -9,7 +9,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 RET=1 diff --git a/scripts/qemuimage-tests/sanity/connman b/scripts/qemuimage-tests/sanity/connman index d46ef0a890..0c62902f87 100755 --- a/scripts/qemuimage-tests/sanity/connman +++ b/scripts/qemuimage-tests/sanity/connman @@ -9,7 +9,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 RET=1 diff --git a/scripts/qemuimage-tests/sanity/dmesg b/scripts/qemuimage-tests/sanity/dmesg index 06a99485ca..aed29e05eb 100755 --- a/scripts/qemuimage-tests/sanity/dmesg +++ b/scripts/qemuimage-tests/sanity/dmesg @@ -9,7 +9,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 RET=1 diff --git a/scripts/qemuimage-tests/sanity/rpm_query b/scripts/qemuimage-tests/sanity/rpm_query index d42c4c49be..dd652bd998 100755 --- a/scripts/qemuimage-tests/sanity/rpm_query +++ b/scripts/qemuimage-tests/sanity/rpm_query @@ -9,7 +9,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 RET=1 diff --git a/scripts/qemuimage-tests/sanity/scp b/scripts/qemuimage-tests/sanity/scp index ce7279cdf8..b0b693d0c8 100755 --- a/scripts/qemuimage-tests/sanity/scp +++ b/scripts/qemuimage-tests/sanity/scp @@ -9,7 +9,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 RET=1 diff --git a/scripts/qemuimage-tests/sanity/shutdown b/scripts/qemuimage-tests/sanity/shutdown index 22662ab257..d55c859410 100755 --- a/scripts/qemuimage-tests/sanity/shutdown +++ b/scripts/qemuimage-tests/sanity/shutdown @@ -11,7 +11,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 diff --git a/scripts/qemuimage-tests/sanity/ssh b/scripts/qemuimage-tests/sanity/ssh index e4a20dc73d..181296b0b5 100755 --- a/scripts/qemuimage-tests/sanity/ssh +++ b/scripts/qemuimage-tests/sanity/ssh @@ -9,7 +9,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 RET=1 diff --git a/scripts/qemuimage-tests/sanity/zypper_help b/scripts/qemuimage-tests/sanity/zypper_help index 6dafe5e1fd..94f82c4340 100755 --- a/scripts/qemuimage-tests/sanity/zypper_help +++ b/scripts/qemuimage-tests/sanity/zypper_help @@ -9,7 +9,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 RET=1 diff --git a/scripts/qemuimage-tests/sanity/zypper_search b/scripts/qemuimage-tests/sanity/zypper_search index b96cbdad66..e687eadfb7 100755 --- a/scripts/qemuimage-tests/sanity/zypper_search +++ b/scripts/qemuimage-tests/sanity/zypper_search @@ -9,7 +9,7 @@ # Version 2. # -. $POKYBASE/scripts/qemuimage-testlib +. $COREBASE/scripts/qemuimage-testlib TIMEOUT=400 RET=1 -- cgit v1.2.3-54-g00ecf