* [PATCH v8 9/9] qemu-binfmt-conf.sh: add --test
@ 2020-03-07 17:44 Unai Martinez-Corral
0 siblings, 0 replies; 2+ messages in thread
From: Unai Martinez-Corral @ 2020-03-07 17:44 UTC (permalink / raw)
To: qemu-devel; +Cc: riku.voipio, laurent
Signed-off-by: Unai Martinez-Corral <unai.martinezcorral@ehu.eus>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
scripts/qemu-binfmt-conf.sh | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 9685456747..4635871e6d 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -201,8 +201,7 @@ Options and associated environment variables:
Argument Env-variable Description
TARGETS QEMU_TARGETS A single arch name or a list of them (see all names below);
- if empty, configure/clear all known targets;
- if 'NONE', no interpreter is configured.
+ if empty, configure/clear all known targets.
-h|--help display this usage
-Q|--path PATH QEMU_PATH set path to qemu interpreter(s)
-F|--suffix SUFFIX QEMU_SUFFIX add a suffix to the default interpreter name
@@ -212,6 +211,8 @@ TARGETS QEMU_TARGETS A single arch name or a list of them (see
to the binary to interpret
-r|--clear QEMU_CLEAR (yes) remove registered interpreters for target TARGETS;
then exit.
+-t|--test QEMU_TEST (yes) test the setup with the provided arguments, but do not
+ configure any of the interpreters.
-e|--exportdir PATH define where to write configuration files
(default: $SYSTEMDDIR or $DEBIANDIR)
-s|--systemd don't write into /proc, generate file(s) for
@@ -225,6 +226,7 @@ QEMU_SUFFIX=$QEMU_SUFFIX
QEMU_PERSISTENT=$QEMU_PERSISTENT
QEMU_CREDENTIAL=$QEMU_CREDENTIAL
QEMU_CLEAR=$QEMU_CLEAR
+QEMU_TEST=$QEMU_TEST
To import templates with update-binfmts, use :
@@ -323,9 +325,6 @@ qemu_set_binfmts() {
# reduce the list of target interpreters to those given in the CLI
targets=${@:-$QEMU_TARGET}
- if [ "x$targets" = "xNONE" ] ; then
- return
- fi
qemu_check_target_list $targets
# register the interpreter for each target except for the native one
@@ -377,12 +376,16 @@ QEMU_SUFFIX="${QEMU_SUFFIX:-}"
QEMU_PERSISTENT="${QEMU_PERSISTENT:-no}"
QEMU_CREDENTIAL="${QEMU_CREDENTIAL:-no}"
QEMU_CLEAR="${QEMU_CLEAR:-no}"
+QEMU_TEST="${QEMU_TEST:-no}"
-options=$(getopt -o rdsQ:S:e:hcp -l clear,debian,systemd,path:,suffix:,exportdir:,help,credential,persistent -- "$@")
+options=$(getopt -o trdsQ:S:e:hcp -l test,clear,debian,systemd,path:,suffix:,exportdir:,help,credential,persistent -- "$@")
eval set -- "$options"
while true ; do
case "$1" in
+ -t|--test)
+ QEMU_TEST="yes"
+ ;;
-r|--clear)
QEMU_CLEAR="yes"
;;
@@ -431,6 +434,11 @@ shift
$CHECK
+if [ "x$QEMU_TEST" = "xyes" ] ; then
+ BINFMT_SET=:
+ BINFMT_CLEAR=:
+fi
+
if [ "x$QEMU_CLEAR" = "xyes" ] ; then
qemu_check_target_list "$@"
for t in $checked_target_list ; do
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH v8 9/9] qemu-binfmt-conf.sh: add --test
2020-03-07 17:04 [PATCH v8 0/9] qemu-binfmt-conf.sh unai.martinezcorral
@ 2020-03-07 18:56 ` Unai Martinez-Corral
0 siblings, 0 replies; 2+ messages in thread
From: Unai Martinez-Corral @ 2020-03-07 18:56 UTC (permalink / raw)
To: qemu-devel; +Cc: riku.voipio, laurent
Signed-off-by: Unai Martinez-Corral <unai.martinezcorral@ehu.eus>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
---
scripts/qemu-binfmt-conf.sh | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/scripts/qemu-binfmt-conf.sh b/scripts/qemu-binfmt-conf.sh
index 9685456747..4635871e6d 100755
--- a/scripts/qemu-binfmt-conf.sh
+++ b/scripts/qemu-binfmt-conf.sh
@@ -201,8 +201,7 @@ Options and associated environment variables:
Argument Env-variable Description
TARGETS QEMU_TARGETS A single arch name or a list of them (see all names below);
- if empty, configure/clear all known targets;
- if 'NONE', no interpreter is configured.
+ if empty, configure/clear all known targets.
-h|--help display this usage
-Q|--path PATH QEMU_PATH set path to qemu interpreter(s)
-F|--suffix SUFFIX QEMU_SUFFIX add a suffix to the default interpreter name
@@ -212,6 +211,8 @@ TARGETS QEMU_TARGETS A single arch name or a list of them (see
to the binary to interpret
-r|--clear QEMU_CLEAR (yes) remove registered interpreters for target TARGETS;
then exit.
+-t|--test QEMU_TEST (yes) test the setup with the provided arguments, but do not
+ configure any of the interpreters.
-e|--exportdir PATH define where to write configuration files
(default: $SYSTEMDDIR or $DEBIANDIR)
-s|--systemd don't write into /proc, generate file(s) for
@@ -225,6 +226,7 @@ QEMU_SUFFIX=$QEMU_SUFFIX
QEMU_PERSISTENT=$QEMU_PERSISTENT
QEMU_CREDENTIAL=$QEMU_CREDENTIAL
QEMU_CLEAR=$QEMU_CLEAR
+QEMU_TEST=$QEMU_TEST
To import templates with update-binfmts, use :
@@ -323,9 +325,6 @@ qemu_set_binfmts() {
# reduce the list of target interpreters to those given in the CLI
targets=${@:-$QEMU_TARGET}
- if [ "x$targets" = "xNONE" ] ; then
- return
- fi
qemu_check_target_list $targets
# register the interpreter for each target except for the native one
@@ -377,12 +376,16 @@ QEMU_SUFFIX="${QEMU_SUFFIX:-}"
QEMU_PERSISTENT="${QEMU_PERSISTENT:-no}"
QEMU_CREDENTIAL="${QEMU_CREDENTIAL:-no}"
QEMU_CLEAR="${QEMU_CLEAR:-no}"
+QEMU_TEST="${QEMU_TEST:-no}"
-options=$(getopt -o rdsQ:S:e:hcp -l clear,debian,systemd,path:,suffix:,exportdir:,help,credential,persistent -- "$@")
+options=$(getopt -o trdsQ:S:e:hcp -l test,clear,debian,systemd,path:,suffix:,exportdir:,help,credential,persistent -- "$@")
eval set -- "$options"
while true ; do
case "$1" in
+ -t|--test)
+ QEMU_TEST="yes"
+ ;;
-r|--clear)
QEMU_CLEAR="yes"
;;
@@ -431,6 +434,11 @@ shift
$CHECK
+if [ "x$QEMU_TEST" = "xyes" ] ; then
+ BINFMT_SET=:
+ BINFMT_CLEAR=:
+fi
+
if [ "x$QEMU_CLEAR" = "xyes" ] ; then
qemu_check_target_list "$@"
for t in $checked_target_list ; do
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-03-07 18:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-03-07 17:44 [PATCH v8 9/9] qemu-binfmt-conf.sh: add --test Unai Martinez-Corral
-- strict thread matches above, loose matches on Subject: below --
2020-03-07 17:04 [PATCH v8 0/9] qemu-binfmt-conf.sh unai.martinezcorral
2020-03-07 18:56 ` [PATCH v8 9/9] qemu-binfmt-conf.sh: add --test Unai Martinez-Corral
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).