summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-20 23:24:51 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-04-21 00:29:31 +0100
commit2c2e61743c8d6620a04aa5cb534af78f51b2845e (patch)
tree769b7139eb86f49d9d78153c8e673ed8f04d9bde
parent0b70e298fbb2cf0a9aa1bab193a66a7edfe99e10 (diff)
downloadpoky-2c2e61743c8d6620a04aa5cb534af78f51b2845e.tar.gz
Rename the remaining poky-* scripts to oe-* or runqemu-*
(From OE-Core rev: 877b3d84597fcfc3abf5aa332019d412f2717896) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--.gitignore2
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb13
-rw-r--r--[-rwxr-xr-x]scripts/oe-find-native-sysroot (renamed from scripts/poky-find-native-sysroot)2
-rw-r--r--[-rwxr-xr-x]scripts/oe-git-proxy-command (renamed from scripts/poky-git-proxy-command)0
-rw-r--r--scripts/oe-git-proxy-socks-command2
-rw-r--r--scripts/oe-git-proxy-socks.c (renamed from scripts/poky-git-proxy-socks.c)0
-rw-r--r--[-rwxr-xr-x]scripts/oe-setup-rpmrepo (renamed from scripts/poky-setup-rpmrepo)0
-rw-r--r--[-rwxr-xr-x]scripts/oe-trim-schemas (renamed from scripts/poky-trim-schemas)0
-rwxr-xr-xscripts/poky-git-proxy-socks-command2
-rw-r--r--[-rwxr-xr-x]scripts/runqemu-addptable2image (renamed from scripts/poky-addptable2image)0
-rw-r--r--[-rwxr-xr-x]scripts/runqemu-export-rootfs (renamed from scripts/poky-export-rootfs)6
-rw-r--r--[-rwxr-xr-x]scripts/runqemu-extract-sdk (renamed from scripts/poky-extract-sdk)4
-rw-r--r--[-rwxr-xr-x]scripts/runqemu-gen-tapdevs (renamed from scripts/poky-gen-tapdevs)0
-rwxr-xr-xscripts/runqemu-ifup2
-rwxr-xr-xscripts/runqemu-internal12
16 files changed, 24 insertions, 23 deletions
diff --git a/.gitignore b/.gitignore
index c563983906..b13086deb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ build/tmp/
7build/sstate-cache 7build/sstate-cache
8build/pyshtables.py 8build/pyshtables.py
9pstage/ 9pstage/
10scripts/poky-git-proxy-socks 10scripts/oe-git-proxy-socks
11sources/ 11sources/
12meta-darwin 12meta-darwin
13meta-maemo 13meta-maemo
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 7d31d04a24..b2325b3a6d 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -216,7 +216,7 @@ rootfs_trim_schemas () {
216 do 216 do
217 # Need this in case no files exist 217 # Need this in case no files exist
218 if [ -e $schema ]; then 218 if [ -e $schema ]; then
219 poky-trim-schemas $schema > $schema.new 219 oe-trim-schemas $schema > $schema.new
220 mv $schema.new $schema 220 mv $schema.new $schema
221 fi 221 fi
222 done 222 done
diff --git a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
index 10d3e64ae8..15f872beff 100644
--- a/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
@@ -11,13 +11,13 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5
11 11
12SRC_URI = "file://${COREBASE}/scripts/runqemu \ 12SRC_URI = "file://${COREBASE}/scripts/runqemu \
13 file://${COREBASE}/scripts/runqemu-internal \ 13 file://${COREBASE}/scripts/runqemu-internal \
14 file://${COREBASE}/scripts/poky-addptable2image \ 14 file://${COREBASE}/scripts/runqemu-addptable2image \
15 file://${COREBASE}/scripts/poky-gen-tapdevs \ 15 file://${COREBASE}/scripts/runqemu-gen-tapdevs \
16 file://${COREBASE}/scripts/runqemu-ifup \ 16 file://${COREBASE}/scripts/runqemu-ifup \
17 file://${COREBASE}/scripts/runqemu-ifdown \ 17 file://${COREBASE}/scripts/runqemu-ifdown \
18 file://${COREBASE}/scripts/poky-find-native-sysroot \ 18 file://${COREBASE}/scripts/oe-find-native-sysroot \
19 file://${COREBASE}/scripts/poky-extract-sdk \ 19 file://${COREBASE}/scripts/runqemu-extract-sdk \
20 file://${COREBASE}/scripts/poky-export-rootfs \ 20 file://${COREBASE}/scripts/runqemu-export-rootfs \
21 file://tunctl.c \ 21 file://tunctl.c \
22 file://raw2flash.c \ 22 file://raw2flash.c \
23 " 23 "
@@ -34,7 +34,8 @@ do_compile() {
34 34
35do_install() { 35do_install() {
36 install -d ${D}${bindir} 36 install -d ${D}${bindir}
37 install -m 0755 ${WORKDIR}${COREBASE}/scripts/poky-* ${D}${bindir}/ 37 install -m 0755 ${WORKDIR}${COREBASE}/scripts/oe-* ${D}${bindir}/
38 install -m 0755 ${WORKDIR}${COREBASE}/scripts/runqemu* ${D}${bindir}/
38 install tunctl ${D}${bindir}/ 39 install tunctl ${D}${bindir}/
39 install raw2flash.spitz ${D}${bindir}/ 40 install raw2flash.spitz ${D}${bindir}/
40 install flash2raw.spitz ${D}${bindir}/ 41 install flash2raw.spitz ${D}${bindir}/
diff --git a/scripts/poky-find-native-sysroot b/scripts/oe-find-native-sysroot
index d44fd9536e..da00a07850 100755..100644
--- a/scripts/poky-find-native-sysroot
+++ b/scripts/oe-find-native-sysroot
@@ -8,7 +8,7 @@
8# This script is intended to be run within other scripts by source'ing 8# This script is intended to be run within other scripts by source'ing
9# it, e.g: 9# it, e.g:
10# 10#
11# SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot` 11# SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot`
12# . $SYSROOT_SETUP_SCRIPT 12# . $SYSROOT_SETUP_SCRIPT
13# 13#
14# This script will terminate execution of your calling program unless 14# This script will terminate execution of your calling program unless
diff --git a/scripts/poky-git-proxy-command b/scripts/oe-git-proxy-command
index d31f85abd8..d31f85abd8 100755..100644
--- a/scripts/poky-git-proxy-command
+++ b/scripts/oe-git-proxy-command
diff --git a/scripts/oe-git-proxy-socks-command b/scripts/oe-git-proxy-socks-command
new file mode 100644
index 0000000000..90fa14e1ed
--- /dev/null
+++ b/scripts/oe-git-proxy-socks-command
@@ -0,0 +1,2 @@
1#! /bin/bash
2oe-git-proxy-socks -S $GIT_PROXY_HOST:$GIT_PROXY_PORT $@
diff --git a/scripts/poky-git-proxy-socks.c b/scripts/oe-git-proxy-socks.c
index f5747117ab..f5747117ab 100644
--- a/scripts/poky-git-proxy-socks.c
+++ b/scripts/oe-git-proxy-socks.c
diff --git a/scripts/poky-setup-rpmrepo b/scripts/oe-setup-rpmrepo
index 03372b6199..03372b6199 100755..100644
--- a/scripts/poky-setup-rpmrepo
+++ b/scripts/oe-setup-rpmrepo
diff --git a/scripts/poky-trim-schemas b/scripts/oe-trim-schemas
index 29fb3a1b67..29fb3a1b67 100755..100644
--- a/scripts/poky-trim-schemas
+++ b/scripts/oe-trim-schemas
diff --git a/scripts/poky-git-proxy-socks-command b/scripts/poky-git-proxy-socks-command
deleted file mode 100755
index a5af2d33fa..0000000000
--- a/scripts/poky-git-proxy-socks-command
+++ /dev/null
@@ -1,2 +0,0 @@
1#! /bin/bash
2poky-git-proxy-socks -S $GIT_PROXY_HOST:$GIT_PROXY_PORT $@
diff --git a/scripts/poky-addptable2image b/scripts/runqemu-addptable2image
index f0195ad8a3..f0195ad8a3 100755..100644
--- a/scripts/poky-addptable2image
+++ b/scripts/runqemu-addptable2image
diff --git a/scripts/poky-export-rootfs b/scripts/runqemu-export-rootfs
index 764d19a823..0076768d20 100755..100644
--- a/scripts/poky-export-rootfs
+++ b/scripts/runqemu-export-rootfs
@@ -38,9 +38,9 @@ fi
38# Ensure the nfs-export-dir is an absolute path 38# Ensure the nfs-export-dir is an absolute path
39NFS_EXPORT_DIR=$(cd "$2" && pwd) 39NFS_EXPORT_DIR=$(cd "$2" && pwd)
40 40
41SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot` 41SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot`
42if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then 42if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
43 echo "Error: Unable to find the poky-find-native-sysroot script" 43 echo "Error: Unable to find the oe-find-native-sysroot script"
44 echo "Did you forget to source your Poky environment script?" 44 echo "Did you forget to source your Poky environment script?"
45 exit 1 45 exit 1
46fi 46fi
@@ -73,7 +73,7 @@ export PSEUDO_LOCALSTATEDIR
73 73
74if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then 74if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then
75 echo "Error: $PSEUDO_LOCALSTATEDIR does not exist." 75 echo "Error: $PSEUDO_LOCALSTATEDIR does not exist."
76 echo "Did you create the export directory using poky-extract-sdk?" 76 echo "Did you create the export directory using runqemu-extract-sdk?"
77 exit 1 77 exit 1
78fi 78fi
79 79
diff --git a/scripts/poky-extract-sdk b/scripts/runqemu-extract-sdk
index ee2682e74a..ed349dd306 100755..100644
--- a/scripts/poky-extract-sdk
+++ b/scripts/runqemu-extract-sdk
@@ -29,9 +29,9 @@ if [ $# -ne 2 ]; then
29 exit 1 29 exit 1
30fi 30fi
31 31
32SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot` 32SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot`
33if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then 33if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
34 echo "Error: Unable to find the poky-find-native-sysroot script" 34 echo "Error: Unable to find the oe-find-native-sysroot script"
35 echo "Did you forget to source your Poky environment script?" 35 echo "Did you forget to source your Poky environment script?"
36 exit 1 36 exit 1
37fi 37fi
diff --git a/scripts/poky-gen-tapdevs b/scripts/runqemu-gen-tapdevs
index 527c01e7b4..527c01e7b4 100755..100644
--- a/scripts/poky-gen-tapdevs
+++ b/scripts/runqemu-gen-tapdevs
diff --git a/scripts/runqemu-ifup b/scripts/runqemu-ifup
index c963af5df9..a3914140a6 100755
--- a/scripts/runqemu-ifup
+++ b/scripts/runqemu-ifup
@@ -14,7 +14,7 @@
14# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown 14# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown
15# 15#
16# If you'd like to create a bank of tap devices at once, you should use 16# If you'd like to create a bank of tap devices at once, you should use
17# the poky-gen-tapdevs script instead. If tap devices are set up using 17# the runqemu-gen-tapdevs script instead. If tap devices are set up using
18# that script, the runqemu script will never end up calling this 18# that script, the runqemu script will never end up calling this
19# script. 19# script.
20# 20#
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 64374f2076..adf2b47aae 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -83,7 +83,7 @@ fi
83if [ -z "$mem_set" ] ; then 83if [ -z "$mem_set" ] ; then
84 SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size" 84 SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size"
85fi 85fi
86# This file is created when poky-gen-tapdevs creates a bank of tap 86# This file is created when runqemu-gen-tapdevs creates a bank of tap
87# devices, indicating that the user should not bring up new ones using 87# devices, indicating that the user should not bring up new ones using
88# sudo. 88# sudo.
89NOSUDO_FLAG="/etc/poky-nosudo" 89NOSUDO_FLAG="/etc/poky-nosudo"
@@ -186,8 +186,8 @@ cleanup() {
186 186
187 if [ "$NFSRUNNING" = "true" ]; then 187 if [ "$NFSRUNNING" = "true" ]; then
188 echo "Shutting down the userspace NFS server..." 188 echo "Shutting down the userspace NFS server..."
189 echo "poky-export-rootfs stop $ROOTFS" 189 echo "runqemu-export-rootfs stop $ROOTFS"
190 poky-export-rootfs stop $ROOTFS 190 runqemu-export-rootfs stop $ROOTFS
191 fi 191 fi
192 # If QEMU crashes or somehow tty properties are not restored 192 # If QEMU crashes or somehow tty properties are not restored
193 # after qemu exits, we need to run stty sane 193 # after qemu exits, we need to run stty sane
@@ -258,8 +258,8 @@ if [ "$FSTYPE" = "nfs" ]; then
258 fi 258 fi
259 259
260 # Start the userspace NFS server 260 # Start the userspace NFS server
261 echo "poky-export-rootfs restart $ROOTFS" 261 echo "runqemu-export-rootfs restart $ROOTFS"
262 poky-export-rootfs restart $ROOTFS 262 runqemu-export-rootfs restart $ROOTFS
263 if [ $? != 0 ]; then 263 if [ $? != 0 ]; then
264 cleanup 264 cleanup
265 return 265 return
@@ -351,7 +351,7 @@ if [ "$MACHINE" = "spitz" ]; then
351 echo $ROOTFS 351 echo $ROOTFS
352 if [ ! -e "$ROOTFS.qemudisk" ]; then 352 if [ ! -e "$ROOTFS.qemudisk" ]; then
353 echo "Adding a partition table to the ext3 image for use by QEMU, please wait..." 353 echo "Adding a partition table to the ext3 image for use by QEMU, please wait..."
354 poky-addptable2image $ROOTFS $ROOTFS.qemudisk 354 runqemu-addptable2image $ROOTFS $ROOTFS.qemudisk
355 fi 355 fi
356 QEMUOPTIONS="$QEMU_NETWORK_CMD -M spitz -hda $ROOTFS.qemudisk -portrait" 356 QEMUOPTIONS="$QEMU_NETWORK_CMD -M spitz -hda $ROOTFS.qemudisk -portrait"
357 fi 357 fi