Adding possibility to specify a git branch when using lb config --config.

5 files changed, 30 insertions, 16 deletions

diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1
index 4d6952cb9..ca4f6eef5 100644
--- a/manpages/de/lb_config.de.1
+++ b/manpages/de/lb_config.de.1
@@ -64,7 +64,7 @@
 .br
   [\fB\-\-compression\fP bzip2|gzip|lzip|none]
 .br
-  [\fB\-\-config\fP \fIGIT_URL\fP]
+  [\fB\-\-config\fP \fIGIT_URL::GIT_BRANCH\fP]
 .br
   [\fB\-\-build\-with\-chroot\fP true|false]
 .br
@@ -393,8 +393,9 @@ images it can save some time by not calculating the checksums.
 .IP "\fB\-\-compression\fP bzip2|gzip|lzip|none" 4
 defines the compression program to be used to compress tarballs. Defaults to
 gzip.
-.IP "\fB\-\-config\fP \fIGIT_URL\fP" 4
-allows to bootstrap a config tree from a git repositories.
+.IP "\fB\-\-config\fP \fIGIT_URL\fP::\fIGIT_BRANCH\fP" 4
+allows to bootstrap a config tree from a git repositories, optionally
+appended by a branch.
 .IP "\fB\-\-build\-with\-chroot\fP true|false" 4
 defines whetever live\-build should use the tools from within the chroot to
 build the binary image or not by using and including the host systems
diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1
index 9c7d6c070..bce714d16 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -59,7 +59,7 @@
 .br
 	[\fB\-\-compression\fR bzip2|gzip|lzip|none]
 .br
-	[\fB\-\-config\fR \fIGIT_URL\fR]
+	[\fB\-\-config\fR \fIGIT_URL::GIT_BRANCH\fR]
 .br
 	[\fB\-\-build\-with\-chroot\fR true|false]
 .br
@@ -303,8 +303,8 @@ sets which stages should be cached. By default set to bootstrap. As an exception
 defines if the binary image should contain a file called md5sums.txt, sha1sums.txt and/or sha256sums.txt. These lists all files on the image together with their checksums. This in turn can be used by live\-boots built\-in integrity\-check to verify the medium if specified at boot prompt. In general, this should not be false and is an important feature of live system released to the public. However, during development of very big images it can save some time by not calculating the checksums.
 .IP "\fB\-\-compression\fR bzip2|gzip|lzip|none" 4
 defines the compression program to be used to compress tarballs. Defaults to gzip.
-.IP "\fB\-\-config\fR \fIGIT_URL\fR" 4
-allows to bootstrap a config tree from a git repositories.
+.IP "\fB\-\-config\fR \fIGIT_URL\fR::\fIGIT_BRANCH\fR" 4
+allows to bootstrap a config tree from a git repositories, optionally appended by a branch.
 .IP "\fB\-\-build\-with\-chroot\fR true|false" 4
 defines whetever live\-build should use the tools from within the chroot to build the binary image or not by using and including the host systems tools. This is a very dangerous option, using the tools of the host system can lead to tainted and even non-bootable images if the host systems version of the required tools (mainly these are the bootloaders such as syslinux, grub and yaboot, and the auxilliary tools such as dosfstools, genisoimage, squashfs-tools and others) do not \fBexactely\fR match what is present at build-time in the target distribution. Never do disable this option unless you are \fBexactely\fR sure what you are doing and have \fBcompletely\fI understood its consequences.
 .IP "\fB\-\-chroot\-filesystem\fR ext2|ext3|ext4|squashfs|jffs2|none" 4
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index 5a8431500..59507bc9f 100644
--- a/manpages/po/de/lb_config.1.po
+++ b/manpages/po/de/lb_config.1.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-07-29 02:00+0300\n"
+"POT-Creation-Date: 2012-07-29 23:23+0300\n"
 "PO-Revision-Date: 2012-02-04 21:39+0100\n"
 "Last-Translator: Automatically generated\n"
 "Language-Team: none\n"
@@ -707,7 +707,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:63
-msgid "  [B<--config> I<GIT_URL>]"
+msgid "  [B<--config> I<GIT_URL::GIT_BRANCH>]"
 msgstr ""
 
 #. type: Plain text
@@ -1570,12 +1570,14 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:306
 #, no-wrap
-msgid "B<--config> I<GIT_URL>"
+msgid "B<--config> I<GIT_URL>::I<GIT_BRANCH>"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:308
-msgid "allows to bootstrap a config tree from a git repositories."
+msgid ""
+"allows to bootstrap a config tree from a git repositories, optionally "
+"appended by a branch."
 msgstr ""
 
 #. type: IP
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 23199ff89..be6188895 100644
--- a/manpages/pot/lb_config.1.pot
+++ b/manpages/pot/lb_config.1.pot
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2012-07-29 02:00+0300\n"
+"POT-Creation-Date: 2012-07-29 23:23+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -707,7 +707,7 @@ msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:63
-msgid "  [B<--config> I<GIT_URL>]"
+msgid "  [B<--config> I<GIT_URL::GIT_BRANCH>]"
 msgstr ""
 
 #. type: Plain text
@@ -1570,12 +1570,14 @@ msgstr ""
 #. type: IP
 #: en/lb_config.1:306
 #, no-wrap
-msgid "B<--config> I<GIT_URL>"
+msgid "B<--config> I<GIT_URL>::I<GIT_BRANCH>"
 msgstr ""
 
 #. type: Plain text
 #: en/lb_config.1:308
-msgid "allows to bootstrap a config tree from a git repositories."
+msgid ""
+"allows to bootstrap a config tree from a git repositories, optionally "
+"appended by a branch."
 msgstr ""
 
 #. type: IP
diff --git a/scripts/build/lb_config b/scripts/build/lb_config
index 9bc1f2a24..466f04f7c 100755
--- a/scripts/build/lb_config
+++ b/scripts/build/lb_config
@@ -42,7 +42,7 @@ USAGE="${PROGRAM}   [--apt apt|aptitude]\n\
 \t    [--cache-stages STAGE|\"STAGES\"]\n\
 \t    [--checksums md5|sha1|sha256|none]\n\
 \t    [--compression bzip2|gzip|lzip|xz|none]\n\
-\t    [--config GIT_URL]\n\
+\t    [--config GIT_URL::GIT_BRANCH]\n\
 \t    [--zsync true|false]\n\
 \t    [--build-with-chroot true|false]\n\
 \t    [--chroot-filesystem ext2|ext3|ext4|squashfs|jffs2|none]\n\
@@ -872,7 +872,16 @@ fi
 
 if [ -n "${_CONFIG}" ]
 then
-	git clone ${_CONFIG} ./
+	_GIT_REPOSITORY="$(echo ${_CONFIG} | sed -e 's|::.*$||')"
+
+	git clone ${_GIT_REPOSITORY} ./
+
+	if [ "${_GIT_REPOSITORY}" != "${_CONFIG}" ]
+	then
+		_GIT_BRANCH="$(echo ${_CONFIG} | awk -F\:\: '{ print $NF }')"
+
+		git checkout ${_GIT_BRANCH}
+	fi
 fi
 
 # Read meta config