[memtest86+] Renamed 20_memtest to 20_memtest86+ Fixed ghost handling, 20_memtest86+ is properly removed now
Jaroslav Škarvada
jskarvad at fedoraproject.org
Wed Dec 7 14:48:42 UTC 2011
commit fd66414e2d213f202c01c80289cea35847282671
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date: Wed Dec 7 15:48:31 2011 +0100
Renamed 20_memtest to 20_memtest86+
Fixed ghost handling, 20_memtest86+ is properly removed now
20_memtest => 20_memtest86+ | 0
memtest-setup | 2 +-
memtest86+.spec | 16 ++++++++++------
3 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/20_memtest b/20_memtest86+
similarity index 100%
rename from 20_memtest
rename to 20_memtest86+
diff --git a/memtest-setup b/memtest-setup
index 91c3b24..450d193 100755
--- a/memtest-setup
+++ b/memtest-setup
@@ -7,7 +7,7 @@ PNAME="memtest86+"
ENAME="elf-memtest86+"
# grub2 template
-G2TEMPL="20_memtest"
+G2TEMPL="20_memtest86+"
if [ -d /sys/firmware/efi ]; then
echo "memtest86+ does not support EFI platforms."
diff --git a/memtest86+.spec b/memtest86+.spec
index c522b4e..d289580 100644
--- a/memtest86+.spec
+++ b/memtest86+.spec
@@ -7,14 +7,14 @@
Name: memtest86+
Version: 4.20
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
Summary: Stand-alone memory tester for x86 and x86-64 computers
Group: System Environment/Base
Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
Source1: memtest-setup
Source2: new-memtest-pkg
-Source3: 20_memtest
+Source3: 20_memtest86+
URL: http://www.memtest.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# require glibc-devel.i386 via this file:
@@ -66,8 +66,8 @@ install -m755 %{SOURCE2} %{buildroot}/sbin/new-memtest-pkg
install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup
sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
-mkdir -p %{buildroot}%{_sysconfdir}/boot.d
-touch %{buildroot}%{_sysconfdir}/boot.d/20_memtest
+mkdir -p %{buildroot}%{_sysconfdir}/grub.d
+touch %{buildroot}%{_sysconfdir}/grub.d/20_memtest86+
install -Dd %{buildroot}%{_datadir}/%{name}
install -m644 %{SOURCE3} %{buildroot}%{_datadir}/%{name}
@@ -93,11 +93,15 @@ rm -rf %{buildroot}
/boot/elf-%{name}-%{version}
/sbin/new-memtest-pkg
%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/20_memtest
-%ghost %attr(0755,-,-) %{_sysconfdir}/boot.d/20_memtest
+%{_datadir}/%{name}/20_memtest86+
+%ghost %attr(0755,-,-) %{_sysconfdir}/grub.d/20_memtest86+
%{_sbindir}/memtest-setup
%changelog
+* Wed Dec 7 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 4.20-3
+- Renamed 20_memtest to 20_memtest86+
+- Fixed ghost handling, 20_memtest86+ is properly removed now
+
* Mon Dec 5 2011 Jaroslav Škarvada <jskarvad at redhat.com> - 4.20-2
- Added support for grub2, thanks to Michal Ambroz <rebus at seznam.cz>
More information about the scm-commits
mailing list