summaryrefslogtreecommitdiffstats
path: root/system/memtest86+/memtest86+.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'system/memtest86+/memtest86+.SlackBuild')
-rw-r--r--system/memtest86+/memtest86+.SlackBuild78
1 files changed, 24 insertions, 54 deletions
diff --git a/system/memtest86+/memtest86+.SlackBuild b/system/memtest86+/memtest86+.SlackBuild
index 0e95f2a425..5b60123281 100644
--- a/system/memtest86+/memtest86+.SlackBuild
+++ b/system/memtest86+/memtest86+.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for memtest86+
-# Copyright 2013-2022 Kyle Guinn <elyk03@gmail.com>
+# Copyright 2013-2024 Kyle Guinn <elyk03@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,82 +25,51 @@
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=memtest86+
-VERSION=${VERSION:-5.01}
-BUILD=${BUILD:-2}
+SRCNAM=memtest86plus
+VERSION=${VERSION:-7.00}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
-# i486 only. Modify the Makefile at your own risk :-)
-ARCH=i486
+# i586 or x86_64 only. Modify the Makefile at your own risk :-)
+ARCH=${ARCH:-$(uname -m)}
+case $ARCH in
+ i?86) BUILDDIR=build32; EFIARCH=ia32; ARCH=i586 ;;
+ x86_64) BUILDDIR=build64; EFIARCH=x64 ;;
+ *) echo "$ARCH is not supported." >&2; exit 1 ;;
+esac
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
fi
TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM-$VERSION
+PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-DOCS="FAQ README* changelog"
+DOCS="LICENSE README.md"
set -e
rm -rf $PKG
mkdir -p $TMP $PKG $OUTPUT
cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
chown -R root:root .
chmod -R u+w,go-w,a+rX-st .
-# Upstream is dead. Lots of patches courtesy of Debian and Gentoo.
-# If these get out-of-hand, consider switching to coreboot's fork:
-# https://review.coreboot.org/cgit/memtest86plus.git/
-
-# https://sources.debian.org/patches/memtest86+/5.01-3/
-# Last 3 are covered or made unnecessary by Gentoo's patches.
-# Multiboot is disabled due to it being experimental and
-# possibly not working correctly: https://bugs.debian.org/568176
-# Note that we aren't installing the multiboot image (memtest_shared).
-# Note that patches multiboot and memtest86+-5.01-hardcoded_cc.patch conflict.
-patch -p1 < $CWD/patches/doc-serialconsole
-#patch -p1 < $CWD/patches/multiboot
-#patch -p1 < $CWD/patches/memtest86+-5.01-O0.patch
-#patch -p1 < $CWD/patches/memtest86+-5.01-array-size.patch
-#patch -p1 < $CWD/patches/gcc-5
-
-# https://gitweb.gentoo.org/repo/gentoo.git/tree/sys-apps/memtest86+/files
-patch -p1 < $CWD/patches/memtest86+-5.01-gcc-473.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-hardcoded_cc.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-no-scp.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-io-extern-inline.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-reboot-def.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-no-clean.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-no-C-headers.patch
-patch -p1 < $CWD/patches/memtest86+-5.01-test-random-cflags.patch
-
-# More CFLAGS/CPPFLAGS cleanup, inspired by the previous patch.
-patch -p1 < $CWD/patches/makefile.diff
-
-# https://bugs.debian.org/795421
-patch -p1 < $CWD/patches/memtest86+-test-7-smp.patch
-
-# 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
-
+cd $BUILDDIR
make
-install -D -m 0755 memtest $PKG/boot/$PRGNAM-$VERSION
+install -D -m 0755 memtest.efi $PKG/boot/$PRGNAM-$EFIARCH-$VERSION.efi
install -D -m 0644 memtest.bin $PKG/boot/$PRGNAM-$VERSION.bin
-ln -s $PRGNAM-$VERSION $PKG/boot/$PRGNAM
-ln -s $PRGNAM-$VERSION.bin $PKG/boot/$PRGNAM.bin
+ln -s $PRGNAM-$EFIARCH-$VERSION.efi $PKG/boot/$PRGNAM-$EFIARCH.efi
+ln -s $PRGNAM-$VERSION.bin $PKG/boot/$PRGNAM.bin
+cd ..
+
+install -D -m 0755 $CWD/20_memtest86+ $PKG/etc/grub.d/20_memtest86+.new
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
@@ -108,6 +77,7 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
cd $PKG
/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE