[arch-commits] Commit in memtest86+/trunk (60_memtest86+ PKGBUILD)

[Christian Hesse]

    Date: Wednesday, August 3, 2016 @ 07:41:05
  Author: eworm
Revision: 272944

upgpkg: memtest86+ 5.01-2

move grub configuration from grub to memtest86+ package

Added:
  memtest86+/trunk/60_memtest86+
Modified:
  memtest86+/trunk/PKGBUILD

---------------+
 60_memtest86+ |   32 ++++++++++++++++++++++++++++++++
 PKGBUILD      |    9 ++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)

Added: 60_memtest86+
===================================================================
--- 60_memtest86+	                        (rev 0)
+++ 60_memtest86+	2016-08-03 07:41:05 UTC (rev 272944)
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+########################################################
+# This script generates a memtest86+ entry on grub.cfg #
+# if memtest is installed on the system.               #
+########################################################
+
+prefix="/usr"
+exec_prefix="${prefix}"
+
+datarootdir="/usr/share"
+datadir="${datarootdir}"
+
+. "${datadir}/grub/grub-mkconfig_lib"
+
+MEMTEST86_IMAGE="/boot/memtest86+/memtest.bin"
+CLASS="--class memtest86 --class gnu --class tool"
+
+if [ -e "${MEMTEST86_IMAGE}" ] && is_path_readable_by_grub "${MEMTEST86_IMAGE}" ; then
+    ## image exists, create menu entry
+    echo "Found memtest86+ image: ${MEMTEST86_IMAGE}" >&2
+    _GRUB_MEMTEST_HINTS_STRING="$(${grub_probe} --target=hints_string ${MEMTEST86_IMAGE})"
+    _GRUB_MEMTEST_FS_UUID="$(${grub_probe} --target=fs_uuid ${MEMTEST86_IMAGE})"
+    _GRUB_MEMTEST_REL_PATH="$(make_system_path_relative_to_its_root ${MEMTEST86_IMAGE})"
+    cat << EOF
+if [ "\${grub_platform}" == "pc" ]; then
+    menuentry "Memory Tester (memtest86+)" ${CLASS} {
+        search --fs-uuid --no-floppy --set=root ${_GRUB_MEMTEST_HINTS_STRING} ${_GRUB_MEMTEST_FS_UUID}
+        linux16 ${_GRUB_MEMTEST_REL_PATH} ${GRUB_CMDLINE_MEMTEST86}
+    }
+fi
+EOF
+fi

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-03 06:43:26 UTC (rev 272943)
+++ PKGBUILD	2016-08-03 07:41:05 UTC (rev 272944)
@@ -3,14 +3,17 @@
 
 pkgname=memtest86+
 pkgver=5.01
-pkgrel=1
+pkgrel=2
 pkgdesc="An advanced memory diagnostic tool"
 arch=('any')
 url="http://www.memtest.org"
 license=('GPL2')
-source=(http://www.memtest.org/download/${pkgver}/${pkgname}-${pkgver}.bin.gz)
-sha1sums=('acf4b99b435d4e99b8027221524e57d70b8cae47')
+source=(http://www.memtest.org/download/${pkgver}/${pkgname}-${pkgver}.bin.gz
+        60_memtest86+)
+sha1sums=('acf4b99b435d4e99b8027221524e57d70b8cae47'
+          '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559')
 
 package() {
   install -D -m644 "${srcdir}/${pkgname}-${pkgver}.bin" "${pkgdir}/boot/memtest86+/memtest.bin"
+  install -D -m755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
 }