Merge branch 'master' of ssh://git.archlinux32.org/packages

2 files changed, 1 insertions, 32 deletions

diff --git a/core/syslinux/PKGBUILD b/core/syslinux/PKGBUILD
index 253c1507..d88b9185 100644
--- a/core/syslinux/PKGBUILD
+++ b/core/syslinux/PKGBUILD
@@ -2,7 +2,7 @@
 # to minor and major
 
 source+=(syslinux-sysmacros.patch)
-sha1sums+=('52c5233da147acd41d542b1673835be966b561e3')
+sha256sums+=('0bc539928c3c044f2f01532b126a33dcb90c689ea698c7669e013ca97f71a4d2')
 
 eval "$(
   declare -f prepare | \
@@ -11,18 +11,5 @@ eval "$(
     '
 )"
 
-# binutils adds a nore.gnu.proprerty ELF section, this makes the MBR slightly
-# too big to fit on disk (see also https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=906414)
-
-source+=(syslinux-strip-gnu-property.patch)
-sha1sums+=('fb8e96b559516038e628ad55e0331e4c668205a8')
-
-eval "$(
-  declare -f prepare | \
-    sed '
-      /patch.*efi_no_kbd/a patch -p1 < ../syslinux-strip-gnu-property.patch
-    '
-)"
-
 # don't build efi64
 _targets='bios efi32'
diff --git a/core/syslinux/syslinux-strip-gnu-property.patch b/core/syslinux/syslinux-strip-gnu-property.patch
deleted file mode 100644
index 363a1ee2..00000000
--- a/core/syslinux/syslinux-strip-gnu-property.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -rauN syslinux/mbr/i386/mbr.ld syslinux-strip-gnu-property-patch/mbr/i386/mbr.ld
---- syslinux/mbr/i386/mbr.ld	2018-10-14 13:54:59.532050409 +0200
-+++ syslinux-strip-gnu-property-patch/mbr/i386/mbr.ld	2018-10-14 14:06:48.788976484 +0200
-@@ -70,4 +70,5 @@
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
-   /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ : { *(.note.gnu.property) }
- }
-diff -rauN syslinux/mbr/x86_64/mbr.ld syslinux-strip-gnu-property-patch/mbr/x86_64/mbr.ld
---- syslinux/mbr/x86_64/mbr.ld	2018-10-14 13:54:59.533050375 +0200
-+++ syslinux-strip-gnu-property-patch/mbr/x86_64/mbr.ld	2018-10-14 14:06:40.133269711 +0200
-@@ -69,4 +69,5 @@
-   .debug_typenames 0 : { *(.debug_typenames) }
-   .debug_varnames  0 : { *(.debug_varnames) }
-   /DISCARD/ : { *(.note.GNU-stack) }
-+  /DISCARD/ : { *(.note.gnu.property) }
- }