[syslinux] efi build dependent on git update

Geert Stappers stappers at stappers.nl
Sat Jan 3 10:21:27 PST 2015


On Thu, Jan 01, 2015 at 09:48:16AM -0500, Gene Cumm wrote:
> On Thu, Jan 1, 2015 at 7:13 AM, Geert Stappers <stappers op stappers.nl> wrote:
> >
> > Happy New Year!
> >
> >
> > On Tue, Dec 30, 2014 at 05:29:29PM +0100, Geert Stappers wrote:
> >> On Tue, Dec 30, 2014 at 09:34:57AM -0500, Michael Sumulong wrote:
> >> > On Mon, Dec 29, 2014 at 8:36 PM, Gene Cumm wrote:
> >> > >
> >> > > 1) patch to not call git when not present has been prepared for after
> >> > > 6.03 along with multiple other patches.
> >> >
> >> > 1) Sorry I didn't see that patch. I was just looking at
> >> > http://git.kernel.org/cgit/boot/syslinux/syslinux.git/
> >>
> >> Where the youngst patch is three month old.
> >>
> >> So where is the patch to not call git when not present?
> >
> > It is the `git clone` URL that I'm looking for ...
> 
> https://git.kernel.org/cgit/boot/syslinux/syslinux.git/
> 
>   git clone -o github-genec git://github.com/geneC/syslinux.git
>   git remote add github-genec git://github.com/geneC/syslinux.git
> 
> branch syslinux-6.04-prep


commit bd05078db307f16f3c40dd318f562c66dfe47268
Author: Gene Cumm <gene.cumm op gmail.com>
Date:   Tue Dec 23 12:07:40 2014 -0500

    efi: prevent git command in non-git tree #2
    
    efi/clean-gnu-efi.sh presumes it's in a git repo.  Test first.
    
    Signed-off-by: Gene Cumm <gene.cumm op gmail.com>

diff --git a/efi/clean-gnu-efi.sh b/efi/clean-gnu-efi.sh
index 84ed17a..58def28 100755
--- a/efi/clean-gnu-efi.sh
+++ b/efi/clean-gnu-efi.sh
@@ -23,7 +23,9 @@ objdir=$(readlink -f "$2")
 
 (
 	cd ../..
-	git submodule update --init
+	if [ -d .git ]; then
+	    git submodule update --init
+	fi
 )
 
 if [ -d "$objdir/gnu-efi" ];then

commit 87ab74f2071819849daed57bdb90297791264a5e
Author: Erwan Velu <erwanaliasr1 op gmail.com>
Date:   Tue Dec 23 12:04:46 2014 -0500

    efi: prevent git command in non-git tree
    
    efi/build-gnu-efi.sh presumes it's in a git repo.  Test first.
    
    Signed-off-by: Gene Cumm <gene.cumm op gmail.com>

diff --git a/efi/build-gnu-efi.sh b/efi/build-gnu-efi.sh
index c87e67c..e72d872 100755
--- a/efi/build-gnu-efi.sh
+++ b/efi/build-gnu-efi.sh
@@ -29,7 +29,9 @@ fi
 
 (
 	cd ../..
-	git submodule update --init
+	if [ -d .git ]; then
+	    git submodule update --init
+	fi
 )
 
 mkdir -p "$objdir/gnu-efi"

> I'm planning on doing the master
> branch (including the one behind the currently broken git daemon at
> git.zytor.com) in the next few days and review the patches for chain
> and lua.

Please do


Groeten
Geert Stappers
-- 
Leven en laten leven
------------- volgend deel ------------
Een niet-tekst bijlage is gescrubt...
Naam: prevent_git_command_in_nonGit-tree.patch
Type: text/x-diff
Grootte: 1248 bytes
Omschrijving: niet beschikbaar
URL : <http://www.zytor.com/pipermail/syslinux/attachments/20150103/af7f7016/attachment.bin>
------------- volgend deel ------------
Een niet-tekst bijlage is gescrubt...
Naam: signature.asc
Type: application/pgp-signature
Grootte: 836 bytes
Omschrijving: Digital signature
URL : <http://www.zytor.com/pipermail/syslinux/attachments/20150103/af7f7016/attachment.sig>


More information about the Syslinux mailing list