diff --git a/.gitignore b/.gitignore index 70d2047..447af40 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ memtest86+-4.10.tar.gz /memtest86+-4.20.tar.gz /memtest86+-5.01.tar.gz /memtest86+-5.31b.tar.gz +/memtest86-plus-6.20.tar.gz diff --git a/20_memtest86+ b/20_memtest86+ deleted file mode 100644 index 9b6dabd..0000000 --- a/20_memtest86+ +++ /dev/null @@ -1,142 +0,0 @@ -#! /bin/sh -set -e - -# grub-mkconfig helper script. -# Copyright (C) 2011 Michal Ambroz -# -# you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# Distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with the script. If not, see . - -prefix=/usr -exec_prefix=/usr -bindir=/usr/bin -grublibdir=/usr/share/grub -. ${grublibdir}/grub-mkconfig_lib - -export TEXTDOMAIN=grub -export TEXTDOMAINDIR=${prefix}/share/locale - -CLASS="" - -if [ "x${GRUB_DISTRIBUTOR}" = "x" ] ; then - OS=Memtest -else - OS="${GRUB_DISTRIBUTOR} Memtest" -fi - -CONF_FILE="/etc/memtest86+.conf" -CONF_ELF_VAR="INSTALL_ELF" - -MEMTEST86_ELF=`[ -r "$CONF_FILE" ] && sed -n "/^\s*${CONF_ELF_VAR}\s*=/ {s/^\s*${CONF_ELF_VAR}\s*=\s*\(.*\)$/\1/; T end; s/\s*\(\S\)*\s*/\1/; p; :end}" "$CONF_FILE" 2>/dev/null` -if [ "x${MEMTEST86_ELF}" = "x" ] || [ "x${MEMTEST86_ELF}" = "x1" ] || [ "x${MEMTEST86_ELF}" = "xtrue" ]; then - MEMTEST86_ELF=1 - BANNER_SUFFIX= - IMAGE="elf-memtest" -else - MEMTEST86_ELF=0 - IMAGE="memtest" - BANNER_SUFFIX=" (non-ELF)" -fi - -# loop-AES arranges things so that /dev/loop/X can be our root device, but -# the initrds that Linux uses don't like that. -case ${GRUB_DEVICE} in - /dev/loop/*|/dev/loop[0-9]) - GRUB_DEVICE=`losetup ${GRUB_DEVICE} | sed -e "s/^[^(]*(\([^)]\+\)).*/\1/"` - ;; -esac - -if [ "x${GRUB_DEVICE_UUID}" = "x" ] || [ "x${GRUB_DISABLE_LINUX_UUID}" = "xtrue" ] \ - || ! test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}" \ - || uses_abstraction "${GRUB_DEVICE}" lvm; then - LINUX_ROOT_DEVICE=${GRUB_DEVICE} -else - LINUX_ROOT_DEVICE=UUID=${GRUB_DEVICE_UUID} -fi - -if [ "x`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2>/dev/null || true`" = xbtrfs ]; then - rootsubvol="`make_system_path_relative_to_its_root /`" - rootsubvol="${rootsubvol#/}" - if [ "x${rootsubvol}" != x ]; then - GRUB_CMDLINE_LINUX="rootflags=subvol=${rootsubvol} ${GRUB_CMDLINE_LINUX}" - fi -fi - -memtest_entry () -{ - os="$1" - version="$2" - recovery="$3" - args="$4" - title="$(gettext_quoted "%s %s")" - printf "menuentry '${title}${BANNER_SUFFIX}' {\n" "${os}" "${version}" - - - if [ x$dirname = x/ ]; then - if [ -z "${prepare_root_cache}" ]; then - prepare_root_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE} | sed -e "s/^/\t/")" - fi - printf '%s\n' "${prepare_root_cache}" - else - if [ -z "${prepare_boot_cache}" ]; then - prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" - fi - printf '%s\n' "${prepare_boot_cache}" - fi - message="$(gettext_printf "Loading %s %s ..." "${os}" "${version}")" - if [ "x${MEMTEST86_ELF}" = "x1" ]; then - cat << EOF - insmod bsd - echo '$message' - knetbsd ${rel_dirname}/${basename} -} -EOF - else - cat << EOF - echo '$message' - linux16 ${rel_dirname}/${basename} -} -EOF - fi -} - -case x`uname -m` in - xi?86 | xx86_64) - list=`for i in /boot/${IMAGE}* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; - *) - list=`for i in /boot/${IMAGE}* ; do - if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi - done` ;; -esac - -prepare_boot_cache= -prepare_root_cache= - -while [ "x$list" != "x" ] ; do - linux=`version_find_latest $list` - echo "Found memtest image: $linux" >&2 - basename=`basename $linux` - dirname=`dirname $linux` - rel_dirname=`make_system_path_relative_to_its_root $dirname` - version=`echo $basename | sed -e "s,^[^0-9]*-,,g"` - alt_version=`echo $version | sed -e "s,\.old$,,g"` - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" - - - memtest_entry "${OS}" "${version}" false \ - "${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}" - - list=`echo $list | tr ' ' '\n' | grep -vx $linux | tr '\n' ' '` -done diff --git a/README b/README index bb8991d..3e16347 100644 --- a/README +++ b/README @@ -1,46 +1,3 @@ -Install memtest86+ into your grub menu by the following command: - -# memtest-setup - -It will install 20_memtest86+ GRUB 2 template into /etc/grub.d and you will also -need to regenerate GRUB 2 config by running: - -# grub2-mkconfig -o /boot/grub2/grub.cfg - -This is not done automatically because it could overwrite any custom changes -in /boot/grub2/grub.cfg. - -By default ELF version of memtest86+ is installed, which should work on most of -the systems. In case it doesn't work for you, you can try to install the non-ELF -version by running: - -# memtest-setup -b - -Or you can switch between ELF and non-ELF versions of memtest86+ by using -INSTALL_ELF variable from /etc/memtest86+.conf. Setting it to '1' will instruct -GRUB 2 to install ELF version of memtest86+ and setting it to '0' will instruct -GRUB 2 to install non-ELF version. If the variable is empty or unset, the ELF -version is installed (it's due to backward compatibility). For the change -to take effect you need to regenerate your GRUB 2 config by running: - -# grub2-mkconfig -o /boot/grub2/grub.cfg - -The non-ELF version is known to cause various problems and it may not work on -several systems. That's why the ELF version is installed by default. - -In case of problems you can also try to install the non-ELF version of -memtest86+ on floppy disk or USB flash disk and boot the memtest86+ from it. -The following command installs the memtest86+ on floppy disk -(WARNING: all data previosly stored on the disk will be lost): - -# dd if=/boot/memtest86+-VERSION of=/dev/fd0 - -For USB flash disk the command is the same, just change the 'of' device -appropriately (usually USB flash disk is /dev/sdb, but double check that -the device string matches your USB flash disk before you run the command, -wrong device string may cause significat harm, e.g. it can destroy content -of your system or data disks). - The memtest86+ now supports some command line parameters: console= - serial console can be used for memtest86+ control/display, example of usage: @@ -61,7 +18,7 @@ The memtest86+ now supports some command line parameters: You can add memtest86+ command line parameters into grub like you are used with kernel command line parameters, e.g.: - linux16 /memtest86+-VERSION console=ttyS0 + linux /memtest86+-VERSION console=ttyS0 Unfortunately this is currently supported only with non-ELF memtest86+ image. You cannot use the command line parameters with the ELF image, because the diff --git a/changelog b/changelog new file mode 100644 index 0000000..63c0727 --- /dev/null +++ b/changelog @@ -0,0 +1,424 @@ +* Wed Mar 29 2023 Jonathan Steffan - 6.10-1 +- Update to 6.10 +- Simplify 20_memtest86+ + +* Thu Jan 26 2023 Gordon Messmer - 6.01-2 +- Initial package for v6 + +* Thu Jan 19 2023 Fedora Release Engineering - 5.31-0.8.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 5.31-0.7.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 27 2022 Jaroslav Škarvada - 5.31-0.6.beta +- Fixed FTBFS with gcc-12 and -Werror=uninitialized + Resolves: rhbz#2046736 + +* Thu Jan 20 2022 Fedora Release Engineering - 5.31-0.5.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 5.31-0.4.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 5.31-0.3.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 5.31-0.2.beta +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed May 13 2020 Jaroslav Škarvada - 5.31-0.1.beta +- New version + Resolves: rhbz#1758783 +- Dropped no-scp, no-optimization, compile-fix, crash-fix patches (all upstreamed) +- Dropped fgnu89-inline patch (probably not needed) + +* Wed Jan 29 2020 Fedora Release Engineering - 5.01-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Fri Aug 2 2019 Jaroslav Škarvada - 5.01-27 +- No more compat-gcc in rawhide, so switching to distro's gcc + Resolves: rhbz#1736106 + +* Thu Jul 25 2019 Fedora Release Engineering - 5.01-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Apr 5 2019 Jaroslav Škarvada - 5.01-25 +- Fixed serial console + +* Tue Feb 5 2019 Jaroslav Škarvada - 5.01-24 +- Temporally switched to compat-gcc-34 + Resolves: rhbz#1598922 + +* Fri Feb 01 2019 Fedora Release Engineering - 5.01-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 20 2018 Jaroslav Škarvada - 5.01-22 +- Fixed FTBFS by adding gcc-c++ requirement + Resolves: rhbz#1604814 + +* Fri Jul 13 2018 Fedora Release Engineering - 5.01-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Thu Jun 28 2018 Jaroslav Škarvada - 5.01-20 +- Dropped grub legacy support + +* Thu Feb 08 2018 Fedora Release Engineering - 5.01-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 5.01-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 5.01-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 5.01-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue Apr 5 2016 Jaroslav Škarvada - 5.01-15 +- Various improvements to memtest-setup, e.g. now exits with error if + run by non root user + +* Tue Feb 23 2016 Jaroslav Škarvada - 5.01-14 +- Removed some spec artifacts (like buildroot cleaning) +- Fixed malformed "Loading" banner +- Not relocating memtest86+ above 1 MB + Related: rhbz#1303804 +- Introduced new configuration file (/etc/memtest86+.conf) +- Introduced new memtest-setup switches for selecting ELF/non-ELF versions + Resolves: rhbz#1303804 + +* Fri Feb 12 2016 Jaroslav Škarvada - 5.01-13 +- Updated distribution specific README + +* Thu Feb 04 2016 Fedora Release Engineering - 5.01-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Thu Jan 28 2016 Jaroslav Škarvada - 5.01-11 +- Fixed memtest86+ binary (non-ELF) to run from floppy + +* Fri Jan 8 2016 Jaroslav Škarvada - 5.01-10 +- Fixed memtest86+ to run even if relocated above 1 MB + (by real-mode-reloc patch) +- Relocated memtest86+ above 1 MB (as we always did in Fedora) +- Fixed compilation of inline assembly with new gcc + (by fgnu89-inline patch) + +* Wed Jun 17 2015 Fedora Release Engineering - 5.01-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Oct 21 2014 Jaroslav Škarvada - 5.01-8 +- More crash fixes (by crash-fix patch from David McInnis) + +* Fri Sep 5 2014 Jaroslav Škarvada - 5.01-7 +- Fixed typo in memtest-setup help, added its options to man / help + +* Wed Sep 3 2014 Jaroslav Škarvada - 5.01-6 +- Fixed memtest-setup script + +* Tue Aug 26 2014 Jaroslav Škarvada - 5.01-5 +- Added documentation regarding memtest-setup + +* Sun Aug 17 2014 Fedora Release Engineering - 5.01-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 5.01-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu Apr 3 2014 Jaroslav Škarvada - 5.01-2 +- Switched back to latest distro gcc + +* Mon Feb 17 2014 Jaroslav Škarvada - 5.01-1 +- New version + Resolves: rhbz#1013110 +- Switched to the gcc-34 due to upstream non-compatiblity with + the latest gccs (#1013110) +- Removed trailing whitespaces from the description + +* Mon Sep 16 2013 Jaroslav Škarvada - 4.20-11 +- Fixed grubby requirement +- Fixed bogus dates in changelog (best effort) + +* Sat Aug 03 2013 Fedora Release Engineering - 4.20-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Thu Feb 14 2013 Fedora Release Engineering - 4.20-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Tue Jan 8 2013 Jaroslav Škarvada - 4.20-8 +- Fixed packaging regarding usrmove + +* Fri Jul 20 2012 Fedora Release Engineering - 4.20-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Mar 27 2012 Jaroslav Škarvada - 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 - 4.20-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Dec 7 2011 Jaroslav Škarvada - 4.20-4 +- Used ELF format with grub2 + +* Wed Dec 7 2011 Jaroslav Škarvada - 4.20-3 +- Renamed 20_memtest to 20_memtest86+ +- Fixed ghost handling, 20_memtest86+ is properly removed now + +* Mon Dec 5 2011 Jaroslav Škarvada - 4.20-2 +- Added support for grub2, thanks to Michal Ambroz + +* Mon Mar 07 2011 Jaroslav Škarvada - 4.20-1 +- Update to new version (#682425) +- Removed fix-asciimap patch (not needed now) +- Removed make-gcc4-builds-work patch (not used) + +* Mon Feb 21 2011 Jaroslav Škarvada - 4.10-5 +- Deprecated nash replaceed by findfs (#671503) + +* Wed Feb 09 2011 Fedora Release Engineering - 4.10-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Tue Jan 11 2011 Jaroslav Škarvada - 4.10-3 +- Reduce max-page-size on x86_64 to fit into loader limits (#620846) + +* Tue May 25 2010 Anton Arapov - 4.10-2 +- Fix memory region to load. (#578966) + +* Wed May 05 2010 Anton Arapov - 4.10-1 +- Update to new upstream release, v4.10 + +* Tue Mar 30 2010 Anton Arapov - 4.00-4 +- Fix ascii map of spd.c (#577469) + +* Fri Dec 25 2009 Robert Scheck - 4.00-3 +- Removed obsolete build requirement to compat-gcc-34 (#442285) + +* Tue Oct 13 2009 Jarod Wilson - 4.00-2 +- Fix memtest-setup on systems without a separate /boot + filesystem (#528651) + +* Tue Sep 29 2009 Jarod Wilson - 4.00-1 +- Update to new upstream release, v4.00 +- Drop gcc4.2+ patch, merged upstream + +* Mon Aug 17 2009 Jarod Wilson - 2.11-11 +- Fix runtime operation when built with gcc4.2+ (#442285) + +* Sat Jul 25 2009 Fedora Release Engineering - 2.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Fri Apr 24 2009 Warren Togami - 2.11-9 +- Fix uninstall to remove stanza from grub.conf + +* Fri Apr 24 2009 Warren Togami - 2.11-8 +- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary + during livecd-creator +- Put scripts into CVS + +* Sun Apr 05 2009 Paulo Roma - 2.11-7 +- adapted the spec file for building the elf and + the bin versions #494157 + +* Thu Apr 02 2009 Paulo Roma - 2.11-6 +- grub.conf will not be updated by default. The user + will have to add and/or remove memtest86+ entries. +- No messages printed. + +* Tue Mar 31 2009 Paulo Roma - 2.11-5 +- Changed postun for preun. +- Calling memtest-setup in case of updating grub.conf + +* Wed Mar 11 2009 Paulo Roma - 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 - 2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Wed Nov 12 2008 Warren Togami - 2.10-1 +- 2.10 + +* Thu Apr 03 2008 Warren Togami - 2.01-3 +- Build with gcc34 for F9 (#437701) + +* Tue Mar 04 2008 Peter Jones - 2.01-2 +- Don't install memtest86+ in bootloader configs on EFI platforms. + +* Thu Feb 21 2008 Warren Togami - 2.01-1 +- 2.01 major bugfix release + +* Mon Feb 11 2008 Michal Schmidt - 2.00-2 +- forgot to cvs add the compilation patch. + +* Mon Feb 11 2008 Michal Schmidt - 2.00-1 +- New upstream release: 2.00. +- Dropped boot time console configuration patches (already upstream). +- Fixed compilation on x86_64. + +* Wed Oct 24 2007 Peter Jones - 1.70-4 +- Fix for mactel. + +* Thu Oct 18 2007 Warren Togami - 1.70-3 +- one more patch from mschmidt to allow configuration of parity and bits + +* Wed Oct 17 2007 Warren Togami - 1.70-2 +- mschmidt's boot time configuration of serial console (#319631) + +* Thu Feb 08 2007 Florian La Roche - 1.70-1 +- update to 1.70 + +* Sat Feb 03 2007 Warren Togami - 1.65-6 +- some spec cleanups (#226135) +- remove old Obsoletes + +* Wed Jul 12 2006 Jesse Keating - 1.65-4.1 +- rebuild + +* Tue Jun 27 2006 Florian La Roche - 1.65-4 +- make sure coreutils is installed for the preun script + +* Thu Jun 08 2006 Jesse Keating - 1.65-3 +- rebuilt for new buildsystem + +* Tue Feb 07 2006 Jesse Keating - 1.65-2.2 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Sat Oct 15 2005 Florian La Roche +- make sure 32bit glibc-devel is installed (#170614) + +* Sat Oct 01 2005 Warren Togami - 1.65-1 +- 1.65 + +* Wed Jun 29 2005 Warren Togami - 1.60-1 +- 1.60 + +* Mon Mar 28 2005 Warren Togami - 1.55.1-1 +- 1.55.1 fixes K8 + +* Sun Mar 27 2005 Warren Togami - 1.55-1 +- 1.55 + +* Wed Mar 16 2005 Elliot Lee +- rebuilt + +* Sat Feb 19 2005 Warren Togami - 1.51-1 +- 1.51 + +* Fri Jan 21 2005 Warren Togami - 1.50-1 +- 1.50 + +* Sun Nov 28 2004 Warren Togami - 1.40-1 +- 1.40 +- remove arch patch, now upstream + +* Tue Oct 26 2004 Warren Togami - 1.27-1 +- 1.27 + +* Mon Oct 25 2004 Jeremy Katz - 1.26-3 +- allow building on all x86 arches +- pass appropriate compiler options to build on x86_64 as well (#136939) + +* Thu Sep 02 2004 Warren Togami 1.26-1 +- update to 1.26 + +* Sat Aug 28 2004 Warren Togami 1.25-1 +- update to 1.25 + +* Mon Jun 28 2004 Warren Togami +- update to 1.20 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Sun May 16 2004 Warren Togami 1.15-1 +- update to 1.15 + +* Sun Feb 29 2004 Warren Togami 1.11-2 +- switch to memtest86+ 1.11 +- add boot loader setup script + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Oct 21 2003 Mike A. Harris 3.0-3 +- Pedantic spec file cleanups - s/Copyright/License/ and use _libdir instead of + /usr/lib everywhere (even though it's currently x86 only) + +* Tue Oct 21 2003 Jeremy Katz 3.0-2 +- fix perms (#107610) +- doesn't really require dev86 to build + +* Mon Jul 21 2003 Michael Fulbright +- initial integration into distribution. Removed the scripts to install a + entry in the boot loader for memtest for the moment, and relocated to under + /usr/lib. + +* Thu Apr 17 2003 Joe Szep +- rebuilt for Doolittle final + +* Mon Feb 3 2003 Matthew Miller +- rebuild for doolittle +- patches to make build -- new gcc growing pains, I guess + +* Tue Jul 30 2002 Matthew Miller +- added grubby stuff + +* Tue Jul 30 2002 Dave Heistand +- updated source to v 3 + +* Thu Mar 7 2002 Dave Heistand +- updated source to 2.9, also changed setup -n +- to use %%{version}. + +* Thu Nov 1 2001 Matthew Miller +- v 2.8a +- removed lilo-configuring scripts. need to figure out the best way to + work with grub and RH 7.2 / BU Linux 2.5 +- group -> System Environment/Base + +* Mon Aug 20 2001 Matthew Miller +- v 2.7 + +* Wed Feb 14 2001 Matthew Miller +- v 2.5 + +* Fri Oct 06 2000 Matthew Miller +- v 2.4 + +* Thu Mar 23 2000 Matthew Miller +- changed so that lilo.conf isn't written if it already exists. This is + important if you're including memtest86 in a distribution +- GPG key available from http://www.bu.edu/dsgsupport/linux/BULinux-GPG-KEY +- changed name of lilo.conf backup file to something less likely to conflict + with other backups + +* Wed Mar 01 2000 Matthew Miller +- Updated to version 2.2 +- Cosmetic changes to spec file +- updated Source: to reflect actual author's url + +* Fri Dec 25 1998 Peter Soos + +- Corrected the file attributes + +* Mon Aug 17 1998 Peter Soos + +- Moved to 1.4a + +* Mon Jun 22 1998 Peter Soos + +- Moved to 1.4 + +* Wed Dec 31 1997 Peter Soos + +- Initial version diff --git a/memtest-setup b/memtest-setup deleted file mode 100755 index 5efea6e..0000000 --- a/memtest-setup +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -# GRUB 2 template -G2TEMPL="20_memtest86+" - -# GRUB 2 environment file -CONF_FILE="/etc/memtest86+.conf" - -# GRUB2 configuration file -GRUB2CFG="/boot/grub2/grub.cfg" - -# GRUB2 environment variable to control image type -CONF_VAR="INSTALL_ELF" - -# whether to install ELF image -ELF=1 - -if [ "$1" = "--help" -o "$1" = "-h" ]; then - cat <<:EOF -Usage: - memtest-setup [-b|-e|-h] - memtest-setup [--bin|--elf|--help] - -The memtest-setup utility installs Memtest86+ into GRUB 2 boot loader menu. -It installs GRUB 2 template into /etc/grub.d directory. - -GRUB 2 configuration file needs to be regenerated manually by running: - - grub2-mkconfig -o $GRUB2CFG - -This is not done automatically because it could overwrite any custom changes -in GRUB 2 configuration file. - -Options: - -b, --bin Install a binary Memtest86+ image. - -e, --elf Install an ELF Memtest86+ image (the default). - -h, --help Print a help message and exit. - -:EOF - exit 0 -fi - -[ "$1" = "-b" -o "$1" = "--bin" ] && ELF=0 -[ "$1" = "-e" -o "$1" = "--elf" ] && ELF=1 - -if [ -d /sys/firmware/efi ]; then - echo "ERROR: memtest86+ does not support EFI platforms." - exit 254 -fi - -if [ ! -r "$GRUB2CFG" ]; then - echo "ERROR: unable to read grub configuration file. Do you have enough permissions?" - echo "Try to run as root." - exit 249 -fi - -# install GRUB 2 template -if [ ! -d /etc/grub.d ]; then - echo "ERROR: unable to find /etc/grub.d" - exit 253 -fi -if [ ! -r /usr/share/memtest86+/$G2TEMPL ]; then - echo "ERROR: unable to find GRUB 2 template." - exit 251 -fi -if ! cp /usr/share/memtest86+/$G2TEMPL /etc/grub.d; then - echo "ERROR: unable to copy GRUB 2 template, do you have write permission to" - echo "/etc/grub.d?" - # EX_IOERR - exit 74 -fi -if [ ! -w "$CONF_FILE" ] -then - echo "ERROR: file '$CONF_FILE' is not writable." - exit 250 -fi -chmod a+x /etc/grub.d/$G2TEMPL -echo "GRUB 2 template installed." -echo "Do not forget to regenerate your grub.cfg by:" -echo " # grub2-mkconfig -o $GRUB2CFG" - -# update/add configuration variable to the configuration file -if grep -q "^\s*$CONF_VAR\s*=" "$CONF_FILE" -then - sed -i "/^\s*$CONF_VAR\s*=/ s/\(\s*$CONF_VAR\s*=[\"']\?\)[^\"']*\([\"']\?\s*\)/\1${ELF}\2/g" "$CONF_FILE" -else - echo "$CONF_VAR=\"$ELF\"" >> "$CONF_FILE" -fi - -echo "Setup complete." diff --git a/memtest-setup.8 b/memtest-setup.8 deleted file mode 100644 index 6b8836d..0000000 --- a/memtest-setup.8 +++ /dev/null @@ -1,32 +0,0 @@ -.TH MEMTEST-SETUP 8 2018-05-17 Memtest86+ "Memtest86+ Manual" - -.SH NAME -memtest-setup \- install Memtest86+ into GRUB\ 2 boot loader menu - -.SH SYNOPSIS -.BR memtest-setup " [" \-b | \-e | \-h ] -.br -.BR memtest-setup " [" \-\-bin | \-\-elf | \-\-help ] - -.SH DESCRIPTION -.RB "The " memtest-setup " utility installs Memtest86+ into GRUB\ 2 boot" -loader menu. -.RI "It installs GRUB\ 2 template into " /etc/grub.d " directory." -.PP -GRUB\ 2 configuration file needs to be regenerated manually by running: -.IP -.RI "grub2-mkconfig -o " /boot/grub2/grub.cfg -.PP -This is not done automatically because it could overwrite any custom -changes in GRUB\ 2 configuration file. - -.SH OPTIONS -.TP -.BR \-b ", " \-\-bin -Install a binary Memtest86+ image. -.TP -.BR \-e ", " \-\-elf -Install an ELF Memtest86+ image (the default). -.TP -.BR \-h ", " \-\-help -Print a help message and exit. diff --git a/memtest86+-5.31b-gcc-12-fix.patch b/memtest86+-5.31b-gcc-12-fix.patch deleted file mode 100644 index e23750e..0000000 --- a/memtest86+-5.31b-gcc-12-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/controller.c b/controller.c -index 6d3f202..795af12 100644 ---- a/controller.c -+++ b/controller.c -@@ -3433,6 +3433,7 @@ static void poll_timings_i855(void) { - else { rp = 2; } - - // RAS Active to precharge (tRAS) -+ ras = 0; - temp = 7-((drt >> 9)& 0x3); - if (temp == 0x0) { ras = 7; } - if (temp == 0x1) { ras = 6; } diff --git a/memtest86+-5.31b-serial-console-fix.patch b/memtest86+-5.31b-serial-console-fix.patch deleted file mode 100644 index 19e0623..0000000 --- a/memtest86+-5.31b-serial-console-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/lib.c b/lib.c -index a2b829d..6a7e210 100644 ---- a/lib.c -+++ b/lib.c -@@ -1141,7 +1141,7 @@ void serial_console_setup(char *param) - - end++; - -- if (*end != '\0' || *end != ' ') -+ if (*end != '\0' && *end != ' ') - return; /* garbage at the end */ - - serial_bits = bits; diff --git a/memtest86+.conf b/memtest86+.conf deleted file mode 100644 index 96e7469..0000000 --- a/memtest86+.conf +++ /dev/null @@ -1,10 +0,0 @@ -# If INSTALL_ELF is set to 1 or if it is unset/empty, the ELF version of the -# memtest86+ will be installed, otherwise the non-ELF version will be -# installed. If you change this variable, you will have to regenerate your -# grub.conf for the changed to take effect, it is usually done by the -# following command: -# -# grub2-mkconfig -o /boot/grub2/grub.cfg -# -# For details see memtest86+ package documentation. -INSTALL_ELF=1 diff --git a/memtest86+.spec b/memtest86+.spec index f514428..a4f2d98 100644 --- a/memtest86+.spec +++ b/memtest86+.spec @@ -1,526 +1,85 @@ -%bcond_with update_grub - # Prevent stripping %global __spec_install_post /usr/lib/rpm/brp-compress # Turn off debuginfo package %global debug_package %{nil} - -%global readme_suffix %{?rhel:redhat}%{!?rhel:fedora} - -%global prerel_short b -%global prerel_long beta - -Name: memtest86+ -Version: 5.31 -Release: 0.8.%{?prerel_long}%{?dist} -License: GPLv2 -Summary: Stand-alone memory tester for x86 and x86-64 computers -Source0: http://www.memtest.org/download/%{version}%{?prerel_short}/%{name}-%{version}%{?prerel_short}.tar.gz -Source1: memtest-setup -Source2: 20_memtest86+ -Source3: memtest-setup.8 -Source4: memtest86+.conf -Source5: README -# sent upstream -Patch0: memtest86+-5.31b-serial-console-fix.patch -# sent upstream -Patch1: memtest86+-5.31b-gcc-12-fix.patch -URL: http://www.memtest.org -# require glibc-devel.i386 via this file: -BuildRequires: make -BuildRequires: %{_includedir}/gnu/stubs-32.h -BuildRequires: gcc -Requires: sed coreutils -ExclusiveArch: %{ix86} x86_64 - -%description +%global common_description %{expand: 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+. +} +%ifarch x86_64 +%global mt_isa x64 +%endif +%ifarch %{ix86} +%global mt_isa ia32 +%endif -The ELF version should be used for booting from grub, -and avoids the following errors: -"Error 7: Loading below 1MB is not supported" -"Error 13: Invalid or unsupported executable format" -"Error 28: Selected item cannot fit into memory" +Name: memtest86+ +Version: 6.20 +Release: %autorelease +Summary: Stand-alone memory tester for x86-64 computers +License: GPL-2.0-only +URL: https://www.memtest.org/ +Source0: https://github.com/memtest86plus/memtest86plus/archive/v%{version}/memtest86-plus-%{version}.tar.gz + +BuildRequires: gcc, make, xorriso, dosfstools, mtools +ExclusiveArch: x86_64 %{ix86} + +%description +%wordwrap -v common_description -The script '%{_sbindir}/memtest-setup' can be run (as root) -to add the %{name} entry to your GRUB boot menu. %prep -%setup -q -n %{name}-%{version}%{?prerel_short} +%autosetup -n memtest86plus-%{version} -p1 -cp -p %{SOURCE5} README.%{readme_suffix} -%patch0 -p1 -b .serial-console-fix -%patch1 -p1 -b .gcc-12-fix - -#sed -i -e's,0x10000,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 -%endif %build -# Regular build flags not wanted for this binary -# Note: i486 minimum runtime arch -# It makes no sense to use smp flags here. +pushd build%{__isa_bits} make +make iso +popd + %install -mkdir -p %{buildroot}/{boot,%{_sbindir}} +mkdir -p %{buildroot}%{_libdir}/%{name} +mkdir -p %{buildroot}%{_datarootdir}/%{name} -# the ELF (memtest) version. -install -m644 memtest %{buildroot}/boot/elf-%{name}-%{version} +pushd build%{__isa_bits} +install -m 0644 memtest.efi %{buildroot}%{_libdir}/%{name}/memtest86+%{mt_isa}.efi +install -m 0644 memtest.bin %{buildroot}%{_libdir}/%{name}/memtest86+%{mt_isa}.bin +install -m 0644 memtest.iso %{buildroot}%{_datarootdir}/%{name}/memtest86+%{mt_isa}.iso +popd -# the floppy (memtest.bin) version. -install -m644 memtest.bin %{buildroot}/boot/%{name}-%{version} - -install -m755 %{SOURCE1} %{buildroot}%{_sbindir}/memtest-setup -sed -i 's/\r//' $RPM_BUILD_DIR/%{name}-%{version}%{?prerel_short}/README - -mkdir -p %{buildroot}%{_sysconfdir}/grub.d -touch %{buildroot}%{_sysconfdir}/grub.d/20_memtest86+ - -install -Dd %{buildroot}%{_datadir}/%{name} -install -m644 %{SOURCE2} %{buildroot}%{_datadir}/%{name} - -# install manual page -install -Dpm 0644 %{SOURCE3} %{buildroot}%{_mandir}/man8/memtest-setup.8 - -# install configuration file -install -Dpm 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/memtest86+.conf - -%post -%if %{with update_grub} -/usr/sbin/memtest-setup -%endif %files -%doc README README.%{readme_suffix} -%config(noreplace) %{_sysconfdir}/memtest86+.conf -/boot/%{name}-%{version} -/boot/elf-%{name}-%{version} -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/20_memtest86+ -%ghost %attr(0755,-,-) %{_sysconfdir}/grub.d/20_memtest86+ -%{_sbindir}/memtest-setup -%{_mandir}/man8/*.8.gz +%license LICENSE +%doc README.md +%{_libdir}/%{name}/memtest86+%{mt_isa}.* +%{_datarootdir}/%{name}/memtest86+%{mt_isa}.iso + +%posttrans +install -m 0644 %{_libdir}/%{name}/memtest86+%{mt_isa}.* /boot/ +if [ -d /sys/firmware/efi/ ]; then +cat << EOBLSEFI > /boot/loader/entries/`cat /etc/machine-id`-0-memtest86+-%{version}-uefi.%{mt_isa}.conf +title Memtest86+ v%{version} %{mt_isa} UEFI +linux /memtest86+%{mt_isa}.efi +EOBLSEFI +else +cat << EOBLSBIN > /boot/loader/entries/`cat /etc/machine-id`-0-memtest86+-%{version}-bios.%{mt_isa}.conf +title Memtest86+ v%{version} %{mt_isa} BIOS +linux /memtest86+%{mt_isa}.bin +EOBLSBIN +fi +exit 0 + +%postun +if [ $1 -eq 0 ]; then +rm -f /boot/memtest86+%{mt_isa}.* +rm -f /boot/loader/entries/`cat /etc/machine-id`-0-memtest86+-%{version}-*.%{mt_isa}.conf +fi +exit 0 + %changelog -* Thu Jan 19 2023 Fedora Release Engineering - 5.31-0.8.beta -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Thu Jul 21 2022 Fedora Release Engineering - 5.31-0.7.beta -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Thu Jan 27 2022 Jaroslav Škarvada - 5.31-0.6.beta -- Fixed FTBFS with gcc-12 and -Werror=uninitialized - Resolves: rhbz#2046736 - -* Thu Jan 20 2022 Fedora Release Engineering - 5.31-0.5.beta -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Thu Jul 22 2021 Fedora Release Engineering - 5.31-0.4.beta -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 5.31-0.3.beta -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Jul 28 2020 Fedora Release Engineering - 5.31-0.2.beta -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Wed May 13 2020 Jaroslav Škarvada - 5.31-0.1.beta -- New version - Resolves: rhbz#1758783 -- Dropped no-scp, no-optimization, compile-fix, crash-fix patches (all upstreamed) -- Dropped fgnu89-inline patch (probably not needed) - -* Wed Jan 29 2020 Fedora Release Engineering - 5.01-28 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Fri Aug 2 2019 Jaroslav Škarvada - 5.01-27 -- No more compat-gcc in rawhide, so switching to distro's gcc - Resolves: rhbz#1736106 - -* Thu Jul 25 2019 Fedora Release Engineering - 5.01-26 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Apr 5 2019 Jaroslav Škarvada - 5.01-25 -- Fixed serial console - -* Tue Feb 5 2019 Jaroslav Škarvada - 5.01-24 -- Temporally switched to compat-gcc-34 - Resolves: rhbz#1598922 - -* Fri Feb 01 2019 Fedora Release Engineering - 5.01-23 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 20 2018 Jaroslav Škarvada - 5.01-22 -- Fixed FTBFS by adding gcc-c++ requirement - Resolves: rhbz#1604814 - -* Fri Jul 13 2018 Fedora Release Engineering - 5.01-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Thu Jun 28 2018 Jaroslav Škarvada - 5.01-20 -- Dropped grub legacy support - -* Thu Feb 08 2018 Fedora Release Engineering - 5.01-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Aug 03 2017 Fedora Release Engineering - 5.01-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 5.01-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 5.01-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue Apr 5 2016 Jaroslav Škarvada - 5.01-15 -- Various improvements to memtest-setup, e.g. now exits with error if - run by non root user - -* Tue Feb 23 2016 Jaroslav Škarvada - 5.01-14 -- Removed some spec artifacts (like buildroot cleaning) -- Fixed malformed "Loading" banner -- Not relocating memtest86+ above 1 MB - Related: rhbz#1303804 -- Introduced new configuration file (/etc/memtest86+.conf) -- Introduced new memtest-setup switches for selecting ELF/non-ELF versions - Resolves: rhbz#1303804 - -* Fri Feb 12 2016 Jaroslav Škarvada - 5.01-13 -- Updated distribution specific README - -* Thu Feb 04 2016 Fedora Release Engineering - 5.01-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Jan 28 2016 Jaroslav Škarvada - 5.01-11 -- Fixed memtest86+ binary (non-ELF) to run from floppy - -* Fri Jan 8 2016 Jaroslav Škarvada - 5.01-10 -- Fixed memtest86+ to run even if relocated above 1 MB - (by real-mode-reloc patch) -- Relocated memtest86+ above 1 MB (as we always did in Fedora) -- Fixed compilation of inline assembly with new gcc - (by fgnu89-inline patch) - -* Wed Jun 17 2015 Fedora Release Engineering - 5.01-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Oct 21 2014 Jaroslav Škarvada - 5.01-8 -- More crash fixes (by crash-fix patch from David McInnis) - -* Fri Sep 5 2014 Jaroslav Škarvada - 5.01-7 -- Fixed typo in memtest-setup help, added its options to man / help - -* Wed Sep 3 2014 Jaroslav Škarvada - 5.01-6 -- Fixed memtest-setup script - -* Tue Aug 26 2014 Jaroslav Škarvada - 5.01-5 -- Added documentation regarding memtest-setup - -* Sun Aug 17 2014 Fedora Release Engineering - 5.01-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 5.01-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu Apr 3 2014 Jaroslav Škarvada - 5.01-2 -- Switched back to latest distro gcc - -* Mon Feb 17 2014 Jaroslav Škarvada - 5.01-1 -- New version - Resolves: rhbz#1013110 -- Switched to the gcc-34 due to upstream non-compatiblity with - the latest gccs (#1013110) -- Removed trailing whitespaces from the description - -* Mon Sep 16 2013 Jaroslav Škarvada - 4.20-11 -- Fixed grubby requirement -- Fixed bogus dates in changelog (best effort) - -* Sat Aug 03 2013 Fedora Release Engineering - 4.20-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 4.20-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Tue Jan 8 2013 Jaroslav Škarvada - 4.20-8 -- Fixed packaging regarding usrmove - -* Fri Jul 20 2012 Fedora Release Engineering - 4.20-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Mar 27 2012 Jaroslav Škarvada - 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 - 4.20-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Wed Dec 7 2011 Jaroslav Škarvada - 4.20-4 -- Used ELF format with grub2 - -* Wed Dec 7 2011 Jaroslav Škarvada - 4.20-3 -- Renamed 20_memtest to 20_memtest86+ -- Fixed ghost handling, 20_memtest86+ is properly removed now - -* Mon Dec 5 2011 Jaroslav Škarvada - 4.20-2 -- Added support for grub2, thanks to Michal Ambroz - -* Mon Mar 07 2011 Jaroslav Škarvada - 4.20-1 -- Update to new version (#682425) -- Removed fix-asciimap patch (not needed now) -- Removed make-gcc4-builds-work patch (not used) - -* Mon Feb 21 2011 Jaroslav Škarvada - 4.10-5 -- Deprecated nash replaceed by findfs (#671503) - -* Wed Feb 09 2011 Fedora Release Engineering - 4.10-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Tue Jan 11 2011 Jaroslav Škarvada - 4.10-3 -- Reduce max-page-size on x86_64 to fit into loader limits (#620846) - -* Tue May 25 2010 Anton Arapov - 4.10-2 -- Fix memory region to load. (#578966) - -* Wed May 05 2010 Anton Arapov - 4.10-1 -- Update to new upstream release, v4.10 - -* Tue Mar 30 2010 Anton Arapov - 4.00-4 -- Fix ascii map of spd.c (#577469) - -* Fri Dec 25 2009 Robert Scheck - 4.00-3 -- Removed obsolete build requirement to compat-gcc-34 (#442285) - -* Tue Oct 13 2009 Jarod Wilson - 4.00-2 -- Fix memtest-setup on systems without a separate /boot - filesystem (#528651) - -* Tue Sep 29 2009 Jarod Wilson - 4.00-1 -- Update to new upstream release, v4.00 -- Drop gcc4.2+ patch, merged upstream - -* Mon Aug 17 2009 Jarod Wilson - 2.11-11 -- Fix runtime operation when built with gcc4.2+ (#442285) - -* Sat Jul 25 2009 Fedora Release Engineering - 2.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Fri Apr 24 2009 Warren Togami - 2.11-9 -- Fix uninstall to remove stanza from grub.conf - -* Fri Apr 24 2009 Warren Togami - 2.11-8 -- Bug #494157 rename elf binary so it doesn't accidentally copy the elf binary - during livecd-creator -- Put scripts into CVS - -* Sun Apr 05 2009 Paulo Roma - 2.11-7 -- adapted the spec file for building the elf and - the bin versions #494157 - -* Thu Apr 02 2009 Paulo Roma - 2.11-6 -- grub.conf will not be updated by default. The user - will have to add and/or remove memtest86+ entries. -- No messages printed. - -* Tue Mar 31 2009 Paulo Roma - 2.11-5 -- Changed postun for preun. -- Calling memtest-setup in case of updating grub.conf - -* Wed Mar 11 2009 Paulo Roma - 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 - 2.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Wed Nov 12 2008 Warren Togami - 2.10-1 -- 2.10 - -* Thu Apr 03 2008 Warren Togami - 2.01-3 -- Build with gcc34 for F9 (#437701) - -* Tue Mar 04 2008 Peter Jones - 2.01-2 -- Don't install memtest86+ in bootloader configs on EFI platforms. - -* Thu Feb 21 2008 Warren Togami - 2.01-1 -- 2.01 major bugfix release - -* Mon Feb 11 2008 Michal Schmidt - 2.00-2 -- forgot to cvs add the compilation patch. - -* Mon Feb 11 2008 Michal Schmidt - 2.00-1 -- New upstream release: 2.00. -- Dropped boot time console configuration patches (already upstream). -- Fixed compilation on x86_64. - -* Wed Oct 24 2007 Peter Jones - 1.70-4 -- Fix for mactel. - -* Thu Oct 18 2007 Warren Togami - 1.70-3 -- one more patch from mschmidt to allow configuration of parity and bits - -* Wed Oct 17 2007 Warren Togami - 1.70-2 -- mschmidt's boot time configuration of serial console (#319631) - -* Thu Feb 08 2007 Florian La Roche - 1.70-1 -- update to 1.70 - -* Sat Feb 03 2007 Warren Togami - 1.65-6 -- some spec cleanups (#226135) -- remove old Obsoletes - -* Wed Jul 12 2006 Jesse Keating - 1.65-4.1 -- rebuild - -* Tue Jun 27 2006 Florian La Roche - 1.65-4 -- make sure coreutils is installed for the preun script - -* Thu Jun 08 2006 Jesse Keating - 1.65-3 -- rebuilt for new buildsystem - -* Tue Feb 07 2006 Jesse Keating - 1.65-2.2 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Fri Dec 09 2005 Jesse Keating -- rebuilt - -* Sat Oct 15 2005 Florian La Roche -- make sure 32bit glibc-devel is installed (#170614) - -* Sat Oct 01 2005 Warren Togami - 1.65-1 -- 1.65 - -* Wed Jun 29 2005 Warren Togami - 1.60-1 -- 1.60 - -* Mon Mar 28 2005 Warren Togami - 1.55.1-1 -- 1.55.1 fixes K8 - -* Sun Mar 27 2005 Warren Togami - 1.55-1 -- 1.55 - -* Wed Mar 16 2005 Elliot Lee -- rebuilt - -* Sat Feb 19 2005 Warren Togami - 1.51-1 -- 1.51 - -* Fri Jan 21 2005 Warren Togami - 1.50-1 -- 1.50 - -* Sun Nov 28 2004 Warren Togami - 1.40-1 -- 1.40 -- remove arch patch, now upstream - -* Tue Oct 26 2004 Warren Togami - 1.27-1 -- 1.27 - -* Mon Oct 25 2004 Jeremy Katz - 1.26-3 -- allow building on all x86 arches -- pass appropriate compiler options to build on x86_64 as well (#136939) - -* Thu Sep 02 2004 Warren Togami 1.26-1 -- update to 1.26 - -* Sat Aug 28 2004 Warren Togami 1.25-1 -- update to 1.25 - -* Mon Jun 28 2004 Warren Togami -- update to 1.20 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Sun May 16 2004 Warren Togami 1.15-1 -- update to 1.15 - -* Sun Feb 29 2004 Warren Togami 1.11-2 -- switch to memtest86+ 1.11 -- add boot loader setup script - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Tue Oct 21 2003 Mike A. Harris 3.0-3 -- Pedantic spec file cleanups - s/Copyright/License/ and use _libdir instead of - /usr/lib everywhere (even though it's currently x86 only) - -* Tue Oct 21 2003 Jeremy Katz 3.0-2 -- fix perms (#107610) -- doesn't really require dev86 to build - -* Mon Jul 21 2003 Michael Fulbright -- initial integration into distribution. Removed the scripts to install a - entry in the boot loader for memtest for the moment, and relocated to under - /usr/lib. - -* Thu Apr 17 2003 Joe Szep -- rebuilt for Doolittle final - -* Mon Feb 3 2003 Matthew Miller -- rebuild for doolittle -- patches to make build -- new gcc growing pains, I guess - -* Tue Jul 30 2002 Matthew Miller -- added grubby stuff - -* Tue Jul 30 2002 Dave Heistand -- updated source to v 3 - -* Thu Mar 7 2002 Dave Heistand -- updated source to 2.9, also changed setup -n -- to use %%{version}. - -* Thu Nov 1 2001 Matthew Miller -- v 2.8a -- removed lilo-configuring scripts. need to figure out the best way to - work with grub and RH 7.2 / BU Linux 2.5 -- group -> System Environment/Base - -* Mon Aug 20 2001 Matthew Miller -- v 2.7 - -* Wed Feb 14 2001 Matthew Miller -- v 2.5 - -* Fri Oct 06 2000 Matthew Miller -- v 2.4 - -* Thu Mar 23 2000 Matthew Miller -- changed so that lilo.conf isn't written if it already exists. This is - important if you're including memtest86 in a distribution -- GPG key available from http://www.bu.edu/dsgsupport/linux/BULinux-GPG-KEY -- changed name of lilo.conf backup file to something less likely to conflict - with other backups - -* Wed Mar 01 2000 Matthew Miller -- Updated to version 2.2 -- Cosmetic changes to spec file -- updated Source: to reflect actual author's url - -* Fri Dec 25 1998 Peter Soos - -- Corrected the file attributes - -* Mon Aug 17 1998 Peter Soos - -- Moved to 1.4a - -* Mon Jun 22 1998 Peter Soos - -- Moved to 1.4 - -* Wed Dec 31 1997 Peter Soos - -- Initial version +%autochangelog diff --git a/sources b/sources index 1a63f80..f3181b5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (memtest86+-5.31b.tar.gz) = ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541 +SHA512 (memtest86-plus-6.20.tar.gz) = b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0