diff options
| -rw-r--r-- | sys-apps/kexec-tools/kexec-tools-2.0.28-i386-fix.patch | 92 | ||||
| -rw-r--r-- | sys-cluster/glusterfs/full-hostname.patch | 11 | ||||
| -rw-r--r-- | www-apps/cgit/highlight-3.patch | 12 |
3 files changed, 11 insertions, 104 deletions
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.28-i386-fix.patch b/sys-apps/kexec-tools/kexec-tools-2.0.28-i386-fix.patch deleted file mode 100644 index 4106b27..0000000 --- a/sys-apps/kexec-tools/kexec-tools-2.0.28-i386-fix.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 328de8e00e298f00d7ba6b25dc3950147e9642e6 Mon Sep 17 00:00:00 2001 -From: Michel Lind <salimma@fedoraproject.org> -Date: Tue, 30 Jan 2024 04:14:31 -0600 -Subject: Fix building on x86_64 with binutils 2.41 - -Newer versions of the GNU assembler (observed with binutils 2.41) will -complain about the ".arch i386" in files assembled with "as --64", -with the message "Error: 64bit mode not supported on 'i386'". - -Fix by moving ".arch i386" below the relevant ".code32" directive, so -that the assembler is no longer expecting 64-bit instructions to be used -by the time that the ".arch i386" directive is encountered. - -Based on similar iPXE fix: -https://github.com/ipxe/ipxe/commit/6ca597eee - -Signed-off-by: Michel Lind <michel@michel-slm.name> -Signed-off-by: Simon Horman <horms@kernel.org> ---- - purgatory/arch/i386/entry32-16-debug.S | 2 +- - purgatory/arch/i386/entry32-16.S | 2 +- - purgatory/arch/i386/entry32.S | 2 +- - purgatory/arch/i386/setup-x86.S | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/purgatory/arch/i386/entry32-16-debug.S b/purgatory/arch/i386/entry32-16-debug.S -index 5167944d..12e11649 100644 ---- a/purgatory/arch/i386/entry32-16-debug.S -+++ b/purgatory/arch/i386/entry32-16-debug.S -@@ -25,10 +25,10 @@ - .globl entry16_debug_pre32 - .globl entry16_debug_first32 - .globl entry16_debug_old_first32 -- .arch i386 - .balign 16 - entry16_debug: - .code32 -+ .arch i386 - /* Compute where I am running at (assumes esp valid) */ - call 1f - 1: popl %ebx -diff --git a/purgatory/arch/i386/entry32-16.S b/purgatory/arch/i386/entry32-16.S -index c051aab0..eace0958 100644 ---- a/purgatory/arch/i386/entry32-16.S -+++ b/purgatory/arch/i386/entry32-16.S -@@ -20,10 +20,10 @@ - #undef i386 - .text - .globl entry16, entry16_regs -- .arch i386 - .balign 16 - entry16: - .code32 -+ .arch i386 - /* Compute where I am running at (assumes esp valid) */ - call 1f - 1: popl %ebx -diff --git a/purgatory/arch/i386/entry32.S b/purgatory/arch/i386/entry32.S -index f7a494f1..8ce9e316 100644 ---- a/purgatory/arch/i386/entry32.S -+++ b/purgatory/arch/i386/entry32.S -@@ -20,10 +20,10 @@ - #undef i386 - - .text -- .arch i386 - .globl entry32, entry32_regs - entry32: - .code32 -+ .arch i386 - - /* Setup a gdt that should that is generally usefully */ - lgdt %cs:gdt -diff --git a/purgatory/arch/i386/setup-x86.S b/purgatory/arch/i386/setup-x86.S -index 201bb2cb..a212eed4 100644 ---- a/purgatory/arch/i386/setup-x86.S -+++ b/purgatory/arch/i386/setup-x86.S -@@ -21,10 +21,10 @@ - #undef i386 - - .text -- .arch i386 - .globl purgatory_start - purgatory_start: - .code32 -+ .arch i386 - - /* Load a gdt so I know what the segment registers are */ - lgdt %cs:gdt --- -cgit 1.2.3-korg - diff --git a/sys-cluster/glusterfs/full-hostname.patch b/sys-cluster/glusterfs/full-hostname.patch new file mode 100644 index 0000000..c7f433b --- /dev/null +++ b/sys-cluster/glusterfs/full-hostname.patch @@ -0,0 +1,11 @@ +--- a/extras/ocf/volume.in 2023-11-06 15:24:25.437026739 +0000 ++++ a/extras/ocf/volume.in 2025-05-12 02:57:57.823907718 +0100 +@@ -19,8 +19,8 @@ + # When sysconfdir and localstatedir aren't passed in as + # configure flags, they're defined in terms of prefix + prefix=@prefix@ +-SHORTHOSTNAME=`hostname -s` ++SHORTHOSTNAME=`hostname -f` + ####################################################################### + + OCF_RESKEY_binary_default="gluster" diff --git a/www-apps/cgit/highlight-3.patch b/www-apps/cgit/highlight-3.patch deleted file mode 100644 index 05f72df..0000000 --- a/www-apps/cgit/highlight-3.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/filters/syntax-highlighting.sh 2016-11-23 04:24:36.000000000 +0000 -+++ b/filters/syntax-highlighting.sh 2017-08-07 21:11:24.179856998 +0100 -@@ -115,7 +115,7 @@ - # found (for example) on EPEL 6. - # - # This is for version 2 --exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null -+#exec highlight --force -f -I -X -S "$EXTENSION" 2>/dev/null - - # This is for version 3 --#exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null -+exec highlight --force -f -I -O xhtml -S "$EXTENSION" 2>/dev/null |