cr-daily-branch: Only set TREE_SEABIOS for seabios flights

For all other flights we want to use the Config.mk settings.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/ap-common b/ap-common
index 537f60571a33cb9f1ed785918da89405c6d65ce3..ea4b04c3f3ab63303c0ca152940eb3ac4bdd2eea 100644 (file)
--- a/ap-common
+++ b/ap-common
@@ -47,7 +47,7 @@
 : ${TREE_RUMPUSERXEN_RUMPSRC:=https://github.com/rumpkernel/rumpkernel-netbsd-src}
 : ${TREEVCS_RUMPUSERXEN_RUMPSRC:=git}
 
-: ${TREE_SEABIOS:=git://git.seabios.org/seabios.git}
+: ${TREE_SEABIOS_UPSTREAM:=git://git.seabios.org/seabios.git}
 : ${PUSH_TREE_SEABIOS:=$XENBITS:/home/xen/git/osstest/seabios.git}
 : ${BASE_TREE_SEABIOS:=git://xenbits.xen.org/osstest/seabios.git}
 

diff --git a/ap-fetch-version b/ap-fetch-version
index 638ab6d955d337da257a863e5d492afd0a49e8c0..9c189b47fc43035cf512f3151383fc8185a69af3 100755 (executable)
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -87,7 +87,7 @@ rumpuserxen)
        ;;
 seabios)
        repo_tree_rev_fetch_git seabios \
-               $TREE_SEABIOS master $LOCALREV_SEABIOS
+               $TREE_SEABIOS_UPSTREAM master $LOCALREV_SEABIOS
        ;;
 osstest)
        if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then

diff --git a/ap-print-url b/ap-print-url
index 077cdff05b791431e2246ead9b4b236dbf977a76..a14d2a60a42d00d7d3d88afa2b279be47d7df932 100755 (executable)
--- a/ap-print-url
+++ b/ap-print-url
@@ -59,7 +59,7 @@ rumpuserxen)
        echo $TREE_RUMPUSERXEN
        ;;
 seabios)
-       echo $TREE_SEABIOS
+       echo $TREE_SEABIOS_UPSTREAM
        ;;
 osstest)
        echo none:;

diff --git a/cr-daily-branch b/cr-daily-branch
index f280ba765d9c625256bf13b79dc5a5dedb976669..15143976771f7bc486a7a9be9f4e616492995939 100755 (executable)
--- a/cr-daily-branch
+++ b/cr-daily-branch
@@ -138,6 +138,8 @@ if [ "x$REVISION_LINUX_ARM" = x ]; then
 fi
 if [ "x$REVISION_SEABIOS" = x ]; then
     if [ "x$tree" = "xseabios" ]; then
+       TREE_SEABIOS=$TREE_SEABIOS_UPSTREAM
+       export TREE_SEABIOS
        determine_version REVISION_SEABIOS seabios
        export REVISION_SEABIOS
     else