]> code.ossystems Code Review - openembedded-core.git/commitdiff
Rename poky-qemu to runqemu
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 20 Apr 2011 15:44:10 +0000 (16:44 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 20 Apr 2011 15:44:10 +0000 (16:44 +0100)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
20 files changed:
meta/recipes-devtools/qemu/qemu-helper-nativesdk_1.0.bb
scripts/oe-buildenv-internal
scripts/poky-gen-tapdevs
scripts/poky-setup-builddir
scripts/qemuimage-testlib
scripts/qemuimage-tests/sanity/boot
scripts/qemuimage-tests/sanity/compiler
scripts/qemuimage-tests/sanity/connman
scripts/qemuimage-tests/sanity/dmesg
scripts/qemuimage-tests/sanity/rpm_query
scripts/qemuimage-tests/sanity/scp
scripts/qemuimage-tests/sanity/shutdown
scripts/qemuimage-tests/sanity/ssh
scripts/qemuimage-tests/sanity/zypper_help
scripts/qemuimage-tests/sanity/zypper_search
scripts/runqemu [moved from scripts/poky-qemu with 99% similarity]
scripts/runqemu-ifdown [moved from scripts/poky-qemu-ifdown with 88% similarity]
scripts/runqemu-ifup [moved from scripts/poky-qemu-ifup with 90% similarity]
scripts/runqemu-internal [moved from scripts/poky-qemu-internal with 99% similarity]
scripts/runqemu.README [moved from scripts/poky-qemu.README with 92% similarity]

index 18d278db7a1e2ef16d0aed5b8829596cec608d50..effcabaf40525f7a2aa92dd476a04a06a0760add 100644 (file)
@@ -6,15 +6,15 @@ PR = "r9"
 FILESPATH = "${FILE_DIRNAME}/qemu-helper"
 
 LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5d4e0b4c28f999 \
-                    file://${POKYBASE}/scripts/poky-qemu;endline=18;md5=ce52af3dd295e20ad1d849611b83690b"
+                    file://${POKYBASE}/scripts/runqemu;endline=18;md5=ce52af3dd295e20ad1d849611b83690b"
 
 
-SRC_URI = "file://${POKYBASE}/scripts/poky-qemu \
-           file://${POKYBASE}/scripts/poky-qemu-internal \
+SRC_URI = "file://${POKYBASE}/scripts/runqemu \
+           file://${POKYBASE}/scripts/runqemu-internal \
            file://${POKYBASE}/scripts/poky-addptable2image \
            file://${POKYBASE}/scripts/poky-gen-tapdevs \
-           file://${POKYBASE}/scripts/poky-qemu-ifup \
-           file://${POKYBASE}/scripts/poky-qemu-ifdown \
+           file://${POKYBASE}/scripts/runqemu-ifup \
+           file://${POKYBASE}/scripts/runqemu-ifdown \
            file://${POKYBASE}/scripts/poky-find-native-sysroot \
            file://${POKYBASE}/scripts/poky-extract-sdk \
            file://${POKYBASE}/scripts/poky-export-rootfs \
index 03b078f299556ad8b41412490a41c519fcc59d18..7e77e43df6daf851936acdf467d0987f72d66ecc 100755 (executable)
@@ -51,7 +51,7 @@ fi
 PATH="${OEROOT}/scripts:$BITBAKEDIR/bin/:$PATH"
 unset BITBAKEDIR
 
-# Used by the poky-qemu script
+# Used by the runqemu script
 export BUILDDIR
 export PATH
 
index 2117a7b08eca8c99cdf7de8f8cfc89e67380ca84..527c01e7b4051d99cfb7d2c7bc9635c80f9d4916 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Create a "bank" of tap network devices that can be used by the
-# poky-qemu script. This script needs to be run as root, and will
+# runqemu script. This script needs to be run as root, and will
 # use the tunctl binary from a Poky sysroot. Note: many Linux distros
 # these days still use an older version of tunctl which does not
 # support the group permissions option, hence the need to use Poky's
@@ -51,9 +51,9 @@ if [[ ! -x "$TUNCTL" || -d "$TUNCTL" ]]; then
 fi
 
 SCRIPT_DIR=`dirname $0`
-POKY_QEMU_IFUP="$SCRIPT_DIR/poky-qemu-ifup"
+POKY_QEMU_IFUP="$SCRIPT_DIR/runqemu-ifup"
 if [ ! -x "$POKY_QEMU_IFUP" ]; then
-       echo "Error: Unable to find the poky-qemu-ifup script in $SCRIPT_DIR"
+       echo "Error: Unable to find the runqemu-ifup script in $SCRIPT_DIR"
        exit 1
 fi
 
@@ -79,7 +79,7 @@ for ((index=0; index < $COUNT; index++)); do
        fi
 done
 
-# The poky-qemu script will check for this file, and if it exists,
+# The runqemu script will check for this file, and if it exists,
 # will use the existing bank of tap devices without creating
 # additional ones via sudo.
 touch /etc/poky-nosudo
index b8a6dd95aedc9fa9aba440c27f917efcfcf9d52f..563d8e940d9d2ebb8060348e2f23f393023a2dab 100755 (executable)
@@ -108,6 +108,6 @@ Common targets are:
     meta-toolchain
     meta-toolchain-sdk
 
-You can also run generated qemu images with a command like 'poky-qemu qemux86'
+You can also run generated qemu images with a command like 'runqemu qemux86'
 
 EOM
index 720ee8f40758472e66855df08b0ca21b9f9a468a..c3cf7c1ec2a45eba1fddb2255258092816c0c010 100644 (file)
@@ -395,11 +395,11 @@ Test_Create_Qemu()
        local ret=1
        local up_time=0
 
-       which poky-qemu
+       which runqemu
        if [ $? -eq 0 ]; then
-               RUNQEMU=`which poky-qemu`
+               RUNQEMU=`which runqemu`
        else
-               Test_Error "Can not find poky-qemu in \$PATH, return fail"
+               Test_Error "Can not find runqemu in \$PATH, return fail"
                exit 1
        fi
        
index b75b9b9285de0015665b7138c496a20fa3ba668a..d3414d33d3cfff464f815b8633baa0d73d965707 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # Boot Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if qemu and qemu network is up.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
index 29dbfd9bb9b70426b75a88f0f4db607569352ed0..d224f33571a030bb4dac813efff4d94c85a8aee9 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Compiler Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if gcc/g++/make command can work in target.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
index fca6a2784580855c360e0563e7b5724f2646ae10..d46ef0a8900c9483ca598cf7070020454ecc52a4 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Conmman Check Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if connman can work in target.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
index 5ed31b735fbde16df308f4ccd64fec05c278891c..06a99485ca2582f42389b2266812c220295c3ae1 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Dmesg Check Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if there is any error log in dmesg.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
index 08017ffbe68aeb400a58174bb1cb703e095c905b..d42c4c49be3648350166a10542eb2be1b8e812cd 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # RPM Check Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if rpm command can work in target.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
index c72cdc9d654a792dae654c9c5c9db7aa92cf8f24..ce7279cdf87b46420626e66bfa4652131855f1df 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SCP Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if file can be copied into target with scp command.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
index bc08cf0fdc0a5ae7e3d5f135a86700b4b8999231..22662ab2572052881d972eeb962cfac4e48ec263 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Shutdown Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if target can shutdown
 # For qemux86/x86-64, we use command "poweroff" for target shutdown
 # For non-x86 targets, we use command "reboot" for target shutdown
index 2a0e934392b6a58e202523a7495d02917d50241c..e4a20dc73d05d599ee9d11ea6d55f60cd9af6f80 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # SSH Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if ssh service in qemu is up.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
index 1ab6d2407fe53695990660afd3bbc36d7c647022..6dafe5e1fdc0f9af0a73f39a37d17e03fbf3da5b 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Zypper Check Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if zypper command can work in target.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
index d6bcd27a34b0409db4f971dbc071f5c3610f37c5..b96cbdad665cfbb86e7c302ffcec9388196dcfa8 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Zypper Check Test Case for Sanity Test
-# The case boot up the Qemu target with `poky-qemu qemuxxx`.
+# The case boot up the Qemu target with `runqemu qemuxxx`.
 # Then check if zypper command can work in target.
 #
 # Author: Jiajun Xu <jiajun.xu@intel.com>
similarity index 99%
rename from scripts/poky-qemu
rename to scripts/runqemu
index c76b3ab7b6e4fa7d4d8ced3e80d305deb616b091..d155b561f150e3dca2f1e14d881e83133d6b4014 100755 (executable)
@@ -267,7 +267,7 @@ setup_tmpdir() {
             type -P bitbake &>/dev/null || {
                 echo "In order for this script to dynamically infer paths";
                 echo "to kernels or filesystem images, you either need";
-                echo "bitbake in your PATH or to source poky-init-build-env";
+                echo "bitbake in your PATH or to source oe-init-build-env";
                 echo "before running this script" >&2;
                 exit 1; }
 
@@ -394,6 +394,6 @@ if [ "$libgl" != 'yes' ]; then
     exit 1;
 fi
 
-INTERNAL_SCRIPT=`which poky-qemu-internal`
+INTERNAL_SCRIPT=`which runqemu-internal`
 
 . $INTERNAL_SCRIPT
similarity index 88%
rename from scripts/poky-qemu-ifdown
rename to scripts/runqemu-ifdown
index bc90a9c12d6d85ad4c2ace2a26313521b788f539..99613416c78ffe25a220367ed1a9b7c17363dcb3 100755 (executable)
@@ -8,8 +8,8 @@
 # the following to your /etc/sudoers file to be able to run this
 # command without entering your password each time:
 #
-# <my-username> ALL=NOPASSWD: /path/to/poky-qemu-ifup
-# <my-username> ALL=NOPASSWD: /path/to/poky-qemu-ifdown
+# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifup
+# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown
 #
 # Copyright (c) 2006-2010 Intel Corp.
 #
@@ -31,7 +31,7 @@ usage() {
 }
 
 if [ $EUID -ne 0 ]; then
-       echo "Error: This script (poky-qemu-ifdown) must be run with root privileges"
+       echo "Error: This script (runqemu-ifdown) must be run with root privileges"
        exit 1
 fi
 
similarity index 90%
rename from scripts/poky-qemu-ifup
rename to scripts/runqemu-ifup
index f82848ccce35fe10c1bf6c0870c2001e399b5b34..c963af5df903d4cb62902a9cf365167120e161ba 100755 (executable)
 # the following to your /etc/sudoers file to be able to run this
 # command without entering your password each time:
 #
-# <my-username> ALL=NOPASSWD: /path/to/poky-qemu-ifup
-# <my-username> ALL=NOPASSWD: /path/to/poky-qemu-ifdown
+# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifup
+# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown
 #
 # If you'd like to create a bank of tap devices at once, you should use
 # the poky-gen-tapdevs script instead. If tap devices are set up using
-# that script, the poky-qemu script will never end up calling this
+# that script, the runqemu script will never end up calling this
 # script.
 #
 # Copyright (c) 2006-2010 Intel Corp.
@@ -38,7 +38,7 @@ usage() {
 }
 
 if [ $EUID -ne 0 ]; then
-       echo "Error: This script (poky-qemu-ifup) must be run with root privileges"
+       echo "Error: This script (runqemu-ifup) must be run with root privileges"
        exit 1
 fi
 
similarity index 99%
rename from scripts/poky-qemu-internal
rename to scripts/runqemu-internal
index c88d71178b5dc54adf1fe8130d1fd84e61e7b29d..206e1cfe8ada8ea8c8099fcd23a41087c6eb2f98 100755 (executable)
@@ -88,8 +88,8 @@ fi
 # sudo.
 NOSUDO_FLAG="/etc/poky-nosudo"
 
-QEMUIFUP=`which poky-qemu-ifup`
-QEMUIFDOWN=`which poky-qemu-ifdown`
+QEMUIFUP=`which runqemu-ifup`
+QEMUIFDOWN=`which runqemu-ifdown`
 
 NFSRUNNING="false"
 
similarity index 92%
rename from scripts/poky-qemu.README
rename to scripts/runqemu.README
index ecceae978463f32a4cd7c0a35f27f165b5dcffed..12f1191ab75be7685cee029dd33b86dfa59c7200 100644 (file)
@@ -3,15 +3,15 @@ Poky images with QEMU
 
 Poky can generate qemu bootable kernels and images with can be used 
 on a desktop system. Both arm and x86 images can currently be booted.
-There are two scripts, runqemu and poky-qemu, one for use within poky, 
+There are two scripts, runqemu and runqemu, one for use within poky, 
 the other externally.
 
-QEMU outside Poky (poky-qemu)
+QEMU outside Poky (runqemu)
 =============================
 
-The poky-qemu script is run as: 
+The runqemu script is run as: 
 
-   MACHINE=<machine> poky-qemu <zimage> <filesystem>
+   MACHINE=<machine> runqemu <zimage> <filesystem>
 
 where: