From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 May 2010 15:57:35 +0000 (+0200)
Subject: memtest86+: Update to 4.10.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=435aa8632165d9a6ece0ccfb8aaa24b375dd4a05;p=ipfire-3.x.git

memtest86+: Update to 4.10.

Adds support for grub2.
---

diff --git a/pkgs/core/memtest86+/memtest86+.grub b/pkgs/core/memtest86+/memtest86+.grub
new file mode 100755
index 000000000..3301b8597
--- /dev/null
+++ b/pkgs/core/memtest86+/memtest86+.grub
@@ -0,0 +1,37 @@
+#!/bin/sh
+set -e
+
+# older versions of grub2 do not have this yet (LP: #459080)
+if [ ! -e /usr/lib/grub/grub-mkconfig_lib ]; then
+    echo "no grub-mkconfig_lib, exiting"
+    exit 0
+fi
+
+. /usr/lib/grub/grub-mkconfig_lib
+
+# We can't cope with loop-mounted devices here.
+case ${GRUB_DEVICE_BOOT} in
+  /dev/loop/*|/dev/loop[0-9])
+    exit 0
+  ;;
+esac
+
+if test -e /boot/memtest86+; then
+  MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+" )
+  echo "Found memtest86+ image: $MEMTESTPATH" >&2
+  cat << EOF
+menuentry "Memory test (memtest86+)" {
+EOF
+  prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
+  printf '%s\n' "${prepare_boot_cache}"
+  cat << EOF
+	linux16	$MEMTESTPATH
+}
+menuentry "Memory test (memtest86+, serial console 115200)" {
+EOF
+  printf '%s\n' "${prepare_boot_cache}"
+  cat << EOF
+	linux16	$MEMTESTPATH console=ttyS0,115200n8
+}
+EOF
+fi
diff --git a/pkgs/core/memtest86+/memtest86+.nm b/pkgs/core/memtest86+/memtest86+.nm
index e6f4b74de..1f9eb0d05 100644
--- a/pkgs/core/memtest86+/memtest86+.nm
+++ b/pkgs/core/memtest86+/memtest86+.nm
@@ -25,7 +25,7 @@
 include $(PKGROOT)/Include
 
 PKG_NAME       = memtest86+
-PKG_VER        = 4.00
+PKG_VER        = 4.10
 PKG_REL        = 0
 
 PKG_MAINTAINER =
@@ -53,4 +53,7 @@ endef
 define STAGE_INSTALL
 	-mkdir -pv $(BUILDROOT)/boot
 	cd $(DIR_APP) && cp -vf memtest.bin $(BUILDROOT)/boot/memtest86+
+
+	-mkdir -pv $(BUILDROOT)/etc/grub.d
+	cp -vf $(DIR_SOURCE)/$(PKG_NAME).grub $(BUILDROOT)/etc/grub.d/20_$(PKG_NAME)
 endef