aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
Diffstat (limited to 'system')
-rw-r--r--system/memtest86/memtest86.SlackBuild7
-rw-r--r--system/memtest86/patches/discard-note_gnu_property.patch9
2 files changed, 14 insertions, 2 deletions
diff --git a/system/memtest86/memtest86.SlackBuild b/system/memtest86/memtest86.SlackBuild
index c9c8f7e652ab3..62f991c21abac 100644
--- a/system/memtest86/memtest86.SlackBuild
+++ b/system/memtest86/memtest86.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for memtest86
-# Copyright 2012-2019 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2012-2022 Kyle Guinn <elyk03@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=memtest86
VERSION=${VERSION:-4.3.7}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -78,6 +78,9 @@ patch -p1 < $CWD/patches/makefile.diff
# https://bugs.debian.org/779504 -> https://bugs.debian.org/629506
patch -p1 < $CWD/patches/bug_629506_message_15.mbox
+# https://bugzilla.opensuse.org/show_bug.cgi?id=1185272
+patch -p1 < $CWD/patches/discard-note_gnu_property.patch
+
# TBD whether these memtest86+ patches should be backported:
# https://sources.debian.org/patches/memtest86+/5.01-3/
# https://bugs.debian.org/250864 suggests that it could be backported.
diff --git a/system/memtest86/patches/discard-note_gnu_property.patch b/system/memtest86/patches/discard-note_gnu_property.patch
new file mode 100644
index 0000000000000..7c1179f077588
--- /dev/null
+++ b/system/memtest86/patches/discard-note_gnu_property.patch
@@ -0,0 +1,9 @@
+--- a/memtest.bin.lds 2020-04-12 17:14:51.000000000 +0200
++++ b/memtest.bin.lds 2021-12-04 14:54:33.178625382 +0100
+@@ -11,5 +11,6 @@
+ *(.data)
+ _end = . ;
+ }
++ /DISCARD/ : { *(.note.gnu.property) }
+ _syssize = (_end - _start + 15) >> 4;
+ }