Rename the remaining poky-* scripts to oe-* or runqemu-*
(From OE-Core rev: 877b3d84597fcfc3abf5aa332019d412f2717896) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
0b70e298fb
commit
2c2e61743c
|
@ -7,7 +7,7 @@ build/tmp/
|
||||||
build/sstate-cache
|
build/sstate-cache
|
||||||
build/pyshtables.py
|
build/pyshtables.py
|
||||||
pstage/
|
pstage/
|
||||||
scripts/poky-git-proxy-socks
|
scripts/oe-git-proxy-socks
|
||||||
sources/
|
sources/
|
||||||
meta-darwin
|
meta-darwin
|
||||||
meta-maemo
|
meta-maemo
|
||||||
|
|
|
@ -216,7 +216,7 @@ rootfs_trim_schemas () {
|
||||||
do
|
do
|
||||||
# Need this in case no files exist
|
# Need this in case no files exist
|
||||||
if [ -e $schema ]; then
|
if [ -e $schema ]; then
|
||||||
poky-trim-schemas $schema > $schema.new
|
oe-trim-schemas $schema > $schema.new
|
||||||
mv $schema.new $schema
|
mv $schema.new $schema
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
|
@ -11,13 +11,13 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/tunctl.c;endline=4;md5=ff3a09996bc5fff6bc5
|
||||||
|
|
||||||
SRC_URI = "file://${COREBASE}/scripts/runqemu \
|
SRC_URI = "file://${COREBASE}/scripts/runqemu \
|
||||||
file://${COREBASE}/scripts/runqemu-internal \
|
file://${COREBASE}/scripts/runqemu-internal \
|
||||||
file://${COREBASE}/scripts/poky-addptable2image \
|
file://${COREBASE}/scripts/runqemu-addptable2image \
|
||||||
file://${COREBASE}/scripts/poky-gen-tapdevs \
|
file://${COREBASE}/scripts/runqemu-gen-tapdevs \
|
||||||
file://${COREBASE}/scripts/runqemu-ifup \
|
file://${COREBASE}/scripts/runqemu-ifup \
|
||||||
file://${COREBASE}/scripts/runqemu-ifdown \
|
file://${COREBASE}/scripts/runqemu-ifdown \
|
||||||
file://${COREBASE}/scripts/poky-find-native-sysroot \
|
file://${COREBASE}/scripts/oe-find-native-sysroot \
|
||||||
file://${COREBASE}/scripts/poky-extract-sdk \
|
file://${COREBASE}/scripts/runqemu-extract-sdk \
|
||||||
file://${COREBASE}/scripts/poky-export-rootfs \
|
file://${COREBASE}/scripts/runqemu-export-rootfs \
|
||||||
file://tunctl.c \
|
file://tunctl.c \
|
||||||
file://raw2flash.c \
|
file://raw2flash.c \
|
||||||
"
|
"
|
||||||
|
@ -34,7 +34,8 @@ do_compile() {
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
install -d ${D}${bindir}
|
install -d ${D}${bindir}
|
||||||
install -m 0755 ${WORKDIR}${COREBASE}/scripts/poky-* ${D}${bindir}/
|
install -m 0755 ${WORKDIR}${COREBASE}/scripts/oe-* ${D}${bindir}/
|
||||||
|
install -m 0755 ${WORKDIR}${COREBASE}/scripts/runqemu* ${D}${bindir}/
|
||||||
install tunctl ${D}${bindir}/
|
install tunctl ${D}${bindir}/
|
||||||
install raw2flash.spitz ${D}${bindir}/
|
install raw2flash.spitz ${D}${bindir}/
|
||||||
install flash2raw.spitz ${D}${bindir}/
|
install flash2raw.spitz ${D}${bindir}/
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
# This script is intended to be run within other scripts by source'ing
|
# This script is intended to be run within other scripts by source'ing
|
||||||
# it, e.g:
|
# it, e.g:
|
||||||
#
|
#
|
||||||
# SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot`
|
# SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot`
|
||||||
# . $SYSROOT_SETUP_SCRIPT
|
# . $SYSROOT_SETUP_SCRIPT
|
||||||
#
|
#
|
||||||
# This script will terminate execution of your calling program unless
|
# This script will terminate execution of your calling program unless
|
|
@ -0,0 +1,2 @@
|
||||||
|
#! /bin/bash
|
||||||
|
oe-git-proxy-socks -S $GIT_PROXY_HOST:$GIT_PROXY_PORT $@
|
|
@ -1,2 +0,0 @@
|
||||||
#! /bin/bash
|
|
||||||
poky-git-proxy-socks -S $GIT_PROXY_HOST:$GIT_PROXY_PORT $@
|
|
|
@ -38,9 +38,9 @@ fi
|
||||||
# Ensure the nfs-export-dir is an absolute path
|
# Ensure the nfs-export-dir is an absolute path
|
||||||
NFS_EXPORT_DIR=$(cd "$2" && pwd)
|
NFS_EXPORT_DIR=$(cd "$2" && pwd)
|
||||||
|
|
||||||
SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot`
|
SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot`
|
||||||
if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
|
if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
|
||||||
echo "Error: Unable to find the poky-find-native-sysroot script"
|
echo "Error: Unable to find the oe-find-native-sysroot script"
|
||||||
echo "Did you forget to source your Poky environment script?"
|
echo "Did you forget to source your Poky environment script?"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
@ -73,7 +73,7 @@ export PSEUDO_LOCALSTATEDIR
|
||||||
|
|
||||||
if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then
|
if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then
|
||||||
echo "Error: $PSEUDO_LOCALSTATEDIR does not exist."
|
echo "Error: $PSEUDO_LOCALSTATEDIR does not exist."
|
||||||
echo "Did you create the export directory using poky-extract-sdk?"
|
echo "Did you create the export directory using runqemu-extract-sdk?"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -29,9 +29,9 @@ if [ $# -ne 2 ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
SYSROOT_SETUP_SCRIPT=`which poky-find-native-sysroot`
|
SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot`
|
||||||
if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
|
if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
|
||||||
echo "Error: Unable to find the poky-find-native-sysroot script"
|
echo "Error: Unable to find the oe-find-native-sysroot script"
|
||||||
echo "Did you forget to source your Poky environment script?"
|
echo "Did you forget to source your Poky environment script?"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
|
@ -14,7 +14,7 @@
|
||||||
# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown
|
# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown
|
||||||
#
|
#
|
||||||
# If you'd like to create a bank of tap devices at once, you should use
|
# 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
|
# the runqemu-gen-tapdevs script instead. If tap devices are set up using
|
||||||
# that script, the runqemu script will never end up calling this
|
# that script, the runqemu script will never end up calling this
|
||||||
# script.
|
# script.
|
||||||
#
|
#
|
||||||
|
|
|
@ -83,7 +83,7 @@ fi
|
||||||
if [ -z "$mem_set" ] ; then
|
if [ -z "$mem_set" ] ; then
|
||||||
SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size"
|
SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size"
|
||||||
fi
|
fi
|
||||||
# This file is created when poky-gen-tapdevs creates a bank of tap
|
# This file is created when runqemu-gen-tapdevs creates a bank of tap
|
||||||
# devices, indicating that the user should not bring up new ones using
|
# devices, indicating that the user should not bring up new ones using
|
||||||
# sudo.
|
# sudo.
|
||||||
NOSUDO_FLAG="/etc/poky-nosudo"
|
NOSUDO_FLAG="/etc/poky-nosudo"
|
||||||
|
@ -186,8 +186,8 @@ cleanup() {
|
||||||
|
|
||||||
if [ "$NFSRUNNING" = "true" ]; then
|
if [ "$NFSRUNNING" = "true" ]; then
|
||||||
echo "Shutting down the userspace NFS server..."
|
echo "Shutting down the userspace NFS server..."
|
||||||
echo "poky-export-rootfs stop $ROOTFS"
|
echo "runqemu-export-rootfs stop $ROOTFS"
|
||||||
poky-export-rootfs stop $ROOTFS
|
runqemu-export-rootfs stop $ROOTFS
|
||||||
fi
|
fi
|
||||||
# If QEMU crashes or somehow tty properties are not restored
|
# If QEMU crashes or somehow tty properties are not restored
|
||||||
# after qemu exits, we need to run stty sane
|
# after qemu exits, we need to run stty sane
|
||||||
|
@ -258,8 +258,8 @@ if [ "$FSTYPE" = "nfs" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Start the userspace NFS server
|
# Start the userspace NFS server
|
||||||
echo "poky-export-rootfs restart $ROOTFS"
|
echo "runqemu-export-rootfs restart $ROOTFS"
|
||||||
poky-export-rootfs restart $ROOTFS
|
runqemu-export-rootfs restart $ROOTFS
|
||||||
if [ $? != 0 ]; then
|
if [ $? != 0 ]; then
|
||||||
cleanup
|
cleanup
|
||||||
return
|
return
|
||||||
|
@ -351,7 +351,7 @@ if [ "$MACHINE" = "spitz" ]; then
|
||||||
echo $ROOTFS
|
echo $ROOTFS
|
||||||
if [ ! -e "$ROOTFS.qemudisk" ]; then
|
if [ ! -e "$ROOTFS.qemudisk" ]; then
|
||||||
echo "Adding a partition table to the ext3 image for use by QEMU, please wait..."
|
echo "Adding a partition table to the ext3 image for use by QEMU, please wait..."
|
||||||
poky-addptable2image $ROOTFS $ROOTFS.qemudisk
|
runqemu-addptable2image $ROOTFS $ROOTFS.qemudisk
|
||||||
fi
|
fi
|
||||||
QEMUOPTIONS="$QEMU_NETWORK_CMD -M spitz -hda $ROOTFS.qemudisk -portrait"
|
QEMUOPTIONS="$QEMU_NETWORK_CMD -M spitz -hda $ROOTFS.qemudisk -portrait"
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue