Browse Source

syslinux: Updated (4.06 -> 6.03)

tc-work
Nagy Károly Gábriel 9 years ago
parent
commit
d95822b60c
3 changed files with 112 additions and 9 deletions
  1. +97
    -0
      x86/syslinux/gcc-fix-alignment.patch
  2. +12
    -6
      x86/syslinux/syslinux.conf
  3. +3
    -3
      x86/syslinux/syslinux.desc

+ 97
- 0
x86/syslinux/gcc-fix-alignment.patch

@ -0,0 +1,97 @@
# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../syslinux/gcc-fix-alignment.patch
# Copyright (C) 2016 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
From e5f2b577ded109291c9632dacb6eaa621d8a59fe 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 1/1] 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>
---
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
--- a/core/i386/syslinux.ld
+++ b/core/i386/syslinux.ld
@@ -266,7 +266,7 @@ SECTIONS
__text_end = .;
}
- . = ALIGN(16);
+ . = ALIGN(32);
__rodata_vma = .;
__rodata_lma = __rodata_vma + __text_lma - __text_vma;
@@ -361,7 +361,7 @@ SECTIONS
__dynamic_end = .;
}
- . = ALIGN(16);
+ . = ALIGN(32);
__data_vma = .;
__data_lma = __data_vma + __text_lma - __text_vma;
@@ -377,7 +377,7 @@ SECTIONS
__pm_code_dwords = (__pm_code_len + 3) >> 2;
. = ALIGN(128);
-
+
__bss_vma = .;
__bss_lma = .; /* Dummy */
.bss (NOLOAD) : AT (__bss_lma) {
diff --git a/core/x86_64/syslinux.ld b/core/x86_64/syslinux.ld
index 1057112..bf815c4 100644
--- a/core/x86_64/syslinux.ld
+++ b/core/x86_64/syslinux.ld
@@ -266,7 +266,7 @@ SECTIONS
__text_end = .;
}
- . = ALIGN(16);
+ . = ALIGN(32);
__rodata_vma = .;
__rodata_lma = __rodata_vma + __text_lma - __text_vma;
@@ -361,7 +361,7 @@ SECTIONS
__dynamic_end = .;
}
- . = ALIGN(16);
+ . = ALIGN(32);
__data_vma = .;
__data_lma = __data_vma + __text_lma - __text_vma;
@@ -377,7 +377,7 @@ SECTIONS
__pm_code_dwords = (__pm_code_len + 3) >> 2;
. = ALIGN(128);
-
+
__bss_vma = .;
__bss_lma = .; /* Dummy */
.bss (NOLOAD) : AT (__bss_lma) {
--
2.4.10.GIT

+ 12
- 6
x86/syslinux/syslinux.conf

@ -2,7 +2,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../syslinux/syslinux.conf
# Copyright (C) 2008 The OpenSDE Project
# Copyright (C) 2008 - 2016 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
@ -14,13 +14,19 @@
# GNU General Public License can be found in the file COPYING.
# --- SDE-COPYRIGHT-NOTE-END ---
# syslinux community wants people to rebuild *only* ITARGETS, which
# is empty currently (3.70)
# 3.70: clean + all fails when the host is x86_64
## let's build'em all
#hook_add premake 2 "$MAKE $makeopt clean"
makeopt=
var_remove GCC2_WRAPPER_INSERT ' ' "-fstack-protector"
var_remove GCC3_WRAPPER_INSERT ' ' "-fstack-protector"
syslinux_prepare() {
echo "" > mk/devel.mk
sed 's|> /dev/null 2>&1||' -i efi/check-gnu-efi.sh
}
hook_add premake 5 'syslinux_prepare'
# for now we only build bios
# TODO add efi32 and efi64 to $targets
targets='bios'
var_append makeopt ' ' '$targets'
var_append makeinstopt ' ' '$targets'

+ 3
- 3
x86/syslinux/syslinux.desc

@ -3,7 +3,7 @@
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch.
[COPY]
[COPY] Filename: package/.../syslinux/syslinux.desc
[COPY] Copyright (C) 2006 - 2012 The OpenSDE Project
[COPY] Copyright (C) 2006 - 2016 The OpenSDE Project
[COPY] Copyright (C) 2004 - 2006 The T2 SDE Project
[COPY] Copyright (C) 1998 - 2003 Clifford Wolf
[COPY]
@ -34,8 +34,8 @@
[L] GPL
[S] Stable
[V] 4.06
[V] 6.03
[P] X -?---5---9 179.500
[D] 399156817 syslinux-4.06.tar.bz2 http://www.kernel.org/pub/linux/utils/boot/syslinux/
[D] 338716884 syslinux-6.03.tar.gz http://www.kernel.org/pub/linux/utils/boot/syslinux/

Loading…
Cancel
Save