From: Ian Jackson <ian.jackson@eu.citrix.com> To: xen-devel@lists.xenproject.org Cc: Anthony PERARD <anthony.perard@citrix.com>, Wei Liu <wei.liu2@citrix.com>, Ian Jackson <ian.jackson@eu.citrix.com> Subject: [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master Date: Wed, 15 May 2019 11:07:23 +0100 [thread overview] Message-ID: <20190515100723.8269-1-ian.jackson@eu.citrix.com> (raw) 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
WARNING: multiple messages have this Message-ID (diff)
From: Ian Jackson <ian.jackson@eu.citrix.com> To: <xen-devel@lists.xenproject.org> Cc: Anthony PERARD <anthony.perard@citrix.com>, Wei Liu <wei.liu2@citrix.com>, Ian Jackson <ian.jackson@eu.citrix.com> Subject: [Xen-devel] [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master Date: Wed, 15 May 2019 11:07:23 +0100 [thread overview] Message-ID: <20190515100723.8269-1-ian.jackson@eu.citrix.com> (raw) Message-ID: <20190515100723.mFTSR5IE5ugwgSBRyGAYkNzDRSui4wogF0ujKncY4NE@z> (raw) 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
next reply other threads:[~2019-05-15 10:08 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-05-15 10:07 Ian Jackson [this message] 2019-05-15 10:07 ` [Xen-devel] [OSSTEST PATCH] cr-daily-branch: seabios: "usually" use xen-tested-master Ian Jackson 2019-05-15 10:09 ` Wei Liu 2019-05-15 10:09 ` [Xen-devel] " Wei Liu
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190515100723.8269-1-ian.jackson@eu.citrix.com \ --to=ian.jackson@eu.citrix.com \ --cc=anthony.perard@citrix.com \ --cc=wei.liu2@citrix.com \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).