From 64a9c0645984811bd4ced478f1e27b8428393e3e Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 23 May 2014 10:26:26 +0100 Subject: [PATCH] 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 Acked-by: Ian Jackson --- ap-common | 2 +- ap-fetch-version | 2 +- ap-print-url | 2 +- cr-daily-branch | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/ap-common b/ap-common index 537f605..ea4b04c 100644 --- 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 638ab6d..9c189b4 100755 --- 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 077cdff..a14d2a6 100755 --- 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 f280ba7..1514397 100755 --- 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 -- 2.39.5