]> xenbits.xensource.com Git - people/royger/osstest.git/commitdiff
cr-daily-branch: seabios: "usually" use xen-tested-master
authorIan Jackson <ian.jackson@eu.citrix.com>
Fri, 3 May 2019 13:38:53 +0000 (13:38 +0000)
committerIan Jackson <ian.jackson@eu.citrix.com>
Wed, 15 May 2019 10:10:14 +0000 (11:10 +0100)
This branch is supposed to be suitable for all versions of Xen.
Conversely, older versions of seabios do not build on newer
compilers (as provided, eg, in stretch).

So, for "branches" other than xen-unstable and xen-unstable-smoke, use
the usual "determine_version" machinery, which will select
xen-tested-master for branches other than the ovmf branch itself.

No change for the seabios "branch", nor for xen-unstable*.  The effect
is to switch xen-*-testing, qemu-*, linux-*, etc., to all use ovmf
xen-tested-master.

This commit is identical to the corresponding one relating to ovmf,
  c9d1e5896fe2246d17d436f05a9960a66ea55426
  cr-daily-branch: ovmf: "usually" use xen-tested-master
mutandis mutandi.  Verified with
  diff -u <(git-show c9d1e5896fe2246d17d436f05a9960a66ea55426) <(git-diff | sed 's/SEABIOS/OVMF/g; s/seabios/ovmf/g') |less

A cursory examination of the standalone-generate-dump-flight-runvars
output revealed what seemed to be the expected changes and nothing
untoward.

Acked-by: Wei Liu <wei.liu2@citrix.com>
CC: Anthony PERARD <anthony.perard@citrix.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
cr-daily-branch

index 00b713b3220291eec1b7253fbcd15cc3df560f81..82e20c7945e10573ee5e5d55e35df6669eb92962 100755 (executable)
@@ -194,14 +194,17 @@ if [ "x$REVISION_LINUX_ARM" = x ]; then
     fi
 fi
 if [ "x$REVISION_SEABIOS" = x ]; then
-    if [ "x$tree" = "xseabios" ]; then
+    case "$branch" in
+    xen-unstable*)
+       : REVISION_SEABIOS from Config.mk
+       ;;
+    *)
        TREE_SEABIOS=$TREE_SEABIOS_UPSTREAM
        export TREE_SEABIOS
        determine_version REVISION_SEABIOS seabios SEABIOS
        export REVISION_SEABIOS
-    else
-       : REVISION_SEABIOS from Config.mk
-    fi
+       ;;
+    esac
 fi
 if [ "x$REVISION_OVMF" = x ]; then
     case "$branch" in