Hello community, here is the log from the commit of package memtest86+ for openSUSE:Factory checked in at 2014-08-01 14:34:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/memtest86+ (Old) and /work/SRC/openSUSE:Factory/.memtest86+.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "memtest86+" Changes: -------- --- /work/SRC/openSUSE:Factory/memtest86+/memtest86+.changes 2014-03-16 08:04:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.memtest86+.new/memtest86+.changes 2014-08-01 14:34:28.000000000 +0200 @@ -1,0 +2,13 @@ +Thu Jul 31 12:26:33 UTC 2014 - [email protected] + +- make it work by picking patches from Fedora - memtest doesn't like + optimizations with newer compilers. + + See https://bugs.mageia.org/show_bug.cgi?id=11661 and fedora bugs. + +- Added patches (all from fedora pkg): + memtest86+-5.01-array-size-fix.patch + memtest86+-5.01-compile-fix.patch + memtest86+-5.01-no-optimization.patch + +------------------------------------------------------------------- New: ---- memtest86+-5.01-array-size-fix.patch memtest86+-5.01-compile-fix.patch memtest86+-5.01-no-optimization.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ memtest86+.spec ++++++ --- /var/tmp/diff_new_pack.XUiado/_old 2014-08-01 14:34:29.000000000 +0200 +++ /var/tmp/diff_new_pack.XUiado/_new 2014-08-01 14:34:29.000000000 +0200 @@ -16,7 +16,6 @@ # - Name: memtest86+ Version: 5.01 Release: 0 @@ -37,6 +36,9 @@ Url: http://www.memtest.org Source: http://www.memtest.org/download/%{version}/%{name}-%{version}.tar.gz Patch0: fix-destdir +Patch1: memtest86+-5.01-no-optimization.patch +Patch2: memtest86+-5.01-compile-fix.patch +Patch3: memtest86+-5.01-array-size-fix.patch Summary: Memory Testing Image for x86 Architecture License: BSD-3-Clause Group: System/Boot @@ -45,24 +47,12 @@ Memtest86 is an image that can be booted instead of a real OS. Once booted, it can be used to test the computer's memory. - - -Authors: --------- - Samuel Demeulemeester <[email protected]> - Original memtest86 package: - John Coffman <[email protected]> - Werner Almesberger <[email protected]> - PowerPC part: - Paul Mackeras <[email protected]> - Cort Dougan <[email protected]> - Benjamin Herrenschmidt <[email protected]> - Memtest86: - Chris Brady <[email protected]> - %prep %setup %patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build make ++++++ memtest86+-5.01-array-size-fix.patch ++++++ --- memtest86+-5.01/controller.c~ 2013-08-10 02:01:58.000000000 +0000 +++ memtest86+-5.01/controller.c 2013-12-12 20:58:12.873555378 +0000 @@ -292,7 +292,7 @@ /* First, locate the PCI bus where the MCH is located */ - for(i = 0; i < sizeof(possible_nhm_bus); i++) { + for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); vid &= 0xFFFF; @@ -327,7 +327,7 @@ ctrl.mode = ECC_NONE; /* First, locate the PCI bus where the MCH is located */ - for(i = 0; i < sizeof(possible_nhm_bus); i++) { + for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) { pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid); pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did); vid &= 0xFFFF; ++++++ memtest86+-5.01-compile-fix.patch ++++++ --- memtest86+-5.01/io.h~ 2013-08-10 02:01:58.000000000 +0000 +++ memtest86+-5.01/io.h 2014-01-08 01:29:12.404465515 +0000 @@ -31,7 +31,7 @@ */ #define __OUT1(s,x) \ -extern inline void __out##s(unsigned x value, unsigned short port) { +static inline void __out##s(unsigned x value, unsigned short port) { #define __OUT2(s,s1,s2) \ __asm__ __volatile__ ("out" #s " %" s1 "0,%" s2 "1" @@ -43,7 +43,7 @@ __OUT1(s##c_p,x) __OUT2(s,s1,"") : : "a" (value), "id" (port)); SLOW_DOWN_IO; } #define __IN1(s) \ -extern inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; +static inline RETURN_TYPE __in##s(unsigned short port) { RETURN_TYPE _v; #define __IN2(s,s1,s2) \ __asm__ __volatile__ ("in" #s " %" s2 "1,%" s1 "0" ++++++ memtest86+-5.01-no-optimization.patch ++++++ --- memtest86+-5.01/Makefile~ 2014-01-08 01:30:11.355900076 +0000 +++ memtest86+-5.01/Makefile 2014-01-08 01:31:19.387555469 +0000 @@ -12,7 +12,7 @@ AS=as -32 CC=gcc -CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \ +CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
