From cc97c560bbddbaf11b79c6cb3257f41d245e26dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Gst=C3=A4dtner?= Date: Fri, 21 Oct 2011 17:40:42 +0200 Subject: [PATCH] FILO: Change FILO Makefile.inc from SVN to GIT MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-on: http://review.coreboot.org/308 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- payloads/external/FILO/Makefile.inc | 13 +++++++++---- 1 file 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)"