1 |
commit: 0eb2ba9f9d96fad560ae3bbfcaed940c43d7fb4f |
2 |
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 14 22:40:28 2016 +0000 |
4 |
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jul 10 02:48:23 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb2ba9f |
7 |
|
8 |
sys-apps/memtest86+: Update 39_memtest86+ to support grub submenus |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
|
12 |
sys-apps/memtest86+/files/39_memtest86+ | 59 ++++++++++++++++++---- |
13 |
...6+-4.20-r2.ebuild => memtest86+-4.20-r3.ebuild} | 2 +- |
14 |
...6+-5.01-r1.ebuild => memtest86+-5.01-r2.ebuild} | 2 +- |
15 |
3 files changed, 50 insertions(+), 13 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/memtest86+/files/39_memtest86+ b/sys-apps/memtest86+/files/39_memtest86+ |
18 |
index 14f27a2..10e1964 100644 |
19 |
--- a/sys-apps/memtest86+/files/39_memtest86+ |
20 |
+++ b/sys-apps/memtest86+/files/39_memtest86+ |
21 |
@@ -4,30 +4,67 @@ |
22 |
|
23 |
memtest=/boot/memtest86plus/memtest |
24 |
|
25 |
+memtestbsd=/boot/memtest86plus/memtest.netbsd |
26 |
+ |
27 |
+if [ -f "${memtest}" ] && [ -f "${memtestbsd}" ]; then |
28 |
+ multiple_memtest=true |
29 |
+fi |
30 |
+ |
31 |
+submenu_indentation="" |
32 |
+if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then |
33 |
+ submenu_indentation="${grub_tab}" |
34 |
+ cat <<EOF |
35 |
+submenu 'Memtest86+' { |
36 |
+EOF |
37 |
+fi |
38 |
+ |
39 |
+ |
40 |
if [ -f "${memtest}" ]; then |
41 |
+ |
42 |
+ gettext_printf "Found memtest image: %s\n" "${memtest}" >&2 |
43 |
+ |
44 |
device="$("${grub_probe}" --target=device "${memtest}")" |
45 |
path="$(make_system_path_relative_to_its_root "${memtest}")" |
46 |
cat <<EOF |
47 |
-menuentry "Memtest86+" { |
48 |
+${submenu_indentation}menuentry 'Memtest86+' { |
49 |
EOF |
50 |
- prepare_grub_to_access_device "${device}" | grub_add_tab |
51 |
+ |
52 |
+ if [ "x${submenu_indentation}" != "x" ]; then |
53 |
+ prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab |
54 |
+ else |
55 |
+ prepare_grub_to_access_device "${device}" | grub_add_tab |
56 |
+ fi |
57 |
+ |
58 |
cat <<EOF |
59 |
- linux16 "${path}" |
60 |
-} |
61 |
+ ${submenu_indentation}linux16 "${path}" |
62 |
+${submenu_indentation}} |
63 |
EOF |
64 |
fi |
65 |
|
66 |
-memtest=/boot/memtest86plus/memtest.netbsd |
67 |
+if [ -f "${memtestbsd}" ]; then |
68 |
|
69 |
-if [ -f "${memtest}" ]; then |
70 |
- device="$("${grub_probe}" --target=device "${memtest}")" |
71 |
- path="$(make_system_path_relative_to_its_root "${memtest}")" |
72 |
+ gettext_printf "Found memtest image: %s\n" "${memtestbsd}" >&2 |
73 |
+ |
74 |
+ device="$("${grub_probe}" --target=device "${memtestbsd}")" |
75 |
+ path="$(make_system_path_relative_to_its_root "${memtestbsd}")" |
76 |
cat <<EOF |
77 |
-menuentry "Memtest86+ (netbsd)" { |
78 |
+${submenu_indentation}menuentry 'Memtest86+ (netbsd)' { |
79 |
EOF |
80 |
- prepare_grub_to_access_device "${device}" | grub_add_tab |
81 |
+ |
82 |
+ if [ "x${submenu_indentation}" != "x" ]; then |
83 |
+ prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab |
84 |
+ else |
85 |
+ prepare_grub_to_access_device "${device}" | grub_add_tab |
86 |
+ fi |
87 |
+ |
88 |
+ cat <<EOF |
89 |
+ ${submenu_indentation}knetbsd "${path}" |
90 |
+${submenu_indentation}} |
91 |
+EOF |
92 |
+fi |
93 |
+ |
94 |
+if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then |
95 |
cat <<EOF |
96 |
- knetbsd "${path}" |
97 |
} |
98 |
EOF |
99 |
fi |
100 |
|
101 |
diff --git a/sys-apps/memtest86+/memtest86+-4.20-r2.ebuild b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild |
102 |
similarity index 97% |
103 |
rename from sys-apps/memtest86+/memtest86+-4.20-r2.ebuild |
104 |
rename to sys-apps/memtest86+/memtest86+-4.20-r3.ebuild |
105 |
index 06dac9c..07f4158 100644 |
106 |
--- a/sys-apps/memtest86+/memtest86+-4.20-r2.ebuild |
107 |
+++ b/sys-apps/memtest86+/memtest86+-4.20-r3.ebuild |
108 |
@@ -1,4 +1,4 @@ |
109 |
-# Copyright 1999-2015 Gentoo Foundation |
110 |
+# Copyright 1999-2016 Gentoo Foundation |
111 |
# Distributed under the terms of the GNU General Public License v2 |
112 |
# $Id$ |
113 |
|
114 |
|
115 |
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild |
116 |
similarity index 98% |
117 |
rename from sys-apps/memtest86+/memtest86+-5.01-r1.ebuild |
118 |
rename to sys-apps/memtest86+/memtest86+-5.01-r2.ebuild |
119 |
index 6186228..7d3372c 100644 |
120 |
--- a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild |
121 |
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild |
122 |
@@ -1,4 +1,4 @@ |
123 |
-# Copyright 1999-2015 Gentoo Foundation |
124 |
+# Copyright 1999-2016 Gentoo Foundation |
125 |
# Distributed under the terms of the GNU General Public License v2 |
126 |
# $Id$ |