[Buildroot] [git commit] syslinux: use Git formatted patches

[Buildroot] [git commit] syslinux: use Git formatted patches

[Thomas Petazzoni]

commit: https://git.buildroot.net/buildroot/commit/?id=34da6a65adae8463149a28c560926f3349142c2a
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

In preparation for the addition of more patches to the syslinux
package, reformat the two existing patches as proper Git formatted
patches.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
 ...001-bios-Fix-alignment-change-with-gcc-5.patch} | 30 +++++++++++++---------
 .../0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch | 30 ++++++++++++++++++++++
 boot/syslinux/0002-disable-pie.patch               | 22 ----------------
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/boot/syslinux/0001-Fix-gcc-5-ALIGN-causing-Boot-error.patch b/boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch
similarity index 66%
rename from boot/syslinux/0001-Fix-gcc-5-ALIGN-causing-Boot-error.patch
rename to boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch
index 2df6766..633d996 100644
--- a/boot/syslinux/0001-Fix-gcc-5-ALIGN-causing-Boot-error.patch
+++ b/boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch
@@ -1,16 +1,19 @@
-commit e5f2b577ded109291c9632dacb6eaa621d8a59fe
-Author: Sylvain Gault <sylvain.gault@gmail.com>
-Date:   Tue Sep 29 02:38:25 2015 +0200
+From da5cbd1a3b248f2d32281a1766a3d1414c0e8e03 Mon Sep 17 00:00:00 2001
+From: Sylvain Gault <sylvain.gault@gmail.com>
+Date: Tue, 29 Sep 2015 02:38:25 +0200
+Subject: [PATCH] bios: Fix alignment change with gcc 5
 
-    bios: Fix alignment change with gcc 5
-    
-    The section aligment specified in the ld scripts have to be greater or
-    equal to those in the .o files generated by gcc.
-    
-    Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com>
-    Tested-by: poma <pomidorabelisima@gmail.com>
-    Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
-    Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
+The section aligment specified in the ld scripts have to be greater or
+equal to those in the .o files generated by gcc.
+
+Signed-off-by: Sylvain Gault <sylvain.gault@gmail.com>
+Tested-by: poma <pomidorabelisima@gmail.com>
+Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
+Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com>
+---
+ core/i386/syslinux.ld   | 6 +++---
+ core/x86_64/syslinux.ld | 6 +++---
+ 2 files changed, 6 insertions(+), 6 deletions(-)
 
 diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld
 index 7b4e012..7390451 100644
@@ -74,3 +77,6 @@ index 1057112..bf815c4 100644
  	__bss_vma = .;
  	__bss_lma = .;		/* Dummy */
  	.bss (NOLOAD) : AT (__bss_lma) {
+-- 
+2.7.4
+
diff --git a/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch b/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch
new file mode 100644
index 0000000..64a08b8
--- /dev/null
+++ b/boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch
@@ -0,0 +1,30 @@
+From 250bf2c921713434627dc7bc8b0918fa0841f9b7 Mon Sep 17 00:00:00 2001
+From: Graham Inggs <ginggs@ubuntu.com>
+Date: Wed, 5 Apr 2017 22:03:12 +0200
+Subject: [PATCH] Disable PIE to avoid FTBFS on amd64
+
+gcc 6.x has PIE support enabled by default, which causes a build issue
+with syslinux. This patch disables PIE support in the relevant
+syslinux Makefile.
+
+Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
+---
+ gpxe/src/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gpxe/src/Makefile b/gpxe/src/Makefile
+index cc91d78..077af64 100644
+--- a/gpxe/src/Makefile
++++ b/gpxe/src/Makefile
+@@ -4,7 +4,7 @@
+ #
+ 
+ CLEANUP		:=
+-CFLAGS		:=
++CFLAGS		:= -fno-PIE
+ ASFLAGS		:=
+ LDFLAGS		:=
+ MAKEDEPS	:= Makefile
+-- 
+2.7.4
+
diff --git a/boot/syslinux/0002-disable-pie.patch b/boot/syslinux/0002-disable-pie.patch
deleted file mode 100644
index b31b622..0000000
--- a/boot/syslinux/0002-disable-pie.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Disable PIE to avoid FTBFS on amd64
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1579023
-Author: Graham Inggs <ginggs@ubuntu.com>
-Last-Update: 2016-05-06
-
-gcc 6.x has PIE support enabled by default, which causes a build issue
-with syslinux. This patch disables PIE support in the relevant
-syslinux Makefile.
-
-Signed-off-by: Ryan Coe <bluemrp9@gmail.com>
-
---- a/gpxe/src/Makefile
-+++ b/gpxe/src/Makefile
-@@ -4,7 +4,7 @@
- #
-
- CLEANUP		:=
--CFLAGS		:=
-+CFLAGS		:= -fno-PIE
- ASFLAGS		:=
- LDFLAGS		:=
- MAKEDEPS	:= Makefile

[Buildroot] [git commit] syslinux: use Git formatted patches

[Baruch Siach]

Hi Thomas,

On Wed, Apr 05, 2017 at 10:06:06PM +0200, Thomas Petazzoni wrote:
> commit: https://git.buildroot.net/buildroot/commit/?id=34da6a65adae8463149a28c560926f3349142c2a
> branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> 
> In preparation for the addition of more patches to the syslinux
> package, reformat the two existing patches as proper Git formatted
> patches.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> ---
>  ...001-bios-Fix-alignment-change-with-gcc-5.patch} | 30 +++++++++++++---------
>  .../0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch | 30 ++++++++++++++++++++++
>  boot/syslinux/0002-disable-pie.patch               | 22 ----------------
>  3 files changed, 48 insertions(+), 34 deletions(-)

There are actually three patches here, the last of which is removed. Is that 
intentional?

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [git commit] syslinux: use Git formatted patches

[Thomas Petazzoni]

Hello,

On Thu, 6 Apr 2017 06:45:41 +0300, Baruch Siach wrote:

> On Wed, Apr 05, 2017 at 10:06:06PM +0200, Thomas Petazzoni wrote:
> > commit: https://git.buildroot.net/buildroot/commit/?id=34da6a65adae8463149a28c560926f3349142c2a
> > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> > 
> > In preparation for the addition of more patches to the syslinux
> > package, reformat the two existing patches as proper Git formatted
> > patches.
> > 
> > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > ---
> >  ...001-bios-Fix-alignment-change-with-gcc-5.patch} | 30 +++++++++++++---------
> >  .../0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch | 30 ++++++++++++++++++++++
> >  boot/syslinux/0002-disable-pie.patch               | 22 ----------------
> >  3 files changed, 48 insertions(+), 34 deletions(-)  
> 
> There are actually three patches here, the last of which is removed. Is that 
> intentional?

Either I'm missing something or you got confused by the rename
detection of Git.

There were originally two patches, and there are two patches after my
change. For the first patch, the similarity was high enough that Git
detects it as a rename. For the second patch, Git didn't detect it as a
rename so you see the addition of
0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch and the removal of
0002-disable-pie.patch.

Does that make sense?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[Buildroot] [git commit] syslinux: use Git formatted patches

[Baruch Siach]

Hi Thomas,

On Thu, Apr 06, 2017 at 07:59:53AM +0200, Thomas Petazzoni wrote:
> On Thu, 6 Apr 2017 06:45:41 +0300, Baruch Siach wrote:
> > On Wed, Apr 05, 2017 at 10:06:06PM +0200, Thomas Petazzoni wrote:
> > > commit: https://git.buildroot.net/buildroot/commit/?id=34da6a65adae8463149a28c560926f3349142c2a
> > > branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master
> > > 
> > > In preparation for the addition of more patches to the syslinux
> > > package, reformat the two existing patches as proper Git formatted
> > > patches.
> > > 
> > > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
> > > ---
> > >  ...001-bios-Fix-alignment-change-with-gcc-5.patch} | 30 +++++++++++++---------
> > >  .../0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch | 30 ++++++++++++++++++++++
> > >  boot/syslinux/0002-disable-pie.patch               | 22 ----------------
> > >  3 files changed, 48 insertions(+), 34 deletions(-)  
> > 
> > There are actually three patches here, the last of which is removed. Is that 
> > intentional?
> 
> Either I'm missing something or you got confused by the rename
> detection of Git.
> 
> There were originally two patches, and there are two patches after my
> change. For the first patch, the similarity was high enough that Git
> detects it as a rename. For the second patch, Git didn't detect it as a
> rename so you see the addition of
> 0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch and the removal of
> 0002-disable-pie.patch.
> 
> Does that make sense?

Makes sense. Thanks for clarifying.

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -