Add a more robust grub config generator, bug 456308.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 99 insertions, 18 deletions

diff --git a/sys-apps/memtest86/ChangeLog b/sys-apps/memtest86/ChangeLog
index c54036cff1a0..ab7722a58d82 100644
--- a/sys-apps/memtest86/ChangeLog
+++ b/sys-apps/memtest86/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/memtest86
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.44 2013/10/18 19:13:43 blueness Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/ChangeLog,v 1.45 2014/08/31 03:06:02 floppym Exp $
+
+*memtest86-4.3.3-r2 (31 Aug 2014)
+
+  31 Aug 2014; Mike Gilbert <floppym@gentoo.org> +files/39_memtest86,
+  +memtest86-4.3.3-r2.ebuild:
+  Add a more robust grub config generator, bug 456308.
 
   18 Oct 2013; Anthony G. Basile <blueness@gentoo.org>
   files/memtest86-4.3.3-build-nopie.patch:
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest
index 9f0f83111e67..bc4941337cb5 100644
--- a/sys-apps/memtest86/Manifest
+++ b/sys-apps/memtest86/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 39_memtest86 366 SHA256 d5f58bdfd78fc74433ae517846aa40b5199745c3c976cce856267cfbed532886 SHA512 2d672fa0836f31323b8eac5cf3b6300ce7601e635de395789b0bc11e6320af73888352ca577e2919086abf99f2eac1125742c3202b1a473cc808a0469f026493 WHIRLPOOL 13522708aef3acce8af539be12aa1491936469f8a953a18fa20a2eef6ae662965486be74180a81930f9839f97a1d6c26ff632d10146dbaf6e5ea32d4b22b7434
 AUX memtest86-3.2-solar.patch 821 SHA256 8004f3066fd4e332ccc9c217b6f62799fa15ec101fde9448f4aab1a2a2589019 SHA512 e88260cd115dab674233ef705bfe395d72b89f8ef2d42026a03b66ac13dab23c9f62c5d90bca0fe2ce2a3120bd2aa9e6e31581594b3fe56b44df6145104f11a8 WHIRLPOOL df215da34c5e494681dc7bae4c75afb13689bf8eb308453448502072416c3b557a4a4f32e8b8b089feaba5f0c27abe073e690dbb1c98e0d3374e852185a26f85
 AUX memtest86-3.3-funky-test.patch 374 SHA256 9a8ecba4392eb80cf460acd51e51bc9de643730c82ba31a18801d686b3c58ebc SHA512 3c64f49443b6b508957bcfac040f7d4ca31e52a26db688566d3780df235764af60208a4fed06c031ed0e1b78090496f7236e764921c0afff9a9b8f4f6456fa22 WHIRLPOOL 8800da7a1a564ed29459451983616b5c917420233a5fc637e73f761ee7af7d6de6c50b117fd33fa2afee8289ac2096c92fa8a104967948f6c95714a2940c502c
 AUX memtest86-3.3-gnu-hash.patch 297 SHA256 9e7d99895087369b7492ebb03ad7a3e366215444f0d32155fa4dfb02464e1c05 SHA512 67eb9b639cc55bd8123cd6926b2ab49094b5183ecfc9171e4161e5d0d301d5ee48d8ade767e14fbd68f54cc9a8bedfd396b2d4cd1af4666642399e9356142d1b WHIRLPOOL 99ee88a62c5fc910da7550bd73a18db3fded268ffa55661cefe44e855ecdac386bebe96afb2b38f2b612a0a6434f4d6d5dda9561a39ab89312fbd4ed1b32968c
@@ -9,29 +10,20 @@ AUX memtest86-4.3.3-build-nopie.patch 1727 SHA256 6f3a09dca27e518c599b2882959acd
 AUX memtest86-4.3.3-build.patch 1516 SHA256 66b4c2db5e97e428e1333580cd19f51f403d2a17cd37e0a7dadfbf8bde97325e SHA512 1c965fa05e295d95a653c5cbe363ae33d619c276baf457f6bcf3068c9a81abd06acf9091f96c4ac628c1f13806cae27cac0f5902fe535b38dff3ea3ea2a03396 WHIRLPOOL 21d55e6aeddebca374fa4e6391cddf3623cb173bfd70cd04eea66a9ee795fa9b4d9be525fb07af5273db6005e511503f1362dc23dc51526ececa2d0dec4f2820
 DIST memtest86-3.3.tar.gz 137922 SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c
 DIST memtest86-4.0.tar.gz 134766 SHA256 a998d21d61d1d4f38856c1d840523bfcc4835799855c228dcf1d01e174424afc
