* [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master
@ 2019-05-15 10:07 Ian Jackson
2019-05-15 10:07 ` [Xen-devel] " Ian Jackson
2019-05-15 10:09 ` Wei Liu
0 siblings, 2 replies; 4+ messages in thread
From: Ian Jackson @ 2019-05-15 10:07 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Wei Liu, Ian Jackson
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.
CC: 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 | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/cr-daily-branch b/cr-daily-branch
index 00b713b3..82e20c79 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -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
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Xen-devel] [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master
2019-05-15 10:07 [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master Ian Jackson
@ 2019-05-15 10:07 ` Ian Jackson
2019-05-15 10:09 ` Wei Liu
1 sibling, 0 replies; 4+ messages in thread
From: Ian Jackson @ 2019-05-15 10:07 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Wei Liu, Ian Jackson
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.
CC: 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 | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/cr-daily-branch b/cr-daily-branch
index 00b713b3..82e20c79 100755
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -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
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master
2019-05-15 10:07 [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master Ian Jackson
2019-05-15 10:07 ` [Xen-devel] " Ian Jackson
@ 2019-05-15 10:09 ` Wei Liu
2019-05-15 10:09 ` [Xen-devel] " Wei Liu
1 sibling, 1 reply; 4+ messages in thread
From: Wei Liu @ 2019-05-15 10:09 UTC (permalink / raw)
To: Ian Jackson; +Cc: Anthony PERARD, xen-devel, Wei Liu
On Wed, May 15, 2019 at 11:07:23AM +0100, Ian Jackson wrote:
> 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.
>
> CC: Wei Liu <wei.liu2@citrix.com>
> CC: Anthony PERARD <anthony.perard@citrix.com>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Xen-devel] [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master
2019-05-15 10:09 ` Wei Liu
@ 2019-05-15 10:09 ` Wei Liu
0 siblings, 0 replies; 4+ messages in thread
From: Wei Liu @ 2019-05-15 10:09 UTC (permalink / raw)
To: Ian Jackson; +Cc: Anthony PERARD, xen-devel, Wei Liu
On Wed, May 15, 2019 at 11:07:23AM +0100, Ian Jackson wrote:
> 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.
>
> CC: Wei Liu <wei.liu2@citrix.com>
> CC: Anthony PERARD <anthony.perard@citrix.com>
> Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-15 10:09 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-15 10:07 [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master Ian Jackson
2019-05-15 10:07 ` [Xen-devel] " Ian Jackson
2019-05-15 10:09 ` Wei Liu
2019-05-15 10:09 ` [Xen-devel] " Wei Liu
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).