| Message ID | 1363731698-15414-1-git-send-email-daniel.price@gmail.com |
|---|---|
| State | Accepted |
| Commit | c12b0672264dc8c7ef0039d0c2aa6a58d6ae9bfb |
| Headers | show |
> -----Original Message----- > From: buildroot-bounces@busybox.net [mailto:buildroot-bounces@busybox.net] On > Behalf Of Daniel Price > Sent: 19 March 2013 22:22 > > Signed-off-by: Daniel Price <daniel.price@gmail.com> I have tested this on my vortex86dx 32 bit x86 clone booting from a USB flash drive and it works for me. But how *should* I use git to add a Tested-by line to the patch? Your git advice welcomed ... > --- > boot/syslinux/syslinux-build-fix-for-uuid.patch | 15 --------------- > boot/syslinux/syslinux.mk | 2 +- > 2 files changed, 1 insertions(+), 16 deletions(-) > delete mode 100644 boot/syslinux/syslinux-build-fix-for-uuid.patch > > diff --git a/boot/syslinux/syslinux-build-fix-for-uuid.patch > b/boot/syslinux/syslinux-build-fix-for-uuid.patch > deleted file mode 100644 > index 04ff562..0000000 > --- a/boot/syslinux/syslinux-build-fix-for-uuid.patch > +++ /dev/null > @@ -1,15 +0,0 @@ > -Author: Micah Gersten <micahg@ubuntu.com> > -Description: Fix build failure with --as-needed (Closes: #654838). > - > -diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile > ---- syslinux.orig/utils/Makefile 2011-12-23 14:53:26.653571511 +0100 > -+++ syslinux/utils/Makefile 2012-01-22 18:55:03.849466924 +0100 > -@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl > - $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@ > - > - isohybrid: isohybrid.o isohdpfx.o > -- $(CC) $(LDFLAGS) -luuid -o $@ $^ > -+ $(CC) $(LDFLAGS) -o $@ $^ -luuid > - > - gethostip: gethostip.o > - $(CC) $(LDFLAGS) -o $@ $^ > diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk > index f63f2e0..046bdc3 100644 > --- a/boot/syslinux/syslinux.mk > +++ b/boot/syslinux/syslinux.mk > @@ -4,7 +4,7 @@ > # > ############################################################# > > -SYSLINUX_VERSION = 4.05 > +SYSLINUX_VERSION = 4.06 > SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.bz2 > SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/ > > -- > 1.7.6.5 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Dear Will Moore, On Thu, 21 Mar 2013 14:25:40 -0000, Will Moore wrote: > I have tested this on my vortex86dx 32 bit x86 clone booting from a USB flash > drive and it works for me. But how *should* I use git to add a Tested-by line > to the patch? Your git advice welcomed ... There's nothing that involves git to add your Tested-by line. Just reply to Daniel's e-mail, quoting the commit log and his Signed-off-by line, and add your own: Tested-by: My Name <my.name@somewhere.com> Our patchwork will automatically picks this up (unfortunately including this one, so Peter will have to remove it), and it will be part of the commit Peter will make. Best regards, Thomas
Hi Thomas, > -----Original Message----- > From: Thomas Petazzoni [mailto:thomas.petazzoni@free-electrons.com] > Sent: 21 March 2013 14:38 > To: Will Moore > Cc: 'Daniel Price'; buildroot@busybox.net > Subject: Re: [Buildroot] [PATCH] syslinux: bump to version 4.06 > > Dear Will Moore, > > On Thu, 21 Mar 2013 14:25:40 -0000, Will Moore wrote: > > > I have tested this on my vortex86dx 32 bit x86 clone booting from a USB > flash > > drive and it works for me. But how *should* I use git to add a Tested-by > line > > to the patch? Your git advice welcomed ... > > There's nothing that involves git to add your Tested-by line. Just > reply to Daniel's e-mail, quoting the commit log and his Signed-off-by > line, and add your own: Thanks, I had supposed it was something to do with git notes ... just showing my ignorance again. > -- snip -- > Our patchwork will automatically picks this up (unfortunately including > this one, so Peter will have to remove it), and it will be part of the > commit Peter will make. > > Best regards, > > Thomas > -- > Thomas Petazzoni, Free Electrons > Kernel, drivers, real-time and embedded Linux > development, consulting, training and support. > http://free-electrons.com
> -----Original Message----- > From: buildroot-bounces@busybox.net [mailto:buildroot-bounces@busybox.net] On > Behalf Of Daniel Price > Sent: 19 March 2013 22:22 > > Signed-off-by: Daniel Price <daniel.price@gmail.com> Tested-by: Will Moore <will.moore@beraninstruments.com> Works for me to boot a vortex86dx 32 bit x86 clone from a USB flash drive. > --- > boot/syslinux/syslinux-build-fix-for-uuid.patch | 15 --------------- > boot/syslinux/syslinux.mk | 2 +- > 2 files changed, 1 insertions(+), 16 deletions(-) > delete mode 100644 boot/syslinux/syslinux-build-fix-for-uuid.patch > > diff --git a/boot/syslinux/syslinux-build-fix-for-uuid.patch > b/boot/syslinux/syslinux-build-fix-for-uuid.patch > deleted file mode 100644 > index 04ff562..0000000 > --- a/boot/syslinux/syslinux-build-fix-for-uuid.patch > +++ /dev/null > @@ -1,15 +0,0 @@ > -Author: Micah Gersten <micahg@ubuntu.com> > -Description: Fix build failure with --as-needed (Closes: #654838). > - > -diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile > ---- syslinux.orig/utils/Makefile 2011-12-23 14:53:26.653571511 +0100 > -+++ syslinux/utils/Makefile 2012-01-22 18:55:03.849466924 +0100 > -@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl > - $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@ > - > - isohybrid: isohybrid.o isohdpfx.o > -- $(CC) $(LDFLAGS) -luuid -o $@ $^ > -+ $(CC) $(LDFLAGS) -o $@ $^ -luuid > - > - gethostip: gethostip.o > - $(CC) $(LDFLAGS) -o $@ $^ > diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk > index f63f2e0..046bdc3 100644 > --- a/boot/syslinux/syslinux.mk > +++ b/boot/syslinux/syslinux.mk > @@ -4,7 +4,7 @@ > # > ############################################################# > > -SYSLINUX_VERSION = 4.05 > +SYSLINUX_VERSION = 4.06 > SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.bz2 > SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/ > > -- > 1.7.6.5 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
> Signed-off-by: Daniel Price <daniel.price@gmail.com> Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
>>>>> "Daniel" == Daniel Price <daniel.price@gmail.com> writes:
Daniel> Signed-off-by: Daniel Price <daniel.price@gmail.com>
Committed, thanks.
diff --git a/boot/syslinux/syslinux-build-fix-for-uuid.patch b/boot/syslinux/syslinux-build-fix-for-uuid.patch deleted file mode 100644 index 04ff562..0000000 --- a/boot/syslinux/syslinux-build-fix-for-uuid.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Micah Gersten <micahg@ubuntu.com> -Description: Fix build failure with --as-needed (Closes: #654838). - -diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile ---- syslinux.orig/utils/Makefile 2011-12-23 14:53:26.653571511 +0100 -+++ syslinux/utils/Makefile 2012-01-22 18:55:03.849466924 +0100 -@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl - $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@ - - isohybrid: isohybrid.o isohdpfx.o -- $(CC) $(LDFLAGS) -luuid -o $@ $^ -+ $(CC) $(LDFLAGS) -o $@ $^ -luuid - - gethostip: gethostip.o - $(CC) $(LDFLAGS) -o $@ $^ diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index f63f2e0..046bdc3 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -4,7 +4,7 @@ # ############################################################# -SYSLINUX_VERSION = 4.05 +SYSLINUX_VERSION = 4.06 SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.bz2 SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
Signed-off-by: Daniel Price <daniel.price@gmail.com> --- boot/syslinux/syslinux-build-fix-for-uuid.patch | 15 --------------- boot/syslinux/syslinux.mk | 2 +- 2 files changed, 1 insertions(+), 16 deletions(-) delete mode 100644 boot/syslinux/syslinux-build-fix-for-uuid.patch