-DIST memtest86-4.0s.tar.gz 157262 SHA256 05270483eef83683ede190750951387c4a7173568f5c8d7b82bb06824836cb79
+DIST memtest86-4.0s.tar.gz 157262 SHA256 05270483eef83683ede190750951387c4a7173568f5c8d7b82bb06824836cb79 SHA512 5dd15cc14a6df7778e0c2b691b4f92cf819251291f1ed087e2a1dd5957f8218096e7f7e1fbbc7b1ffa157f21214a20a88dea468a54939b7444c978a7f92bef5b WHIRLPOOL b9ddd11cf89cfcde152d29bfa39de6201ec0397a89de8486edd172f66e976fcc76161e64c63b0479ea18881603db8acfd95aab17d170b58acf0a75636da9ec01
 DIST memtest86-4.3.3-src.tar.gz 124056 SHA256 54273d21a29eef55847228ff894a444f918daac96f89bd7880a8d3933498f7bb SHA512 da95f0c84c5dda2e23c9183d2037dee4c21c43cd65c4f9fc8298c91986a36092330930234c4391cfef10ec28ded26f6b5aaf5ea79eeb5c86d4b7e6fe2bfc77cd WHIRLPOOL 5a9e51c116092eb3fe057549c1549282538d936a43e48027e57454002a20610ffb2813352583e7ea48d2f37d89419b866c2647751d036d6bc4a577b58d1ffe42
 EBUILD memtest86-3.3.ebuild 1412 SHA256 29588ec71f40297aae8d44daaf3f403334715dcadedc70521f909e4216c4799f SHA512 03627579fac0b7ebf1e018ac3174a2b08c821c1f53fa9fd268136bde4348db52659eeb4eb470d53de4bade9b801c9e9fa6eb0f77796dbfe8e6dcc8e6eb89a6d0 WHIRLPOOL 9d4b83cd89d643fc25a2490104d8c94e6f6c7028e1b1113cda165e5591ae03661b8eefff48ca3e364f84aacaee18f78dd3aa8c8a02c3b949db66ebb08d5c6c96
 EBUILD memtest86-4.0.ebuild 1351 SHA256 10c8f70a31a957e5d2a4f8353b647bddb1d4161b4f86dfb7e4482c384fd6ef7f SHA512 c86f3267b6b6ad7328d203e06093d97abf6708bbd1508c98715f6acd70dce0c871d99cb71dfc13b0b19c0a789627acf592dcf09fd1385ddc0539e1fd51a405d8 WHIRLPOOL f8923ab3a79d4718d84d9304c0b39d6182e6c40735ab84f8e75882a313d1710a58b45e824e9bdb525bd9e9e78145246577e139f183409b4508ab510bea023d75
 EBUILD memtest86-4.0s.ebuild 1702 SHA256 968670c313a57ea5f3f3cbbd2fd1a659ad99aae69028a22427d0412a45e3b689 SHA512 3697655ca69d5dd418059b7d6dea182c132b4ff1f1dd7bc368e7af7addaa44acdebf4855a216b52598611ee9c161a5c01bbbbb4c11d31823670d555741cfd197 WHIRLPOOL 4b6a4e951ae41bc0ef486e5a416f1198612c6227d89fdd4fd6a83242d123ed92818d7f407ee882988a2b67ebf8aa593597a3b3fca5bb15919eebac36312cc665
 EBUILD memtest86-4.3.3-r1.ebuild 1749 SHA256 18079b9d0c04f6927ca4f164586313815ecd90c47146ce7b322fe7624247bd08 SHA512 df86dff56cd4a9ac9233d017847eb63da4a19ad45278973f6895d9adfabd388911810f8f1be67514e9c73c11c6041086233e765f456c1db8f20991ab47135a6b WHIRLPOOL 681c1dfa9e2f38ce7e53464655e4954802319a4f26deb5c691c1b09f144b784321a97e5d1f0708509f0139e05511319d7987c4c064e4c94038adf0014dfc3fc1
