summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Gstädtner <thomas@gstaedtner.net>2011-10-21 17:40:42 +0200
committerStefan Reinauer <stefan.reinauer@coreboot.org>2011-10-21 21:52:01 +0200
commitcc97c560bbddbaf11b79c6cb3257f41d245e26dc (patch)
treeddf28d4260553508b361a2dc8085bc3d91e6fbe0
parenteb7a900f63752517ba6e6378215cdc34bcd1c0dc (diff)
downloadcoreboot-cc97c560bbddbaf11b79c6cb3257f41d245e26dc.tar.xz
FILO: Change FILO Makefile.inc from SVN to GIT
This commit replaces the old svn checkout code for the external FILO payload with a git checkout for the new repo on gerrit. The stable checkout is implemented similarly to the former SVN variant, it checks out a specific commit (same commit as svn r136 which was checked out before). The HEAD checkout gets the master branch from http://review.coreboot.org/p/filo.git In future this should probably be changed to a stable tag or repo. It is necessary to remove the old svn checkout by hand (or run distclean), because I did not include code to remove an existing svn FILO checkout. Change-Id: I08a703f3428ae7b987f7079a4901be4cf6d7e505 Signed-off-by: Thomas Gstädtner <thomas@gstaedtner.net> Reviewed-on: http://review.coreboot.org/308 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
-rw-r--r--payloads/external/FILO/Makefile.inc13
1 files changed, 9 insertions, 4 deletions
diff --git a/payloads/external/FILO/Makefile.inc b/payloads/external/FILO/Makefile.inc
index 0641c317b2..229b8be8d4 100644
--- a/payloads/external/FILO/Makefile.inc
+++ b/payloads/external/FILO/Makefile.inc
@@ -1,6 +1,6 @@
TAG-$(CONFIG_FILO_MASTER)=
NAME-$(CONFIG_FILO_MASTER)=HEAD
-TAG-$(CONFIG_FILO_STABLE)=-r 139
+TAG-$(CONFIG_FILO_STABLE)=4dbb31a64fe5b1c7e3025ab34619220609897646
NAME-$(CONFIG_FILO_STABLE)=STABLE
unexport KCONFIG_AUTOCONFIG
@@ -8,10 +8,15 @@ unexport KCONFIG_AUTOCONFIG
all: filo
checkout:
- echo " SVN FILO $(NAME-y)"
+ echo " GIT FILO $(NAME-y)"
test -d filo || \
- svn co svn://coreboot.org/filo/trunk/filo $(TAG-y)
- cd filo; svn update $(TAG-y)
+ git clone http://review.coreboot.org/p/filo.git
+ cd filo && \
+ git checkout master && \
+ git pull; \
+ test -n $(TAG-y) && \
+ git branch -f $(NAME-y) $(TAG-y) && \
+ git checkout $(NAME-y)
config: libpayload
echo " CONFIG FILO $(NAME-y)"