From: Andrew Savchenko Date: Sat, 31 Jan 2015 22:57:50 +0000 (+0000) Subject: Version bump, wrt bug 486564 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a6fe6babe7fc485a3328d7fa50a6dcf55cece051;p=gentoo.git Version bump, wrt bug 486564 Signed-off-by: Andrew Savchenko Package-Manager: portage-2.2.15/cvs/Linux i686 Manifest-Sign-Key: 0x565953B95372756C --- diff --git a/sys-apps/memtest86+/ChangeLog b/sys-apps/memtest86+/ChangeLog index 941193d61ec5..9ac6324588c6 100644 --- a/sys-apps/memtest86+/ChangeLog +++ b/sys-apps/memtest86+/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for sys-apps/memtest86+ -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.68 2014/08/31 03:18:41 floppym Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/ChangeLog,v 1.69 2015/01/31 22:57:46 bircoph Exp $ + +*memtest86+-5.01 (31 Jan 2015) + + 31 Jan 2015; Andrew Savchenko +memtest86+-5.01.ebuild, + +files/memtest86+-5.01-gcc-473.patch, + +files/memtest86+-5.01-hardcoded_cc.patch: + Version bump, wrt bug 486564. + Fix build with gcc 4.7.3 by Alexander (necheffa.misc@gmail.com), + add QA_CFLAGS_IGNORED, since we don't allow user to tamper with + CFLAGS here. *memtest86+-4.20-r2 (31 Aug 2014) diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest index 14017c04e4dc..4b8c4fe57c6e 100644 --- a/sys-apps/memtest86+/Manifest +++ b/sys-apps/memtest86+/Manifest @@ -8,19 +8,33 @@ AUX memtest86+-1.70-gnu_hash.patch 485 SHA256 07bb65affa496910f0c91457c5c21e31a0 AUX memtest86+-2.01-hardcoded_cc.patch 1209 SHA256 79de7846fc10bb70f018bda0daad82082600a5a7bc35d7715b25294018e47d97 SHA512 2295e2049e439471ae2d5700c92e0142060c6a0f6fa9c3814c0fe0d6153f575a4530b5effe6f2b17ece2589ec360f69d79eff396149d9c0a4658847acb588c2c WHIRLPOOL 6d12d33cc71044348f634b0cd31bf08fae9ac79ac478a2b5e88cc10586747d53acbc54497fbd0356fa225b0c326941642b1164abc8231c2832fc0ac75100a347 AUX memtest86+-4.00-hardcoded_cc.patch 1217 SHA256 1e3df89afe8734cea0fdc90131b9daf3f93d8d96451d38771e5225fde2ba1c4f SHA512 d362b4f57209d6437c48f079b5820449badd88ee5efee3e83417cdfdf249804d17ccea6cb5ac7b4047e95466bbb50ad1c6725b3d0e51845ea3a32309965ac1a8 WHIRLPOOL d95b9845099e044a4d8384d849144ade4239ce6a69f6e0c678ce98873c21615d420ba3f20e6bddb740efa889103e8c22c1d020f81e920d2117b1022880fada29 AUX memtest86+-4.20-hardcoded_cc.patch 1222 SHA256 fa8d1a7ac3b15975941aa562ec48700a671e951321713b3481e93758759c3f92 SHA512 ae15a6505af65ed176464f30f3beeb78a62799fb4f945e2003598fdbfcf54b75cd859afd868e9a1e9e4cab729411f072bf0a40bd296b9d770f6de140de14c7f1 WHIRLPOOL 8c8de61054cb32b4c192285ed6295ef991e72af7ac3f37fbd80d310a989f2c4999cdf42fc6b43cb43d11caecd82df2eb3c9e82b9dc26882ba2b2887a038ede73 +AUX memtest86+-5.01-gcc-473.patch 2382 SHA256 7877416a1103dbf0cbaafae744ee699d8fa9ea28391fe786e041e2288724016c SHA512 b6744a05db00fbc9762eb880dfc1f97143eaff90a97600c6257fc84a1c0e8eb31b0879fc5af01ecc1b03881350f7b2a9527b5715d569c4215ed8459db3ba5a7c WHIRLPOOL 071fda6401f2b60122f17071f7130dc561c600dd82401d3ba36fc89a009dc3920a2892eb07559530faf06b9249bb4a7f13523b7dc5aba969f451c2d81c10e586 +AUX memtest86+-5.01-hardcoded_cc.patch 484 SHA256 883354dabd02201b95ce2c1948b2d1e4ce65bdefb81ff21e5c2ba673c0e3c245 SHA512 a7008dcc1136283cdfc0dd5e17b0c4c5816d2799d50fa7c63e14b258f0ce34031ec782e199b826a0cc909464ab1f5aaf651ede6681ddac7d5ca416b8412106be WHIRLPOOL d9d28af1793d946e842cb4f8bfe4923c0f4e3e6b432a1bcfec8d5de4e9cd280542486abe2615f069eb41bb9d2f331c1c26ddf4ab991c51684239346fe5bd58e8 DIST memtest86+-2.01.tar.gz 165984 SHA256 35ad452f4fd12f07756abccccf1bce70d42596c2c5e9c29247ffc8e0b76bd1ae DIST memtest86+-4.00.tar.gz 270327 SHA256 6ec42f549da81b715bfc5c55b93b74774fb5c35f7578c7eecebab3ca37866ca4 DIST memtest86+-4.20.tar.gz 206044 SHA256 5630ce978d0e6b671891df4253fc5c54659764d0cdfc7515ac0df3d8dd9e8737 SHA512 2213a64cd3036f840dd816dd49b62b0f082e1fbfe64e02f52370f04e39857f042dc8bc0044c1a88ba678e72c1eb8629aa706fabfd3c052e41c29c073f4e8c441 WHIRLPOOL 16b2f0a447516b24e4e29cf526ffc2ba03406105473c1d0cff44d737473b81db0482131385f2a39a5d202b3ccd52300f2c7109adf1b64b8bdb0a5244cb32d2cb +DIST memtest86+-5.01.tar.gz 214877 SHA256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7 WHIRLPOOL c8e240c8420990c93156fcd407a4b00d350392bbf8e974398b4d51fa219d33012b4e0d60f58cb2dff59c06e36e322467031bc0231d77d4e773d97e30939d3c8f EBUILD memtest86+-2.01.ebuild 1390 SHA256 a5f27eb3b8331eeb70ce87203058bc4d9f30f7c59779a7b0ecc4e4a8793e3dbd SHA512 f325f8da60b22d8e34e40ecc7fae4713a1b6ea53adcce5b8435d9de33a40bf0fa851fe4f57b04829dd770de068143f2a17c222859fb9df7ea80788afc629a238 WHIRLPOOL 27af4e35eef2158bf72d7d10095e9bc56c7075ee81ab949ef089973c2430885a47b3c1bc821471de749fe3613428d0a2d45a6c3f399d6896e811fc85d6035ebd EBUILD memtest86+-4.00.ebuild 2041 SHA256 e18a99a12bf5c2fcf4548e3d374a00bd1d96f0570abcbc5b3c7bfad2a8b20597 SHA512 fceafd4feba28ee8b3b51314b58f12b83b0eb03421128c2c88e73aa6341324aea1c6df950c4fa4e2b337fa6d4a2408e576132a0ed866dee66be951b7b7ed946f WHIRLPOOL 98b7bd14e6f3c7f0441f75b775dc570d0c7ee19abacd28758d55ca917301968cbbc9a278540110839f98d69fdfffcabe67c30f8bc0d72381b462a1ed12b0c24f EBUILD memtest86+-4.20-r1.ebuild 2066 SHA256 3b96d0a113f223b5b6d22c9dc11738c5fd49d93fdc7297324fabf3b8bdadf9a6 SHA512 ef2eef5ae891874a899184b9b30725105f70a487be73894d185d55643767b50d95dd1a443779144a22021f2c9221018d3a738ad0aa7b2b395073fea2423ddfca WHIRLPOOL 827d4a96febb59a0e64829ebaebfb1e528feee1030de7bcec957baef5b0a3e2f58e74a182ea7996b8aa31f45d726bb14022085bc92e25fc6653456eaffd589f0 EBUILD memtest86+-4.20-r2.ebuild 1875 SHA256 d6b416c9d42ac4d9cafef6da589b836b03a57bd3badae7a6379e9dfd61e30e70 SHA512 8066c49c15e171bf34526abf3e90847629e2102b761d8f735be5458ef0f9ce13a96724aad0182e2927318e9f3f68a858dda96dca75be5395442006147bd3a7cd WHIRLPOOL 32a8f26b12a9e3b8a2687c8d3ccbf017f36f6bb2feae2727dbdfaabd437bed8bc2173ed878d73384a821b196550452d834271c0ccb0a844522583275a99213c2 -MISC ChangeLog 11575 SHA256 d452e8f57078000d0cbb4f8462b172effe0d820b993ba77cffbc4c911e10d120 SHA512 b34de2bb3f056f5072d2236a102af997f1e3aa62b7decc11da55afcf2e4609a2ef28af74aa6a97feda39adf60c107192a6fd20ff32bc2dc0630d97875690cc20 WHIRLPOOL 456a0ac2b6521d33355f982bb514ec51879104ff74b82f07ca445241f92999df574863618cc719b64be70306fbee4d87d7c735cfd40587bbffd5c307d1557d18 +EBUILD memtest86+-5.01.ebuild 2229 SHA256 4762d56da78896bfaec8f1afed96684092f97b487dcc27e43611f5a0be038a9d SHA512 f15f45ad069db5842d0b95cffa8ae4de875d2518ecd831b436c83ad0545ccc047525fc52777ef11abb11c321680068a9023549d298ed59bcc64ea2cd74d6f972 WHIRLPOOL c77122328b1f43610801b554a7c5a8abd9b670980fccb389a653d421719f0241739a66bdf944d3c1d647fc67603699cc802c623819c58cf6f5e5663e6b11467e +MISC ChangeLog 11951 SHA256 113f6f91a2d84fc476edaac4ce7ee2eedc34425ee3efc99551f5deceee5c5b1c SHA512 6de730d310442f05167456a480ab34f1215157b8b672ab057c7db80bb387803f978d4c0d01f000c96ef980a052e06891c5894e624ebbdfe13cd8e6b7383c1b31 WHIRLPOOL 1d30a4bc00a604bec63e297dc01cb7b99256b2a723a23a42c19290484a294ef2ba2db82df67a22412bdecfdf7a536f5c674a05a5cd6566b5adc32c6a78e131be MISC metadata.xml 341 SHA256 613d88008ccba44bb3dd2cb9662e9b3b58e74aecea38b84586ed54f50a672cfe SHA512 5c90ba46614c6ee818309688ed1364a81620f6672864b141525ba83413782dbe1ba5596f783152b9813083730d9acd16369ee9d08e4c3993247a69ea40556093 WHIRLPOOL 49a004c6a5f5eaa03c804074b98ec1eff49a66e1016837431f29f81faed1a3ee256ae25b5fb6e264477220f0c03c0dd439cf1e6f400d3dd7ebbe5003eb346363 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iF4EAREIAAYFAlQClBIACgkQC77qH+pIQ6R0cwD+LfsxXgjyZxM3cz22Z78LIQ6v -YNvVpcttskTu9IJV4HMA/1LHBUTRBLaz2dnooOqcAOqmxncW3zIgkf1GSNFYYma6 -=fahp +iQIcBAEBCAAGBQJUzV3rAAoJEPZTWjO6HuSN8X4P/0K3SIlu8EdkkrawM+4AKgYK ++YBiOYFEQUXsTAwwqJ5LYtqEZVTYNzividq8oE787omOwZ6ngWFk1DX7kZe9iEeJ +TY8+BOxo4bd00geNttmTAMNcqivGQdwEWBQcure4+UXxTjcfjQVLh+Td4fs0NL3p +gepxR/0gjnh+gfOmd27DhvD7hqkqD/6PHXClpBP5ybjAKOjF3GQI/L5JdIAS5TJZ +emeN9sqNb4he00tGkpKsQQzHLDpY45okjieYlGKKlgyrfexHqZh0J/hzRg+ss+Sl +rRO+rQyFqhz+xw15INwvZIPH6YeAN9Je/dq/jO7Jzerxx2y1GJWhWX0ePwWvY/at +KNU3sdw7iiW3tMtwnuniAIG0G8Riu3J+XxEqBICMBge6xrqX1+arwlpAYYGOsOa3 +v55hAVZua6mzKwadYAet6c5bdpkggP/6M5+7xzEp7kxayKQS9lM1Ri+HlBaweuZM +70tdOUnX2xB0hfT8UwjKOFyWDtHY6AlbFTzbSYeWsh7a4LGnQKsjGTBwvgoAcMuV +B1hpBIUG2DRtwgpceBS4gmYzNvuSt4Cmb8ah4FGe0xD3WXCjpOB8XbNWgevCL7vL +zyeECCzDnbHNML017g7AKGvwUuv/9gcObOOxPhKPh6jRafLxns4G7bYGZ41pQGcK +ldB85MtmCzZCj3cRM7Bd +=DCKH -----END PGP SIGNATURE----- diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch new file mode 100644 index 000000000000..ff9b15a9e4e1 --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch @@ -0,0 +1,54 @@ +diff -Narup memtest86+-5.01-orig/controller.c memtest86+-5.01/controller.c +--- memtest86+-5.01-orig/controller.c 2013-08-09 22:01:58.000000000 -0400 ++++ memtest86+-5.01/controller.c 2014-06-22 11:01:17.347923472 -0400 +@@ -292,7 +292,7 @@ static void setup_nhm(void) + + /* 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 @@ static void setup_nhm32(void) + 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; +diff -Narup memtest86+-5.01-orig/io.h memtest86+-5.01/io.h +--- memtest86+-5.01-orig/io.h 2013-08-09 22:01:58.000000000 -0400 ++++ memtest86+-5.01/io.h 2014-06-22 11:00:19.279251873 -0400 +@@ -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##_p,x) __OUT2(s,s1,"w") : : "a" + __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" +diff -Narup memtest86+-5.01-orig/Makefile memtest86+-5.01/Makefile +--- memtest86+-5.01-orig/Makefile 2013-08-09 22:01:58.000000000 -0400 ++++ memtest86+-5.01/Makefile 2014-06-22 10:59:27.463573842 -0400 +@@ -12,7 +12,7 @@ FDISK=/dev/fd0 + 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 \ diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch new file mode 100644 index 000000000000..f140a7fc6605 --- /dev/null +++ b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch @@ -0,0 +1,16 @@ +--- Makefile.orig 2015-02-01 01:08:33.000000000 +0300 ++++ Makefile 2015-02-01 01:10:17.624757244 +0300 +@@ -9,11 +9,10 @@ + # + FDISK=/dev/fd0 + +-AS=as -32 +-CC=gcc +- + CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \ + -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector ++CPPFLAGS= -m32 ++ASFLAGS= -32 + + OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \ + config.o cpuid.o linuxbios.o pci.o memsize.o spd.o error.o dmi.o controller.o \ diff --git a/sys-apps/memtest86+/memtest86+-5.01.ebuild b/sys-apps/memtest86+/memtest86+-5.01.ebuild new file mode 100644 index 000000000000..faaedaa5f5e8 --- /dev/null +++ b/sys-apps/memtest86+/memtest86+-5.01.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/memtest86+/memtest86+-5.01.ebuild,v 1.1 2015/01/31 22:57:46 bircoph Exp $ + +EAPI=4 + +inherit mount-boot eutils toolchain-funcs + +DESCRIPTION="Memory tester based on memtest86" +HOMEPAGE="http://www.memtest.org/" +SRC_URI="http://www.memtest.org/download/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="floppy serial" + +BOOTDIR=/boot/memtest86plus +QA_PRESTRIPPED="${BOOTDIR}/memtest.netbsd" +QA_FLAGS_IGNORED="${BOOTDIR}/memtest.netbsd" + +RDEPEND="floppy? ( >=sys-boot/grub-0.95:0 sys-fs/mtools )" +DEPEND="" + +src_prepare() { + sed -i -e 's,0x10000,0x100000,' memtest.lds || die + sed -e "s/scp memtest.bin root@192.168.0.12:\/srv\/tftp\/mt86plus//g" -i Makefile + epatch "${FILESDIR}/${P}-gcc-473.patch" \ + "${FILESDIR}/${P}-hardcoded_cc.patch" + + if use serial ; then + sed -i \ + -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ + config.h \ + || die "sed failed" + fi + + cat - > "${T}"/39_${PN} < title=${PN}" + elog " > root (hd?,?)" + elog " > kernel ${BOOTDIR}/memtest" + elog " - For lilo:" + elog " > image = ${BOOTDIR}/memtest" + elog " > label = ${PN}" + elog +}