diff options
author | Adrian Freihofer <adrian.freihofer@gmail.com> | 2023-06-22 19:01:25 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-24 12:21:48 +0100 |
commit | 14dcde95ec24182529ceecf6094a15254abbada8 (patch) | |
tree | 711108510964fbb2ee87d3481b4a57c73c3796c2 /scripts/runqemu-gen-tapdevs | |
parent | 292ca0207dfc376eb45d064f109eb229a0807e86 (diff) | |
download | poky-14dcde95ec24182529ceecf6094a15254abbada8.tar.gz |
runqemu-gen-tapdevs: remove staging dir parameter
The parameter staging_bindir_native is no longer used. Remove it.
For now the script is backward compatible. With 4 parameters it logs an
error message but still works.
(From OE-Core rev: c47322297fcd0408c5e290e74eee4344754e03e4)
Signed-off-by: Adrian Freihofer <adrian.freihofer@siemens.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/runqemu-gen-tapdevs')
-rwxr-xr-x | scripts/runqemu-gen-tapdevs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/scripts/runqemu-gen-tapdevs b/scripts/runqemu-gen-tapdevs index ec3ecb03b9..75547c1361 100755 --- a/scripts/runqemu-gen-tapdevs +++ b/scripts/runqemu-gen-tapdevs | |||
@@ -18,19 +18,22 @@ if [ -n "$SUDO_GID" ]; then | |||
18 | fi | 18 | fi |
19 | 19 | ||
20 | usage() { | 20 | usage() { |
21 | echo "Usage: sudo $0 <uid> <gid> <num> <staging_bindir_native>" | 21 | echo "Usage: sudo $0 <uid> <gid> <num>" |
22 | echo "Where <uid> is the numeric user id the tap devices will be owned by" | 22 | echo "Where <uid> is the numeric user id the tap devices will be owned by" |
23 | echo "Where <gid> is the numeric group id the tap devices will be owned by" | 23 | echo "Where <gid> is the numeric group id the tap devices will be owned by" |
24 | echo "<num> is the number of tap devices to create (0 to remove all)" | 24 | echo "<num> is the number of tap devices to create (0 to remove all)" |
25 | echo "<native-sysroot-basedir> is the path to the build system's native sysroot" | ||
26 | echo "For example:" | 25 | echo "For example:" |
27 | echo "$ bitbake qemu-helper-native" | 26 | echo "$ bitbake qemu-helper-native" |
28 | echo "$ sudo $0 $uid $gid 4 tmp/sysroots-components/x86_64/qemu-helper-native/usr/bin" | 27 | echo "$ sudo $0 $uid $gid 4" |
29 | echo "" | 28 | echo "" |
30 | exit 1 | 29 | exit 1 |
31 | } | 30 | } |
32 | 31 | ||
33 | if [ $# -ne 4 ]; then | 32 | # Allow passing 4 arguments for backward compatibility with warning |
33 | if [ $# -eq 4 ]; then | ||
34 | echo "Warning: The <native-sysroot-basedir> parameter is no longer needed. Ignoring." | ||
35 | fi | ||
36 | if [ $# -lt 3 ] || [ $# -gt 4 ]; then | ||
34 | echo "Error: Incorrect number of arguments" | 37 | echo "Error: Incorrect number of arguments" |
35 | usage | 38 | usage |
36 | fi | 39 | fi |
@@ -38,7 +41,6 @@ fi | |||
38 | TUID=$1 | 41 | TUID=$1 |
39 | GID=$2 | 42 | GID=$2 |
40 | COUNT=$3 | 43 | COUNT=$3 |
41 | STAGING_BINDIR_NATIVE=$4 | ||
42 | 44 | ||
43 | # check if COUNT is a number and >= 0 | 45 | # check if COUNT is a number and >= 0 |
44 | if ! [ $COUNT -ge 0 ]; then | 46 | if ! [ $COUNT -ge 0 ]; then |