rpms/memtest86+/devel .cvsignore, 1.15, 1.16 memtest-intelmac-3.diff, 1.1, 1.2 memtest86+.spec, 1.31, 1.32 sources, 1.15, 1.16
Michal Schmidt (michich)
fedora-extras-commits at redhat.com
Mon Feb 11 17:16:54 UTC 2008
- Previous message (by thread): rpms/evolution/devel .cvsignore, 1.85, 1.86 evolution.spec, 1.320, 1.321 sources, 1.85, 1.86 evolution-2.21.90-click-to-add.patch, 1.1, NONE evolution-2.21.90-no-gnuc-function.patch, 1.3, NONE
- Next message (by thread): rpms/evolution-exchange/devel .cvsignore, 1.16, 1.17 evolution-exchange.spec, 1.21, 1.22 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: michich
Update of /cvs/pkgs/rpms/memtest86+/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15355
Modified Files:
.cvsignore memtest-intelmac-3.diff memtest86+.spec sources
Log Message:
* Mon Feb 11 2008 Michal Schmidt <mschmidt at redhat.com> - 2.00-1
- New upstream release: 2.00.
- Dropped boot time console configuration patches (already upstream).
- Fixed compilation on x86_64.
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 8 Feb 2007 09:10:28 -0000 1.15
+++ .cvsignore 11 Feb 2008 17:16:16 -0000 1.16
@@ -1 +1 @@
-memtest86+-1.70.tar.gz
+memtest86+-2.00.tar.gz
memtest-intelmac-3.diff:
Index: memtest-intelmac-3.diff
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest-intelmac-3.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- memtest-intelmac-3.diff 24 Oct 2007 17:20:26 -0000 1.1
+++ memtest-intelmac-3.diff 11 Feb 2008 17:16:16 -0000 1.2
@@ -1,21 +1,21 @@
-diff -urpN memtest86+-1.70/setup.S.mactel memtest86+-1.70/setup.S
---- memtest86+-1.70/setup.S.mactel 2007-10-24 13:10:59.000000000 -0400
-+++ memtest86+-1.70/setup.S 2007-10-24 13:12:26.000000000 -0400
-@@ -29,6 +29,33 @@ start:
+diff -up memtest86+-2.00/setup.S.orig memtest86+-2.00/setup.S
+--- memtest86+-2.00/setup.S.orig 2008-02-07 17:27:42.000000000 +0100
++++ memtest86+-2.00/setup.S 2008-02-11 14:56:26.000000000 +0100
+@@ -30,6 +30,33 @@ start:
lgdt gdt_48 - start # load gdt with whatever appropriate
# that was painless, now we enable A20
+# start from grub-a20.patch
+ /*
-+ * try to switch gateA20 using PORT92, the "Fast A20 and Init"
-+ * register
-+ */
++ * try to switch gateA20 using PORT92, the "Fast A20 and Init"
++ * register
++ */
+ mov $0x92, %dx
+ inb %dx, %al
+ /* skip the port92 code if it's unimplemented (read returns 0xff) */
+ cmpb $0xff, %al
+ jz alt_a20_done
-+
++
+ /* set or clear bit1, the ALT_A20_GATE bit */
+ movb 4(%esp), %ah
+ testb %ah, %ah
@@ -32,9 +32,9 @@
+
+alt_a20_done:
+# end from grub-a20.patch
-
call empty_8042
+ movb $0xD1, %al # command write
@@ -67,6 +94,9 @@ data32 ljmp $KERNEL_CS, $(TSTLOAD <<4) #
empty_8042:
call delay
@@ -53,4 +53,3 @@
ret
#
# Delay is needed after doing i/o
-diff -urpN memtest86+-1.70/memsize.c.mactel memtest86+-1.70/memsize.c
Index: memtest86+.spec
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/memtest86+.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- memtest86+.spec 11 Feb 2008 17:03:10 -0000 1.31
+++ memtest86+.spec 11 Feb 2008 17:16:16 -0000 1.32
@@ -5,21 +5,17 @@
Summary: Stand-alone memory tester for x86 and x86-64 computers
Name: memtest86+
-Version: 1.70
-Release: 4%{?dist}
-License: GPL
+Version: 2.00
+Release: 1%{?dist}
+License: GPLv2
ExclusiveArch: %{ix86} x86_64
Group: System Environment/Base
Source0: http://www.memtest.org/download/%{version}/memtest86+-%{version}.tar.gz
URL: http://www.memtest.org
Source1: new-memtest-pkg
Source2: memtest-setup
-# patches from mschmidt at redhat.com to implement boot-time configurable serial console
-Patch0: additional-lib-functions.diff
-Patch1: console-boot-parameter.diff
-Patch2: use-strtoul-in-getval.diff
-Patch3: parity-bits.diff
-Patch4: memtest-intelmac-3.diff
+Patch0: memtest-fix-makefile-for-x86_64.diff
+Patch1: memtest-intelmac-3.diff
Requires(preun): coreutils
# require glibc-devel.i386 via this file:
BuildRequires: %{_includedir}/gnu/stubs-32.h
@@ -38,9 +34,9 @@
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
+
+# head.s is a generated file, shouldn't have been in the tarball.
+rm head.s
%build
# Regular build flags not wanted for this binary
@@ -63,7 +59,8 @@
%files
%defattr(-,root,root,-)
-%doc README
+# XXX did upstream drop the README by mistake?
+#%doc README
/boot/memtest86+-%{version}
/sbin/new-memtest-pkg
%{_sbindir}/memtest-setup
@@ -72,6 +69,11 @@
/sbin/new-memtest-pkg --remove %{version}
%changelog
+* Mon Feb 11 2008 Michal Schmidt <mschmidt at redhat.com> - 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 <pjones at redhat.com> - 1.70-4
- Fix for mactel.
@@ -185,7 +187,7 @@
* Thu Mar 7 2002 Dave Heistand <davidbh at bu.edu>
- updated source to 2.9, also changed setup -n
-- to use %{version}.
+- to use %%{version}.
* Thu Nov 1 2001 Matthew Miller <mattdm at bu.edu>
- v 2.8a
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/memtest86+/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 8 Feb 2007 09:10:28 -0000 1.15
+++ sources 11 Feb 2008 17:16:16 -0000 1.16
@@ -1 +1 @@
-ee447fa46b75cf98538fa60667eb079d memtest86+-1.70.tar.gz
+b411671e8b2f52d30705e814a56631cb memtest86+-2.00.tar.gz
- Previous message (by thread): rpms/evolution/devel .cvsignore, 1.85, 1.86 evolution.spec, 1.320, 1.321 sources, 1.85, 1.86 evolution-2.21.90-click-to-add.patch, 1.1, NONE evolution-2.21.90-no-gnuc-function.patch, 1.3, NONE
- Next message (by thread): rpms/evolution-exchange/devel .cvsignore, 1.16, 1.17 evolution-exchange.spec, 1.21, 1.22 sources, 1.16, 1.17
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list