commit 22671c35b3ef8acd1d9db00f938fc5bbdbee5452
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Tue Mar 27 11:06:27 2012 +0200
Fixed path in 20_memtest86+ not to generate error on grub2-mkconfig
Resolves: rhbz#805542
- Temporal fix for 7th test failure
Resolves: rhbz#805813
20_memtest86+ | 4 +-
memtest86+-4.20-gcc47-test7-workaround.patch | 36 ++++++++++++++++++++++++++
memtest86+.spec | 13 ++++++++-
3 files changed, 49 insertions(+), 4 deletions(-)
---
diff --git a/20_memtest86+ b/20_memtest86+
index 04c3f02..fcc3651 100644
--- a/20_memtest86+
+++ b/20_memtest86+
@@ -20,8 +20,8 @@ set -e
prefix=/usr
exec_prefix=/usr
bindir=/usr/bin
-libdir=/usr/lib
-. ${libdir}/grub/grub-mkconfig_lib
+grublibdir=/usr/share/grub
+. ${grublibdir}/grub-mkconfig_lib
export TEXTDOMAIN=grub
export TEXTDOMAINDIR=${prefix}/share/locale
diff --git a/memtest86+-4.20-gcc47-test7-workaround.patch b/memtest86+-4.20-gcc47-test7-workaround.patch
new file mode 100644
index 0000000..edc37d7
--- /dev/null
+++ b/memtest86+-4.20-gcc47-test7-workaround.patch
@@ -0,0 +1,36 @@
+diff -up memtest86+-4.20/test.c.test memtest86+-4.20/test.c
+--- memtest86+-4.20/test.c.test 2011-01-23 19:11:04.000000000 +0100
++++ memtest86+-4.20/test.c 2012-03-22 14:21:27.737524043 +0100
+@@ -260,7 +260,7 @@ void movinvr()
+ int i, j, done, seed1, seed2;
+ volatile ulong *pe;
+ volatile ulong *start,*end;
+- ulong num;
++ ulong num, bad;
+ uintptr_t seg_start;
+
+ /* Initialize memory with initial sequence of random numbers. */
+@@ -296,12 +296,12 @@ void movinvr()
+ break;
+ }
+ /* Original C code replaced with hand tuned assembly code */
+-/*
++
+ for (; p < pe; p++) {
+ *p = rand();
+ }
+- */
+
++/*
+ asm __volatile__ (
+ "jmp L200\n\t"
+ ".p2align 4,,7\n\t"
+@@ -315,7 +315,7 @@ void movinvr()
+ : "D" (p), "b" (pe)
+ : "eax", "edx"
+ );
+-
++*/
+ do_tick();
+ BAILR
+ } while (!done);
diff --git a/memtest86+.spec b/memtest86+.spec
index 311f673..009468f 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -7,7 +7,7 @@
Name: memtest86+
Version: 4.20
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Summary: Stand-alone memory tester for x86 and x86-64 computers
Group: System Environment/Base
@@ -15,6 +15,8 @@ Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
Source1: memtest-setup
Source2: new-memtest-pkg
Source3: 20_memtest86+
+Patch0: memtest86+-4.20-gcc47-test7-workaround.patch
+
URL: http://www.memtest.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# require glibc-devel.i386 via this file:
@@ -38,7 +40,8 @@ The script '%{_sbindir}/memtest-setup' can be run (as root)
to add the %{name} entry to your GRUB boot menu.
%prep
-%setup -q
+%setup -q
+%patch0 -p1 -b .gcc47-test7-workaround
sed -i -e's,0x5000,0x100000,' memtest.lds
%ifarch x86_64
sed -i -e's,$(LD) -s -T memtest.lds,$(LD) -s -T memtest.lds -z max-page-size=0x1000,' Makefile
@@ -98,6 +101,12 @@ rm -rf %{buildroot}
%{_sbindir}/memtest-setup
%changelog
+* Tue Mar 27 2012 Jaroslav Škarvada <jskarvad at redhat.com> - 4.20-6
+- Fixed path in 20_memtest86+ not to generate error on grub2-mkconfig
+ Resolves: rhbz#805542
+- Temporal fix for 7th test failure
+ Resolves: rhbz#805813
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.20-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild