mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-24 19:56:35 +00:00
syslinux: use Git formatted patches
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>
This commit is contained in:
parent
38b51739da
commit
34da6a65ad
@ -1,16 +1,19 @@
|
|||||||
commit e5f2b577ded109291c9632dacb6eaa621d8a59fe
|
From da5cbd1a3b248f2d32281a1766a3d1414c0e8e03 Mon Sep 17 00:00:00 2001
|
||||||
Author: Sylvain Gault <sylvain.gault@gmail.com>
|
From: Sylvain Gault <sylvain.gault@gmail.com>
|
||||||
Date: Tue Sep 29 02:38:25 2015 +0200
|
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.
|
||||||
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: Sylvain Gault <sylvain.gault@gmail.com>
|
Signed-off-by: Paulo Alcantara <pcacjr@zytor.com>
|
||||||
Tested-by: poma <pomidorabelisima@gmail.com>
|
Signed-off-by: Frank Hunleth <fhunleth@troodon-software.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
|
diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld
|
||||||
index 7b4e012..7390451 100644
|
index 7b4e012..7390451 100644
|
||||||
@ -74,3 +77,6 @@ index 1057112..bf815c4 100644
|
|||||||
__bss_vma = .;
|
__bss_vma = .;
|
||||||
__bss_lma = .; /* Dummy */
|
__bss_lma = .; /* Dummy */
|
||||||
.bss (NOLOAD) : AT (__bss_lma) {
|
.bss (NOLOAD) : AT (__bss_lma) {
|
||||||
|
--
|
||||||
|
2.7.4
|
||||||
|
|
30
boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch
Normal file
30
boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch
Normal file
@ -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
|
||||||
|
|
@ -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
|
|
Loading…
x
Reference in New Issue
Block a user