diff --git a/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch b/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch index 78cceb6..00eef59 100644 --- a/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch +++ b/0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch @@ -1,4 +1,4 @@ -From ca745cdfc27b83b6bcef9f856d858a68c64429de Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Tue, 8 Apr 2014 15:28:12 -0400 Subject: [PATCH] Add "install-all target" to top side of HAVE_FIRMWARE. @@ -8,7 +8,7 @@ Subject: [PATCH] Add "install-all target" to top side of HAVE_FIRMWARE. 1 file changed, 10 insertions(+) diff --git a/Makefile b/Makefile -index b472945..6606d31 100644 +index b472945b..6606d319 100644 --- a/Makefile +++ b/Makefile @@ -275,6 +275,16 @@ efi64: @@ -28,5 +28,3 @@ index b472945..6606d31 100644 else # FIRMWARE all: all-local subdirs --- -2.5.5 diff --git a/0002-ext4-64bit-feature.patch b/0002-ext4-Fix-64bit-feature.patch similarity index 96% rename from 0002-ext4-64bit-feature.patch rename to 0002-ext4-Fix-64bit-feature.patch index 9efe878..4989bcd 100644 --- a/0002-ext4-64bit-feature.patch +++ b/0002-ext4-Fix-64bit-feature.patch @@ -1,4 +1,4 @@ -From af7e95c32cea40c1e443ae301e64b27f068b4915 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paulo Alcantara Date: Wed, 11 Oct 2017 07:00:31 -0400 Subject: [PATCH] ext4: Fix 64bit feature @@ -28,7 +28,7 @@ Signed-off-by: Paulo Alcantara 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/core/fs/ext2/ext2.c b/core/fs/ext2/ext2.c -index 76bd1d5..4bc0a53 100644 +index 76bd1d5a..4bc0a535 100644 --- a/core/fs/ext2/ext2.c +++ b/core/fs/ext2/ext2.c @@ -25,22 +25,17 @@ static enum dirent_type ext2_cvt_type(unsigned int d_file_type) @@ -85,7 +85,7 @@ index 76bd1d5..4bc0a53 100644 + EXT2_BLOCKS_PER_GROUP(fs) - 1) / EXT2_BLOCKS_PER_GROUP(fs); diff --git a/core/fs/ext2/ext2_fs.h b/core/fs/ext2/ext2_fs.h -index 803a995..d8d07eb 100644 +index 803a9954..d8d07ebd 100644 --- a/core/fs/ext2/ext2_fs.h +++ b/core/fs/ext2/ext2_fs.h @@ -278,6 +278,7 @@ struct ext2_sb_info { @@ -96,6 +96,3 @@ index 803a995..d8d07eb 100644 }; static inline struct ext2_sb_info *EXT2_SB(struct fs_info *fs) --- -2.7.4.GIT - diff --git a/0003-include-sysmacros-h.patch b/0003-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch similarity index 88% rename from 0003-include-sysmacros-h.patch rename to 0003-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch index a39019e..406d25e 100644 --- a/0003-include-sysmacros-h.patch +++ b/0003-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch @@ -1,4 +1,4 @@ -From 1a74985b2a404639b08882c57f3147229605dfd5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 19 Apr 2016 06:50:31 -0400 Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev @@ -17,7 +17,7 @@ Signed-off-by: Gene Cumm 1 file changed, 1 insertion(+) diff --git a/extlinux/main.c b/extlinux/main.c -index a7ebd49..ebff7ea 100644 +index a7ebd49a..ebff7eae 100644 --- a/extlinux/main.c +++ b/extlinux/main.c @@ -38,6 +38,7 @@ @@ -28,6 +28,3 @@ index a7ebd49..ebff7ea 100644 #include #include #include --- -2.10.5.GIT - diff --git a/0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch b/0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch index e55c490..ab35dbc 100644 --- a/0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch +++ b/0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch @@ -1,4 +1,4 @@ -From 5c24d725d5a5f50f0544fbcc544f08a3f9e90e5d Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Peter Jones Date: Thu, 8 Aug 2019 05:41:36 -0400 Subject: [PATCH] Add 'RPMOPTFLAGS' to CFLAGS for some stuff. @@ -11,7 +11,7 @@ Subject: [PATCH] Add 'RPMOPTFLAGS' to CFLAGS for some stuff. 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/extlinux/Makefile b/extlinux/Makefile -index 1721ee54aff..d504e23133e 100644 +index 1721ee54..d504e231 100644 --- a/extlinux/Makefile +++ b/extlinux/Makefile @@ -18,9 +18,9 @@ include $(MAKEDIR)/syslinux.mk @@ -27,7 +27,7 @@ index 1721ee54aff..d504e23133e 100644 SRCS = main.c \ mountinfo.c \ diff --git a/linux/Makefile b/linux/Makefile -index 5a49d813de1..9fed68d02c6 100644 +index 5a49d813..9fed68d0 100644 --- a/linux/Makefile +++ b/linux/Makefile @@ -18,8 +18,8 @@ include $(MAKEDIR)/syslinux.mk @@ -42,7 +42,7 @@ index 5a49d813de1..9fed68d02c6 100644 SRCS = syslinux.c \ ../libinstaller/syslxopt.c \ diff --git a/mtools/Makefile b/mtools/Makefile -index 632b185ba2f..b6e5ebdba6b 100755 +index 632b185b..b6e5ebdb 100755 --- a/mtools/Makefile +++ b/mtools/Makefile @@ -2,8 +2,8 @@ include $(MAKEDIR)/syslinux.mk @@ -57,7 +57,7 @@ index 632b185ba2f..b6e5ebdba6b 100755 SRCS = syslinux.c \ ../libinstaller/fs.c \ diff --git a/utils/Makefile b/utils/Makefile -index dfe625902ce..b4962353f20 100644 +index dfe62590..b4962353 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -17,8 +17,8 @@ @@ -71,6 +71,3 @@ index dfe625902ce..b4962353f20 100644 C_TARGETS = isohybrid gethostip memdiskfind SCRIPT_TARGETS = mkdiskimage --- -2.21.0 - diff --git a/0005-Workaround-multiple-definition-of-symbol-errors.patch b/0005-Workaround-multiple-definition-of-symbol-errors.patch index b5bbad0..9bfd247 100644 --- a/0005-Workaround-multiple-definition-of-symbol-errors.patch +++ b/0005-Workaround-multiple-definition-of-symbol-errors.patch @@ -1,4 +1,4 @@ -From 951928f2cad5682c2844e6bd0f7201236c5d9b66 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Wed, 13 May 2020 08:02:27 -0500 Subject: [PATCH] Workaround multiple definition of symbol errors @@ -104,6 +104,3 @@ index bbf23f24..3dd922d5 100644 # We need to rename the .hash section because the EFI firmware # linker really doesn't like it. --- -2.25.1 - diff --git a/0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch b/0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch index 11160bb..80e530e 100644 --- a/0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch +++ b/0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch @@ -1,4 +1,4 @@ -From eae06bdce9468d7fde263de1c53f80f2faff0c9e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Wed, 13 May 2020 11:58:37 -0500 Subject: [PATCH] Replace builtin strlen that appears to get optimized away @@ -35,6 +35,3 @@ index f648de2d..407d0233 100644 /* This only returns true or false */ static inline int memcmp(const void *__m1, const void *__m2, unsigned int __n) --- -2.25.1 - diff --git a/0007-Fix-backspace-when-editing-a-multiline-cmdline.patch b/0007-Fix-backspace-when-editing-a-multiline-cmdline.patch new file mode 100644 index 0000000..d96df40 --- /dev/null +++ b/0007-Fix-backspace-when-editing-a-multiline-cmdline.patch @@ -0,0 +1,134 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Thu, 21 Oct 2021 15:15:33 -0400 +Subject: [PATCH] Fix backspace when editing a multiline cmdline + +Once the cmdline had passed the width of the screen, adding additional +characters introduced a spurious newline, and another newline at the +width of input. Furthermore, hitting backspace would not start +redrawing at the end of input, but rather at the beginning of the +current line - resulting in extra duplicate lines scrolling the console. + +First, fix the assumption that the length of cmdline is the width - it +needs to include the length of the prompt (i.e., length of input and +space). + +Second, fix the behavior of single-line redraw (i.e., redraw == 1) to +move the cursor to the row the line begins at. + +Third, don't scroll the cursor down when a line wrap would occur - it's +not necessary since line wrap is enabled, and results in the extra blank +line. + +Finally, comment all used escape sequences so that I don't need to look +them up again. + +Signed-off-by: Robbie Harwood +--- + com32/elflink/ldlinux/cli.c | 33 ++++++++++++++++++--------------- + 1 file changed, 18 insertions(+), 15 deletions(-) + +diff --git a/com32/elflink/ldlinux/cli.c b/com32/elflink/ldlinux/cli.c +index 3119b11f..4913f038 100644 +--- a/com32/elflink/ldlinux/cli.c ++++ b/com32/elflink/ldlinux/cli.c +@@ -135,6 +135,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , + struct cli_command *comm_counter = NULL; + clock_t kbd_to = kbdtimeout; + clock_t tto = totaltimeout; ++ int prompt_len = 1 + strlen(input); + + if (!width) { + int height; +@@ -144,7 +145,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , + + len = cursor = 0; + prev_len = 0; +- x = y = 0; ++ y = 0; + + /* + * Before we start messing with the x,y coordinates print 'input' +@@ -152,6 +153,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , + * previously. + */ + printf("%s ", input); ++ x = prompt_len; + + while (!done) { + if (redraw > 1) { +@@ -162,8 +164,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , + if (pDraw_Menu) + (*pDraw_Menu) (-1, top, 1); + prev_len = 0; +- printf("\033[2J\033[H"); +- // printf("\033[0m\033[2J\033[H"); ++ printf("\033[2J\033[H"); /* Clear entire screen; move to 0, 0. */ + } + + if (redraw > 0) { +@@ -172,10 +173,14 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , + prev_len = max(len, prev_len); + + /* Redraw the command line */ +- printf("\033[?25l"); +- printf("\033[1G%s ", input); ++ printf("\033[?25l"); /* Hide cursor. */ ++ printf("\033[1G"); /* Column 1. */ ++ if (y > 0) ++ printf("\033[%dA", y); /* Directly up. */ + +- x = strlen(input); ++ printf("%s ", input); ++ ++ x = prompt_len; + y = 0; + at = 0; + while (at < prev_len) { +@@ -183,23 +188,22 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , + at++; + x++; + if (x >= width) { +- printf("\r\n"); + x = 0; + y++; + } + } +- printf("\033[K\r"); ++ printf("\033[K\r"); /* Clear to end of line; go to beginning. */ + +- dy = y - (cursor + strlen(input) + 1) / width; +- x = (cursor + strlen(input) + 1) % width; ++ dy = y - (cursor + prompt_len) / width; ++ x = (cursor + prompt_len) % width; + + if (dy) { +- printf("\033[%dA", dy); ++ printf("\033[%dA", dy); /* Cursor directly up. */ + y -= dy; + } + if (x) +- printf("\033[%dC", x); +- printf("\033[?25h"); ++ printf("\033[%dC", x); /* Cursor forward. */ ++ printf("\033[?25h"); /* Show cursor. */ + prev_len = len; + redraw = 0; + } +@@ -439,7 +443,6 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , + cursor++; + x++; + if (x >= width) { +- printf("\r\n\033[K"); + y++; + x = 0; + } +@@ -459,7 +462,7 @@ const char *edit_cmdline(const char *input, int top /*, int width */ , + } + } + +- printf("\033[?7h"); ++ printf("\033[?7h"); /* Enable line wrap. */ + + /* Add the command to the history if its length is larger than 0 */ + len = strlen(ret); diff --git a/0035-SYSAPPEND-Fix-space-stripping.patch b/0035-SYSAPPEND-Fix-space-stripping.patch deleted file mode 100644 index 6ff4306..0000000 --- a/0035-SYSAPPEND-Fix-space-stripping.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 3106dcd19061b4443c5beba4f0e09412e8d37fbe Mon Sep 17 00:00:00 2001 -From: Dany St-Amant -Date: Fri, 28 Nov 2014 13:48:32 -0500 -Subject: [PATCH 35/74] SYSAPPEND: Fix space stripping - -The description of SYSAPPEND for the DMI information states that the spaces -are replaced by underscores, but this replacement does not occur in 6.03. - -Signed-off-by: Dany St-Amant -Signed-off-by: Gene Cumm ---- - com32/elflink/ldlinux/readconfig.c | 2 +- - com32/menu/readconfig.c | 2 +- - core/sysappend.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/com32/elflink/ldlinux/readconfig.c b/com32/elflink/ldlinux/readconfig.c -index 347f826..24f1cc9 100644 ---- a/com32/elflink/ldlinux/readconfig.c -+++ b/com32/elflink/ldlinux/readconfig.c -@@ -330,7 +330,7 @@ static char *copy_sysappend_string(char *dst, const char *src) - char c; - - while ((c = *src++)) { -- if (c <= ' ' && c == '\x7f') { -+ if (c <= ' ' || c == '\x7f') { - if (!was_space) - *dst++ = '_'; - was_space = true; -diff --git a/com32/menu/readconfig.c b/com32/menu/readconfig.c -index b7814be..257b042 100644 ---- a/com32/menu/readconfig.c -+++ b/com32/menu/readconfig.c -@@ -299,7 +299,7 @@ static char *copy_sysappend_string(char *dst, const char *src) - char c; - - while ((c = *src++)) { -- if (c <= ' ' && c == '\x7f') { -+ if (c <= ' ' || c == '\x7f') { - if (!was_space) - *dst++ = '_'; - was_space = true; -diff --git a/core/sysappend.c b/core/sysappend.c -index 5c3f650..758703e 100644 ---- a/core/sysappend.c -+++ b/core/sysappend.c -@@ -35,7 +35,7 @@ static char *copy_and_mangle(char *dst, const char *src) - char c; - - while ((c = *src++)) { -- if (c <= ' ' && c == '\x7f') { -+ if (c <= ' ' || c == '\x7f') { - if (!was_space) - *dst++ = '_'; - was_space = true; --- -2.4.5 - diff --git a/dont-guess-section-alignment.patch b/dont-guess-section-alignment.patch deleted file mode 100644 index 7d2e36b..0000000 --- a/dont-guess-section-alignment.patch +++ /dev/null @@ -1,286 +0,0 @@ -From: Sylvain Gault - -For the compression / decompression to succeed, the sections layout must -be the same between the virtual memory and load memory. The section -alignment was kept in sync by introducing aligment that should be -greater or equal to the actual section alignment. - -This patch compute the load memory addresses of the sections so that -the layout is the same as the virtual memory addresses. - -Signed-off-by: Sylvain Gault ---- - core/i386/syslinux.ld | 63 ++++++++++--------------------------------------- - core/x86_64/syslinux.ld | 63 ++++++++++--------------------------------------- - 2 files changed, 24 insertions(+), 102 deletions(-) - -diff --git a/core/i386/syslinux.ld b/core/i386/syslinux.ld -index 7390451..92b75b1 100644 ---- a/core/i386/syslinux.ld -+++ b/core/i386/syslinux.ld -@@ -255,10 +255,9 @@ SECTIONS - . = 0x100000; - - __pm_code_start = .; -+ __vma_to_lma = __pm_code_lma - __pm_code_start; - -- __text_vma = .; -- __text_lma = __pm_code_lma; -- .text : AT(__text_lma) { -+ .text : AT(ADDR(.text) + __vma_to_lma) { - FILL(0x90909090) - __text_start = .; - *(.text) -@@ -266,106 +265,68 @@ SECTIONS - __text_end = .; - } - -- . = ALIGN(32); -- -- __rodata_vma = .; -- __rodata_lma = __rodata_vma + __text_lma - __text_vma; -- .rodata : AT(__rodata_lma) { -+ .rodata : AT(ADDR(.rodata) + __vma_to_lma) { - __rodata_start = .; - *(.rodata) - *(.rodata.*) - __rodata_end = .; - } - -- . = ALIGN(4); -- -- __ctors_vma = .; -- __ctors_lma = __ctors_vma + __text_lma - __text_vma; -- .ctors : AT(__ctors_lma) { -+ .ctors : AT(ADDR(.ctors) + __vma_to_lma) { - __ctors_start = .; - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - __ctors_end = .; - } - -- __dtors_vma = .; -- __dtors_lma = __dtors_vma + __text_lma - __text_vma; -- .dtors : AT(__dtors_lma) { -+ .dtors : AT(ADDR(.dtors) + __vma_to_lma) { - __dtors_start = .; - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - __dtors_end = .; - } - -- . = ALIGN(4); -- -- __dynsym_vma = .; -- __dynsym_lma = __dynsym_vma + __text_lma - __text_vma; -- .dynsym : AT(__dynsym_lma) { -+ .dynsym : AT(ADDR(.dynsym) + __vma_to_lma) { - __dynsym_start = .; - *(.dynsym) - __dynsym_end = .; - } - __dynsym_len = __dynsym_end - __dynsym_start; - -- . = ALIGN(4); -- -- __dynstr_vma = .; -- __dynstr_lma = __dynstr_vma + __text_lma - __text_vma; -- .dynstr : AT(__dynstr_lma) { -+ .dynstr : AT(ADDR(.dynstr) + __vma_to_lma) { - __dynstr_start = .; - *(.dynstr) - __dynstr_end = .; - } - __dynstr_len = __dynstr_end - __dynstr_start; - -- . = ALIGN(4); -- -- __gnu_hash_vma = .; -- __gnu_hash_lma = __gnu_hash_vma + __text_lma - __text_vma; -- .gnu.hash : AT(__gnu_hash_lma) { -+ .gnu.hash : AT(ADDR(.gnu.hash) + __vma_to_lma) { - __gnu_hash_start = .; - *(.gnu.hash) - __gnu_hash_end = .; - } - - -- . = ALIGN(4); -- -- __dynlink_vma = .; -- __dynlink_lma = __dynlink_vma + __text_lma - __text_vma; -- .dynlink : AT(__dynlink_lma) { -+ .dynlink : AT(ADDR(.dynlink) + __vma_to_lma) { - __dynlink_start = .; - *(.dynlink) - __dynlink_end = .; - } - -- . = ALIGN(4); -- -- __got_vma = .; -- __got_lma = __got_vma + __text_lma - __text_vma; -- .got : AT(__got_lma) { -+ .got : AT(ADDR(.got) + __vma_to_lma) { - __got_start = .; - KEEP (*(.got.plt)) - KEEP (*(.got)) - __got_end = .; - } - -- . = ALIGN(4); -- -- __dynamic_vma = .; -- __dynamic_lma = __dynamic_vma + __text_lma - __text_vma; -- .dynamic : AT(__dynamic_lma) { -+ .dynamic : AT(ADDR(.dynamic) + __vma_to_lma) { - __dynamic_start = .; - *(.dynamic) - __dynamic_end = .; - } - -- . = ALIGN(32); -- -- __data_vma = .; -- __data_lma = __data_vma + __text_lma - __text_vma; -- .data : AT(__data_lma) { -+ .data : AT(ADDR(.data) + __vma_to_lma) { - __data_start = .; - *(.data) - *(.data.*) -diff --git a/core/x86_64/syslinux.ld b/core/x86_64/syslinux.ld -index bf815c4..70c6e00 100644 ---- a/core/x86_64/syslinux.ld -+++ b/core/x86_64/syslinux.ld -@@ -255,10 +255,9 @@ SECTIONS - . = 0x100000; - - __pm_code_start = .; -+ __vma_to_lma = __pm_code_lma - __pm_code_start; - -- __text_vma = .; -- __text_lma = __pm_code_lma; -- .text : AT(__text_lma) { -+ .text : AT(ADDR(.text) + __vma_to_lma) { - FILL(0x90909090) - __text_start = .; - *(.text) -@@ -266,106 +265,68 @@ SECTIONS - __text_end = .; - } - -- . = ALIGN(32); -- -- __rodata_vma = .; -- __rodata_lma = __rodata_vma + __text_lma - __text_vma; -- .rodata : AT(__rodata_lma) { -+ .rodata : AT(ADDR(.rodata) + __vma_to_lma) { - __rodata_start = .; - *(.rodata) - *(.rodata.*) - __rodata_end = .; - } - -- . = ALIGN(4); -- -- __ctors_vma = .; -- __ctors_lma = __ctors_vma + __text_lma - __text_vma; -- .ctors : AT(__ctors_lma) { -+ .ctors : AT(ADDR(.ctors) + __vma_to_lma) { - __ctors_start = .; - KEEP (*(SORT(.ctors.*))) - KEEP (*(.ctors)) - __ctors_end = .; - } - -- __dtors_vma = .; -- __dtors_lma = __dtors_vma + __text_lma - __text_vma; -- .dtors : AT(__dtors_lma) { -+ .dtors : AT(ADDR(.dtors) + __vma_to_lma) { - __dtors_start = .; - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - __dtors_end = .; - } - -- . = ALIGN(4); -- -- __dynsym_vma = .; -- __dynsym_lma = __dynsym_vma + __text_lma - __text_vma; -- .dynsym : AT(__dynsym_lma) { -+ .dynsym : AT(ADDR(.dynsym) + __vma_to_lma) { - __dynsym_start = .; - *(.dynsym) - __dynsym_end = .; - } - __dynsym_len = __dynsym_end - __dynsym_start; - -- . = ALIGN(4); -- -- __dynstr_vma = .; -- __dynstr_lma = __dynstr_vma + __text_lma - __text_vma; -- .dynstr : AT(__dynstr_lma) { -+ .dynstr : AT(ADDR(.dynstr) + __vma_to_lma) { - __dynstr_start = .; - *(.dynstr) - __dynstr_end = .; - } - __dynstr_len = __dynstr_end - __dynstr_start; - -- . = ALIGN(4); -- -- __gnu_hash_vma = .; -- __gnu_hash_lma = __gnu_hash_vma + __text_lma - __text_vma; -- .gnu.hash : AT(__gnu_hash_lma) { -+ .gnu.hash : AT(ADDR(.gnu.hash) + __vma_to_lma) { - __gnu_hash_start = .; - *(.gnu.hash) - __gnu_hash_end = .; - } - - -- . = ALIGN(4); -- -- __dynlink_vma = .; -- __dynlink_lma = __dynlink_vma + __text_lma - __text_vma; -- .dynlink : AT(__dynlink_lma) { -+ .dynlink : AT(ADDR(.dynlink) + __vma_to_lma) { - __dynlink_start = .; - *(.dynlink) - __dynlink_end = .; - } - -- . = ALIGN(4); -- -- __got_vma = .; -- __got_lma = __got_vma + __text_lma - __text_vma; -- .got : AT(__got_lma) { -+ .got : AT(ADDR(.got) + __vma_to_lma) { - __got_start = .; - KEEP (*(.got.plt)) - KEEP (*(.got)) - __got_end = .; - } - -- . = ALIGN(4); -- -- __dynamic_vma = .; -- __dynamic_lma = __dynamic_vma + __text_lma - __text_vma; -- .dynamic : AT(__dynamic_lma) { -+ .dynamic : AT(ADDR(.dynamic) + __vma_to_lma) { - __dynamic_start = .; - *(.dynamic) - __dynamic_end = .; - } - -- . = ALIGN(32); -- -- __data_vma = .; -- __data_lma = __data_vma + __text_lma - __text_vma; -- .data : AT(__data_lma) { -+ .data : AT(ADDR(.data) + __vma_to_lma) { - __data_start = .; - *(.data) - *(.data.*) --- -2.5.3 diff --git a/fix-alignment-change-gcc-5.patch b/fix-alignment-change-gcc-5.patch deleted file mode 100644 index f7bf488..0000000 --- a/fix-alignment-change-gcc-5.patch +++ /dev/null @@ -1,75 +0,0 @@ -From: Sylvain Gault - -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 ---- - 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.5.3 diff --git a/syslinux.patches b/syslinux.patches new file mode 100644 index 0000000..12581b2 --- /dev/null +++ b/syslinux.patches @@ -0,0 +1,7 @@ +Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch +Patch0002: 0002-ext4-Fix-64bit-feature.patch +Patch0003: 0003-extlinux-pull-in-sys-sysmacros.h-for-major-minor-mak.patch +Patch0004: 0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch +Patch0005: 0005-Workaround-multiple-definition-of-symbol-errors.patch +Patch0006: 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch +Patch0007: 0007-Fix-backspace-when-editing-a-multiline-cmdline.patch diff --git a/syslinux.spec b/syslinux.spec index 64a957e..2ad6b03 100644 --- a/syslinux.spec +++ b/syslinux.spec @@ -7,16 +7,13 @@ Summary: Simple kernel loader which boots from a FAT filesystem Name: syslinux Version: 6.04 %define tarball_version 6.04-pre1 -Release: 0.19%{?dist} +Release: 0.20%{?dist} License: GPLv2+ URL: http://syslinux.zytor.com/wiki/index.php/The_Syslinux_Project Source0: http://www.kernel.org/pub/linux/utils/boot/syslinux/%{name}-%{tarball_version}.tar.xz -Patch0001: 0001-Add-install-all-target-to-top-side-of-HAVE_FIRMWARE.patch -Patch0002: 0002-ext4-64bit-feature.patch -Patch0003: 0003-include-sysmacros-h.patch -Patch0004: 0004-Add-RPMOPTFLAGS-to-CFLAGS-for-some-stuff.patch -Patch0005: 0005-Workaround-multiple-definition-of-symbol-errors.patch -Patch0006: 0006-Replace-builtin-strlen-that-appears-to-get-optimized.patch +Source1: syslinux.patches + +%include %{SOURCE1} # this is to keep rpmbuild from thinking the .c32 / .com / .0 / memdisk files # in noarch packages are a reason to stop the build. @@ -256,6 +253,10 @@ fi %endif %changelog +* Wed Aug 03 2022 Robbie Harwood - 6.04-0.20 +- Sync with fedora (same NVR) +- Resolves: #2018260 + * Tue Aug 10 2021 Mohan Boddu - 6.04-0.19 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688