rpms/memtest86+/F-9 import.log, NONE, 1.1 .cvsignore, 1.18, 1.19 memtest-setup, 1.2, 1.3 memtest86+.spec, 1.37, 1.38 sources, 1.18, 1.19 memtest86+-2.10-fixflags.patch, 1.1, NONE
Paulo Roma Cavalcanti
roma at fedoraproject.org
Fri Mar 13 19:56:41 UTC 2009
Author: roma
Update of /cvs/pkgs/rpms/memtest86+/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31009/F-9
Modified Files:
.cvsignore memtest-setup memtest86+.spec sources
Added Files:
import.log
Removed Files:
memtest86+-2.10-fixflags.patch
Log Message:
Updated to 2.11
--- NEW FILE import.log ---
memtest86+-2_11-4_fc10:F-9:memtest86+-2.11-4.fc10.src.rpm:1236974130
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 18 Nov 2008 03:54:58 -0000 1.18
+++ .cvsignore 13 Mar 2009 19:56:10 -0000 1.19
@@ -1 +1 @@
-memtest86+-2.10.tar.gz
+memtest86+-2.11.tar.gz
Index: memtest-setup
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/memtest-setup,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- memtest-setup 4 Mar 2008 21:39:54 -0000 1.2
+++ memtest-setup 13 Mar 2009 19:56:10 -0000 1.3
@@ -25,6 +25,9 @@
if [ "$RETVAL" != "0" ]; then
echo "ERROR: grubby failed to configure your bootloader for $MTPATH."
exit $RETVAL
+else
+ sed -i -e's,kernel /memtest86+,kernel --type=netbsd /memtest86+,' /boot/grub/grub.conf
+ sed -i -e"s,/memtest86+-$MTVERSION.*,/memtest86+-$MTVERSION," /boot/grub/grub.conf
fi
echo "Setup complete."
Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/memtest86+.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- memtest86+.spec 18 Nov 2008 03:54:58 -0000 1.37
+++ memtest86+.spec 13 Mar 2009 19:56:10 -0000 1.38
@@ -2,16 +2,16 @@
%define __spec_install_post /usr/lib/rpm/brp-compress
# Turn off debuginfo package
%define debug_package %{nil}
+%bcond_with update-grub.conf
Summary: Stand-alone memory tester for x86 and x86-64 computers
Name: memtest86+
-Version: 2.10
-Release: 1%{?dist}
+Version: 2.11
+Release: 4%{?dist}
License: GPLv2
ExclusiveArch: %{ix86} x86_64
Group: System Environment/Base
-Source0: http://www.memtest.org/download/%{version}/memtest86+-%{version}.tar.gz
-Patch0: memtest86+-2.10-fixflags.patch
+Source0: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz
URL: http://www.memtest.org
Source1: new-memtest-pkg
Source2: memtest-setup
@@ -21,18 +21,21 @@
BuildRequires: compat-gcc-34
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
%description
Memtest86+ is a thorough stand-alone memory test for x86 and x86-64
architecture computers. BIOS based memory tests are only a quick
check and often miss many of the failures that are detected by
Memtest86+.
-Run 'memtest-setup' to add to your GRUB or lilo boot menu.
+This version avoids the following errors when booting from grub:
+"Error 7: Loading below 1MB is not supported"
+"Error 13: Invalid or unsupported executable format"
+"Error 28: Selected item cannot fit into memory"
+Optionally, run 'memtest-setup' to add to your GRUB or lilo boot menu.
%prep
%setup -q
-%patch0 -p1
+sed -i -e's,0x10000,0x100000,' memtest.lds
%build
# Regular build flags not wanted for this binary
@@ -41,29 +44,78 @@
# It makes no sense to use smp flags here.
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/boot
-mkdir -p $RPM_BUILD_ROOT/sbin
-mkdir -p $RPM_BUILD_ROOT%{_sbindir}
-
-install -m644 memtest.bin $RPM_BUILD_ROOT/boot/memtest86+-%{version}
-install -m755 %{SOURCE1} $RPM_BUILD_ROOT/sbin/new-memtest-pkg
-install -m755 %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/memtest-setup
+rm -rf %{buildroot}
+mkdir -p %{buildroot}/boot
+mkdir -p %{buildroot}/sbin
+mkdir -p %{buildroot}%{_sbindir}
+
+# install the ELF version, not the floppy (memtest.bin) one.
+install -m644 memtest %{buildroot}/boot/%{name}-%{version}
+install -m755 %{SOURCE1} %{buildroot}/sbin/new-memtest-pkg
+install -m755 %{SOURCE2} %{buildroot}%{_sbindir}/memtest-setup
+sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}/README
+
+%post
+%if %{with update-grub.conf}
+if [ -x /sbin/grubby ] ; then
+ /sbin/grubby \
+ --add-kernel="/boot/%{name}-%{version}" \
+ --title "Memtest86+ (%{version})"
+
+ sed -i -e's,kernel /%{name}-%{version},kernel --type=netbsd /%{name}-%{version},' /boot/grub/grub.conf
+fi
+%else
+cat << EOF
+
+************************************************
+* REMINDER: Please update your /etc/grub.conf *
+* file and add the memtest86+ boot entry, *
+* by running /usr/sbin/memtest-setup as root. *
+************************************************
+
+EOF
+%endif
+
+%postun
+%if %{with update-grub.conf}
+if [ -x /sbin/grubby ] ; then
+ sed -i -e's,kernel --type=netbsd /%{name}-%{version},kernel /%{name}-%{version},' /boot/grub/grub.conf
+ /sbin/grubby --remove-kernel="/boot/%{name}-%{version}"
+fi
+%else
+cat << EOF
+
+************************************************
+* REMINDER: Please update your /etc/grub.conf *
+* file and remove any memtest86+ boot entry. *
+************************************************
+
+EOF
+%endif
+
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
%defattr(-,root,root,-)
%doc README
-/boot/memtest86+-%{version}
+/boot/%{name}-%{version}
/sbin/new-memtest-pkg
%{_sbindir}/memtest-setup
-%preun
-/sbin/new-memtest-pkg --remove %{version}
-
%changelog
+* Mon Mar 11 2009 Paulo Roma <roma at lcg.ufrj.br> - 2.11-4
+- Updated to 2.11
+- Patched for booting from grub.
+- Using memtest (ELF) instead of memtest.bin
+- Changed memtest-setup for writing the correct grub entry.
+- Removed obsolete patch memtest86+-2.10-fixflags.patch
+- Created option update grub.conf
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.11-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Mon Nov 12 2008 Warren Togami <wtogami at redhat.com> - 2.10-1
- 2.10
@@ -100,6 +152,9 @@
- some spec cleanups (#226135)
- remove old Obsoletes
+* Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 1.65-4.1
+- rebuild
+
* Tue Jun 27 2006 Florian La Roche <laroche at redhat.com> - 1.65-4
- make sure coreutils is installed for the preun script
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/F-9/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 18 Nov 2008 03:54:58 -0000 1.18
+++ sources 13 Mar 2009 19:56:10 -0000 1.19
@@ -1 +1 @@
-9ca90f6225b5fa4ed1334583c3d6b855 memtest86+-2.10.tar.gz
+e457774139c0bfef899359df91f49b3e memtest86+-2.11.tar.gz
--- memtest86+-2.10-fixflags.patch DELETED ---
More information about the fedora-extras-commits
mailing list