[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[Mike Frysinger]

commit:     3a9c391e65d1ddf5f92632c43379e722391e2db3
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 00:31:47 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 00:32:00 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9c391e

sys-apps/memtest86+: add links to patches sent upstream

 sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch      | 12 ++++++------
 .../memtest86+/files/memtest86+-5.01-io-extern-inline.patch  |  2 ++
 sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch |  2 ++
 sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch     |  3 +++
 sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch       |  2 ++
 sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch   |  2 ++
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch
index b793c32..af011d6 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch
@@ -1,6 +1,7 @@
-diff -Narup memtest86+-5.01-orig/controller.c memtest86+-5.01/controller.c
---- memtest86+-5.01-orig/controller.c	2013-08-09 22:01:58.000000000 -0400
-+++ memtest86+-5.01/controller.c	2014-06-22 11:01:17.347923472 -0400
+http://forum.canardpc.com/threads/110950-fix-controller-loop-error
+
+--- memtest86+-5.01/controller.c
++++ memtest86+-5.01/controller.c
 @@ -292,7 +292,7 @@ static void setup_nhm(void)
  
  	/* First, locate the PCI bus where the MCH is located */
@@ -19,9 +20,8 @@ diff -Narup memtest86+-5.01-orig/controller.c memtest86+-5.01/controller.c
  		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
  		pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
  		vid &= 0xFFFF;
-diff -Narup memtest86+-5.01-orig/Makefile memtest86+-5.01/Makefile
---- memtest86+-5.01-orig/Makefile	2013-08-09 22:01:58.000000000 -0400
-+++ memtest86+-5.01/Makefile	2014-06-22 10:59:27.463573842 -0400
+--- memtest86+-5.01/Makefile
++++ memtest86+-5.01/Makefile
 @@ -12,7 +12,7 @@ FDISK=/dev/fd0
  AS=as -32
  CC=gcc

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch b/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch
index 8dc13b1..682dd5d 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch
@@ -1,3 +1,5 @@
+http://forum.canardpc.com/threads/110951-fix-build-with-newer-gcc-versions
+
 the meaning of extern inline changed between standards.  use static inline
 for these tiny I/O functions everywhere to keep things simple.
 

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch
index bbb2228..ce7f906 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch
@@ -1,3 +1,5 @@
+http://forum.canardpc.com/threads/110955-PATCH-don-t-pull-in-system-headers
+
 avoid using C library headers as it'd mean we'd need 32-bit glibc files available
 
 https://bugs.gentoo.org/592638

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
index 876edcf..e9cbf10 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
@@ -1,3 +1,6 @@
+http://forum.canardpc.com/threads/110954-PATCH-fix-parallel-build-issues
+
+
 don't run the clean target when building all as we run into parallel races:
  - memtest kicks off building of a bunch of .o files
  - clean runs in parallel which runs `rm` and deletes some of the new .o

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch
index 8303ccf..8d830e2 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch
@@ -1,3 +1,5 @@
+http://forum.canardpc.com/threads/110953-PATCH-don-t-try-to-scp-after-building
+
 this makes no sense in a sane build world
 
 --- a/Makefile

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch
index a121fde..f4b42fe 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch
@@ -1,3 +1,5 @@
+http://forum.canardpc.com/threads/110952-fix-build-due-to-missing-reboot-symbol
+
 the reboot func is used elsewhere, so don't mark it inline
 
 --- a/lib.c

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[Mike Frysinger]

commit:     270d1954363def0d88b42054d5991c9fde0a8071
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 23:35:50 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 23:36:42 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270d1954

sys-apps/memtest86+: make sure we keep -fno-PIC on test.o/random.o objects #538596

 sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch b/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch
index 8a76d046414..dcdccb8c6e9 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch
@@ -11,11 +11,11 @@ https://bugs.gentoo.org/590974
  
  test.o: test.c
 -	$(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+test.o: CFLAGS += -O0
++test.o: CFLAGS += -O0 -fno-PIC
  
  random.o: random.c
 -	$(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-+random.o: CFLAGS += -O3
++random.o: CFLAGS += -O3 -fno-PIC
  	
  # rule for build number generation  
  build_number:

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[Mike Frysinger]

commit:     8fe39c8d9fd69b55db808f93edb8c1cbee496f36
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 14 23:46:48 2017 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 14 23:54:27 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe39c8d

sysa-apps/memtest86+: rework grub shell style

Drop old portable shell style as we don't care about such insane shells.

 sys-apps/memtest86+/files/39_memtest86+ | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sys-apps/memtest86+/files/39_memtest86+ b/sys-apps/memtest86+/files/39_memtest86+
index 10e1964cb8d..9c9067a5e73 100644
--- a/sys-apps/memtest86+/files/39_memtest86+
+++ b/sys-apps/memtest86+/files/39_memtest86+
@@ -11,16 +11,14 @@ if [ -f "${memtest}" ] && [ -f "${memtestbsd}" ]; then
 fi
 
 submenu_indentation=""
-if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
 	submenu_indentation="${grub_tab}"
 	cat <<EOF
 submenu 'Memtest86+' {
 EOF
 fi
 
-
 if [ -f "${memtest}" ]; then
-
 	gettext_printf "Found memtest image: %s\n" "${memtest}" >&2
 
 	device="$("${grub_probe}" --target=device "${memtest}")"
@@ -29,7 +27,7 @@ if [ -f "${memtest}" ]; then
 ${submenu_indentation}menuentry 'Memtest86+' {
 EOF
 
-	if [ "x${submenu_indentation}" != "x" ]; then
+	if [ -n "{submenu_indentation}" ]; then
 		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
 	else
 		prepare_grub_to_access_device "${device}" | grub_add_tab
@@ -42,7 +40,6 @@ EOF
 fi
 
 if [ -f "${memtestbsd}" ]; then
-
 	gettext_printf "Found memtest image: %s\n" "${memtestbsd}" >&2
 
 	device="$("${grub_probe}" --target=device "${memtestbsd}")"
@@ -51,7 +48,7 @@ if [ -f "${memtestbsd}" ]; then
 ${submenu_indentation}menuentry 'Memtest86+ (netbsd)' {
 EOF
 
-	if [ "x${submenu_indentation}" != "x" ]; then
+	if [ -n "${submenu_indentation}" ]; then
 		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
 	else
 		prepare_grub_to_access_device "${device}" | grub_add_tab
@@ -63,7 +60,7 @@ ${submenu_indentation}}
 EOF
 fi
 
-if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; then
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
 	cat <<EOF
 }
 EOF

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[Sergei Trofimovich]

commit:     ecccf6635134e7f11ef37d366c5e8b840c7b5c00
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 15 07:01:37 2018 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Fri Jun 15 07:02:24 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecccf663

sys-apps/memtest86+: tweak patch to be appliable as -p1

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
index f140a7fc660..21b51c5b7ff 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
@@ -1,5 +1,5 @@
---- Makefile.orig	2015-02-01 01:08:33.000000000 +0300
-+++ Makefile	2015-02-01 01:10:17.624757244 +0300
+--- a/Makefile.orig	2015-02-01 01:08:33.000000000 +0300
++++ b/Makefile	2015-02-01 01:10:17.624757244 +0300
 @@ -9,11 +9,10 @@
  #
  FDISK=/dev/fd0

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[Mike Gilbert]

commit:     8cac92aeabcd6dfdf6cfd39138a2b382beea0db8
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jun 13 18:09:26 2018 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Jun 26 15:04:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cac92ae

sys-apps/memtest86+: remove unused patches

 .../files/memtest86+-1.70-gnu_hash.patch           | 11 --------
 .../files/memtest86+-2.01-hardcoded_cc.patch       | 30 ----------------------
 .../files/memtest86+-4.00-hardcoded_cc.patch       | 30 ----------------------
 3 files changed, 71 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch b/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
deleted file mode 100644
index 5a9e06dc06d..00000000000
--- a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp memtest86+-1.70-orig/memtest_shared.lds memtest86+-1.70/memtest_shared.lds
---- memtest86+-1.70-orig/memtest_shared.lds	2007-01-27 13:34:16.000000000 +0100
-+++ memtest86+-1.70/memtest_shared.lds	2007-01-27 13:41:30.000000000 +0100
-@@ -18,6 +18,7 @@ SECTIONS {
- 	.dynsym     : { *(.dynsym) }
- 	.dynstr     : { *(.dynstr) }
- 	.hash       : { *(.hash) }
-+	.gnu.hash   : { *(.gnu.hash) }
- 	.dynamic    : { *(.dynamic) }
- 
- 	.rel.text    : { *(.rel.text   .rel.text.*) }

diff --git a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
deleted file mode 100644
index 3b07731daad..00000000000
--- a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp memtest86+-2.01-orig/Makefile memtest86+-2.01/Makefile
---- memtest86+-2.01-orig/Makefile	2008-03-11 21:04:28.000000000 +0100
-+++ memtest86+-2.01/Makefile	2008-03-11 21:05:25.000000000 +0100
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -m32 -march=i486 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
- 	memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin

diff --git a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
deleted file mode 100644
index f2950b64e80..00000000000
--- a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*rej' --exclude '*~' memtest86+-4.00.orig/Makefile memtest86+-4.00/Makefile
---- memtest86+-4.00.orig/Makefile	2009-09-21 17:35:46.000000000 -0700
-+++ memtest86+-4.00/Makefile	2009-09-25 09:04:23.000000000 -0700
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
-@@ -47,10 +46,10 @@
- 	memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie -nopie test.c
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[Aaron Bauman]

commit:     f023e69d4cc14664dd707619628e840c555847ec
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Nov 22 08:18:38 2019 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 00:40:21 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f023e69d

sys-apps/memtest86+: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>

 .../files/memtest86+-4.20-hardcoded_cc.patch       | 30 ----------------------
 1 file changed, 30 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch
deleted file mode 100644
index 2eb750c8dd9..00000000000
--- a/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp memtest86+-4.10-orig/Makefile memtest86+-4.10/Makefile
---- memtest86+-4.10-orig/Makefile	2010-06-24 00:27:22.864634431 +0200
-+++ memtest86+-4.10/Makefile	2010-06-24 00:28:42.402478590 +0200
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+CFLAGS=-Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin -ffreestanding -fPIC -fno-stack-protector
-+CPPFLAGS=-m32
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-       config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
- 	memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--	$(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+	$(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--	$(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+	$(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie test.c
- 
- clean:
- 	rm -f *.o *.s *.iso memtest.bin memtest memtest_shared memtest_shared.bin

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

[Ben Kohler]

commit:     1cb153f2fddd44769e159e0fd0a24298f88d36ab
Author:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri May 19 12:57:07 2023 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri May 19 12:59:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb153f2

sys-apps/memtest86+: fix syntax error in grub.d file

This minor syntax error would cause some indentation inconsistency

Closes: https://bugs.gentoo.org/839174

Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 sys-apps/memtest86+/files/39_memtest86+-r2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/files/39_memtest86+-r2 b/sys-apps/memtest86+/files/39_memtest86+-r2
index a213e0325609..d53f83cc311a 100644
--- a/sys-apps/memtest86+/files/39_memtest86+-r2
+++ b/sys-apps/memtest86+/files/39_memtest86+-r2
@@ -30,7 +30,7 @@ ${submenu_indentation}if [ "x\$grub_platform" = xpc ]; then
 ${submenu_indentation}menuentry 'Memtest86+ 32bit' {
 EOF
 
-	if [ -n "{submenu_indentation}" ]; then
+	if [ -n "${submenu_indentation}" ]; then
 		prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
 	else
 		prepare_grub_to_access_device "${device}" | grub_add_tab