summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 16:56:03 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-21 00:29:29 +0100
commit4d609d502161137620c4b1901cc225f9e871c3dc (patch)
tree3bbb3286b831645fd29cae868b18b738ec508126 /scripts
parent8ceb769eab14066c9a5fc6a68284de9c1f5637fe (diff)
downloadpoky-4d609d502161137620c4b1901cc225f9e871c3dc.tar.gz
Replace POKYBASE with COREBASE
(From OE-Core rev: 607a7657715f6fcba467a4e55ba64f41f4e13a15) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/creat-lsb-image2
-rwxr-xr-xscripts/poky-setup-builddir2
-rw-r--r--scripts/qemuimage-testlib2
-rwxr-xr-xscripts/qemuimage-tests/sanity/boot2
-rwxr-xr-xscripts/qemuimage-tests/sanity/compiler2
-rwxr-xr-xscripts/qemuimage-tests/sanity/connman2
-rwxr-xr-xscripts/qemuimage-tests/sanity/dmesg2
-rwxr-xr-xscripts/qemuimage-tests/sanity/rpm_query2
-rwxr-xr-xscripts/qemuimage-tests/sanity/scp2
-rwxr-xr-xscripts/qemuimage-tests/sanity/shutdown2
-rwxr-xr-xscripts/qemuimage-tests/sanity/ssh2
-rwxr-xr-xscripts/qemuimage-tests/sanity/zypper_help2
-rwxr-xr-xscripts/qemuimage-tests/sanity/zypper_search2
13 files changed, 13 insertions, 13 deletions
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'
21USER=`whoami` 21USER=`whoami`
22ARCH=$1 22ARCH=$1
23MACHINE_ARCH=` bitbake -e | grep ^MACHINE_ARCH | cut -d '=' -f2 | cut -d '"' -f2` 23MACHINE_ARCH=` bitbake -e | grep ^MACHINE_ARCH | cut -d '=' -f2 | cut -d '"' -f2`
24IMAGE_PATH=` bitbake -e | grep ^POKYBASE | cut -d '=' -f2 | cut -d '"' -f2`/build/tmp/deploy/images/ 24IMAGE_PATH=` bitbake -e | grep ^COREBASE | cut -d '=' -f2 | cut -d '"' -f2`/build/tmp/deploy/images/
25 25
26 26
27ECHO() 27ECHO()
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
89 89
90 # Put the abosolute path to the layers in bblayers.conf so we can run 90 # Put the abosolute path to the layers in bblayers.conf so we can run
91 # bitbake without the init script after the first run 91 # bitbake without the init script after the first run
92 sed "s|##POKYBASE##|$OEROOT|g" $POKYLAYERCONF > $BUILDDIR/conf/bblayers.conf 92 sed "s|##COREBASE##|$OEROOT|g" $POKYLAYERCONF > $BUILDDIR/conf/bblayers.conf
93fi 93fi
94 94
95# Prevent disturbing a new GIT clone in same console 95# 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 @@
17TYPE="ext3" 17TYPE="ext3"
18 18
19# The folder to hold all scripts running on targets 19# The folder to hold all scripts running on targets
20TOOLS="$POKYBASE/scripts/qemuimage-tests/tools" 20TOOLS="$COREBASE/scripts/qemuimage-tests/tools"
21 21
22# Test Directory on target for testing 22# Test Directory on target for testing
23TARGET_TEST_DIR="/opt/test" 23TARGET_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 @@
9# This file is licensed under the GNU General Public License, 9# This file is licensed under the GNU General Public License,
10# Version 2. 10# Version 2.
11# 11#
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=120 14TIMEOUT=120
15 15
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 @@
9# Version 2. 9# Version 2.
10# 10#
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=400 14TIMEOUT=400
15RET=1 15RET=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 @@
9# Version 2. 9# Version 2.
10# 10#
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=400 14TIMEOUT=400
15RET=1 15RET=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 @@
9# Version 2. 9# Version 2.
10# 10#
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=400 14TIMEOUT=400
15RET=1 15RET=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 @@
9# Version 2. 9# Version 2.
10# 10#
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=400 14TIMEOUT=400
15RET=1 15RET=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 @@
9# Version 2. 9# Version 2.
10# 10#
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=400 14TIMEOUT=400
15RET=1 15RET=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 @@
11# Version 2. 11# Version 2.
12# 12#
13 13
14. $POKYBASE/scripts/qemuimage-testlib 14. $COREBASE/scripts/qemuimage-testlib
15 15
16TIMEOUT=400 16TIMEOUT=400
17 17
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 @@
9# Version 2. 9# Version 2.
10# 10#
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=400 14TIMEOUT=400
15RET=1 15RET=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 @@
9# Version 2. 9# Version 2.
10# 10#
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=400 14TIMEOUT=400
15RET=1 15RET=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 @@
9# Version 2. 9# Version 2.
10# 10#
11 11
12. $POKYBASE/scripts/qemuimage-testlib 12. $COREBASE/scripts/qemuimage-testlib
13 13
14TIMEOUT=400 14TIMEOUT=400
15RET=1 15RET=1