+EBUILD memtest86-4.3.3-r2.ebuild 1636 SHA256 ce8fe8dfd52ec93551268ee5d93deb5144ad7acd32dd3d245f68bdd0dcf5c375 SHA512 7fb3fd41afcd98ac7309e816ec5bd471844ca36fb7fffc01f75990ca15a4ad50afae0a26969c483d3cda4583dfc15183d99fe7c9fcb2aaae16940ef845f09b1f WHIRLPOOL 58943bcf28fc35905b060637600318075d17f5a7fd7cbd5bf3ae77da84ebb8029d75ef4f7ad394f6b13528ad477fee9cbfc7973bda48d636f7eb2c8419b0486c
 EBUILD memtest86-4.3.3.ebuild 1730 SHA256 345f7bbd7aeb267f8bb6681ffb37a2d1d0a54866e73f68f7c2b4eb67cf945fac SHA512 4564c538fc619ecebe36deea4bb62bc8cdd147ae174f4e74264409a615594256ada273c6e4c5983b31790a9bbbd84a34aaab490d4e88c767d418037a7d72f64b WHIRLPOOL 28df2be8b3324969a469b6c62259e55832b660731915deb1beced6203bd701634981244f5dde587fe01215f074e22b5644f239e411886f3b04aa123e6123fbc9
-MISC ChangeLog 7008 SHA256 40b77e32a88177947c960209f3e671682a0612fe03ecb79203707ddff1be2698 SHA512 99794046a8e6faef707a9f9924b32074a8bd7a23b7b5b8cf98ad225d1f2a4e476a856b1ddd152cdbf1eb67cb928aa1f26143161cfe73f57d8b3dab9c9e3f043e WHIRLPOOL 003a6ae7605a88a3f921e6b967834c2b38d241a72640235f15dc2b434b20f086152e013a856e8c0b5d0e2254ff991112c462b2013f577bb59fd8cd095be9d42f
+MISC ChangeLog 7198 SHA256 a82a83df0c177b8b158ad8783853aaf703ed61f37bd8dae2e2039ebc2a5195e7 SHA512 04f4c923ee7072ee3d8d89ffd4a47223a42ba3582e446833b592fd762a08d35e79750012c3c73e779bfff1b16a23b7c06449c97cb3fa74490b61fce1d7855742 WHIRLPOOL b4ec829d49f8fe66b6566854244451262bab8d25b645a833ce2335d2e228fd9989421352a6e155952fc3d965275e6aa7e99a7d529e6559d8c1de3e11b0b3742e
 MISC metadata.xml 241 SHA256 bd2bd1cf924d8626e469ed4c8780d7a11c8b629ce102d654b3ca0022a7f4254e SHA512 1a7a7699749e1cfd73bc13f848c00fcb429550fa3dd178d78b7d5715710c63d39ab5b30108e951500ae832f438f7f6e6ab7fb96dd35c92246eb24d5a118af489 WHIRLPOOL e6d1b4b0d9219ebd833235d2c4d5d95a9adfe13212e103ffb19ce4b19758f0cec3111e95dea2a87d0dde0888e91ba9afb17ef1807265dbd0b9f462efdd00d411
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJSYYjeAAoJEJOE+m71LUu6L80P/3bxA0yuducLq5o0wlVciDtL
-N5XnyW+y38QxmGo9YqmuEgy8z3FPNiwcHl0AOPb2dpGokozBGf9XCfSuETogrBUa
-sY59elyqTG375sAhNdugFs869PWD2h/SLK1QYZ8w0eLHB0B4OUXTztiQZ/voVcYv
-iHxg6Au7HVr3jBZBZeJQ6hWuTybyZpKjs5HIAN8FNWeBUZfdT+XJaTuniAMbSxUv
-j4ySAo7ZqCKC4yu6b/0bKuwPnG+iqIeKlOkZazj8u9hvO8SMTadGj8FmQnbmkw4u
-aqTJeY/5t38qyqfOcPfkORn+aigvrIkt1dihtAkbg61l8AWL/OSQ5O4E0+XTMXO8
-wjX2d5AfEAdivDYOiTxjt4UXVKv/d4HdDLW1DG9erpaE58qLzNGtMAWbENIuxSPJ
-cvFUs1Nee572RI5o7/z6tIotpASFBKRhUl33v7GKV1ZSCvmtXmjyItHPV/e3tbzJ
-s5ukqnjDurqcFdWpvr+M4opgW9j/epRt/PKUtfV1o3v+/VWJzuZu9OKajN4yVjCa
-3m4s3ICGFXrJDwY37oMNZvPwcYXjsYZjB/m8jzWWAjHXGpdsuP1txWNwONRe88lT
-9fntxyF7/Kk8npFK1/AT88A17gyLs+f4DPlF4G09RPWVZf0BmInUbR1CqQGD/7hu
-Ax9etxTfKtHMt9jo/VRV
-=mX1Y
+iF4EAREIAAYFAlQCkRsACgkQC77qH+pIQ6Rb5gD+J3odvnkc8vZoOT3BMG7PB8zk
+awWycigbOlFQecr8xIUA/36S8YyaAtPY72SQmgQIZJN1oObOpu1KDxXyOy2ZKd6R
+=l0vb
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/memtest86/files/39_memtest86 b/sys-apps/memtest86/files/39_memtest86
new file mode 100644
index 000000000000..a736bce6a316
--- /dev/null
+++ b/sys-apps/memtest86/files/39_memtest86
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /usr/share/grub/grub-mkconfig_lib
+
+memtest=/boot/memtest86/memtest
+
+if [ -f "${memtest}" ]; then
+	device="$("${grub_probe}" --target=device "${memtest}")"
+	path="$(make_system_path_relative_to_its_root "${memtest}")"
+	cat <<EOF
+menuentry "MemTest86" {
+EOF
+	prepare_grub_to_access_device "${device}" | grub_add_tab
+	cat <<EOF
+	linux16 "${path}"
+}
+EOF
+fi
diff --git a/sys-apps/memtest86/memtest86-4.3.3-r2.ebuild b/sys-apps/memtest86/memtest86-4.3.3-r2.ebuild
new file mode 100644
index 000000000000..4e83bcd1143f
--- /dev/null
+++ b/sys-apps/memtest86/memtest86-4.3.3-r2.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86/memtest86-4.3.3-r2.ebuild,v 1.1 2014/08/31 03:06:02 floppym Exp $
+
+EAPI=5
+
+inherit mount-boot eutils toolchain-funcs
+
+DESCRIPTION="A stand alone memory test for x86 computers"
+HOMEPAGE="http://www.memtest86.com/"
+SRC_URI="http://www.memtest86.com/downloads/${P}-src.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE="serial"
+S="${WORKDIR}/src"
+
+BOOTDIR=/boot/memtest86
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-build-nopie.patch #66630 + #206726
+
+	sed -i -e 's,0x10000,0x100000,' memtest.lds || die
+
+	if use serial ; then
+		sed -i \
+			-e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
+			config.h \
+			|| die "sed failed"
+	fi
+
+	tc-export AS CC LD
+}
+
+src_test() { :; }
+
+src_install() {
+	insinto ${BOOTDIR}
+	newins memtest.bin memtest
+	dosym memtest ${BOOTDIR}/memtest.bin
+
+	exeinto /etc/grub.d
+	doexe "${FILESDIR}"/39_memtest86
+
+	dodoc README README.build-process README.background
+}
+
+pkg_postinst() {
+	mount-boot_pkg_postinst
+	elog
+	elog "memtest has been installed in ${BOOTDIR}/"
+	elog "You may wish to update your bootloader configs"
+	elog "by adding these lines:"
+	elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
+	elog "   as /etc/grub/39_${PN}"
+	elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
+	elog "    > title=${PN}"
+	elog "    > root (hd?,?)"
+	elog "    > kernel ${BOOTDIR}/memtest"
+	elog " - For lilo:"
+	elog "    > image  = ${BOOTDIR}/memtest"
+	elog "    > label  = ${PN}"
+	elog
+}