summaryrefslogtreecommitdiff
path: root/sys-apps/memtest86+
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-03-20 00:40:44 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-03-20 00:40:44 +0000
commit4cbcc855382a06088e2f016f62cafdbcb7e40665 (patch)
tree356496503d52354aa6d9f2d36126302fed5f3a73 /sys-apps/memtest86+
parentfcc5224904648a8e6eb528d7603154160a20022f (diff)
gentoo resync : 20.03.2022
Diffstat (limited to 'sys-apps/memtest86+')
-rw-r--r--sys-apps/memtest86+/Manifest12
-rw-r--r--sys-apps/memtest86+/files/39_memtest86+67
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch33
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch16
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch31
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch49
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch19
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch14
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-objcopy.patch20
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch15
-rw-r--r--sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch21
-rw-r--r--sys-apps/memtest86+/memtest86+-5.01-r5.ebuild115
12 files changed, 0 insertions, 412 deletions
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 48cb91e24eda..7bd7421a7744 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,16 +1,6 @@
-AUX 39_memtest86+ 1610 BLAKE2B a27eed85f2678e84faa3d4a025d7e53bdf9018b095b9c7590bb01bceda88a4791a863ec5e1efc547ebb9b36a87a14986ac08bcb4166901a087244cdd93cad740 SHA512 49ff9ff7dccf92a2d287191b6e4c91d418f064f6018d19081d1086b18a2a61ee043ccf93077f129189b8da6598dec3af4f738ab992d9cddb1f7f39cd8b6e71ad
AUX 39_memtest86+-r1 1702 BLAKE2B ba73cef5d026a242ab3e5ac54a98cf289ceedfbe174a9d2109cab785e0b0fc9b9e59aa3c80d276255cc8c18bdc3567f02e644652512e194e3c555436d42be8e3 SHA512 ef2d86bd902f44905921880c630a85d3c9763bea3b79211f64346f1f55a5f31ed0b20a80f9f0c3914de1f33b7bd7d3471762f17065183ced185de52d34f2068f
AUX make-memtest86+-boot-floppy 2499 BLAKE2B 1076e5d3e3a139c46c684f7ed29658cd815525e56fae03eb4dd1e36fda0c751a1aa78c891d040aeee979f8b79a8b0db8453e4e26f2efd9963e7bfa10206b5c86 SHA512 28649d630c4624573a5cf4279f6207cf44707978d8a18f2c614997f641038f2da731bb5c3b26066812a5c02d926c40020e74820b1a4eb2b4732a76686c52c260
AUX make-memtest86+-boot-floppy.1 1165 BLAKE2B 974a5c70009031517bbeaa06155a7da411ce1823ed2b7dc31a1843618058cbcd1c1a51f9c9012dddd843579b588c619c6448e65ae369ba2dc6441a991bf8d9b7 SHA512 8b5b6397e50cf4d48aeda31de4c1f72493e97db52ff45966716df8f9b0fbbd8d4ed71e289c0113ef53fa52a7ea6df4c107c63ca70f90c951dd085c05b64db147
-AUX memtest86+-5.01-gcc-473.patch 1308 BLAKE2B 7796745ddc5a11ea14958d762201873e7d8ab645aaee9c96804c6f0e94bb8b341a4db2d1434ad9b7365f486c097b8ab4cdcaff01114344abd5a288c456fba722 SHA512 94427ae0b78c9e24a8f4db6285a04ec468d17b6b4bb26550abb006a9fa37b52c871cb4cfb0fb2489e373b0ea9748106938f7fb4ad0f31968e151e37294199a55
-AUX memtest86+-5.01-hardcoded_cc.patch 488 BLAKE2B ad978b2c1a15dfefc1f56953be62d7943953351b3c291a392cffecaca2757e4aba46961570077761fa2796a81b4d1d5b8341527245fe9beb52f9c135efe7c713 SHA512 ccd348f253aece4530051c54f94d1ca3185cdf98df928807fed5ab6be8632828d53049b3829a6f147103ed05a5a482a8e273cec17bd1d539d06cb56a3fa53721
-AUX memtest86+-5.01-io-extern-inline.patch 1183 BLAKE2B 2d86cec1bca2fd3f1f71fd0a1a704447e356d77aa0e84ed7da199daaeea89d3abe7cae3b222a99d8f36f45846a8a779f3955cba6a59d64cc103908916b5edcb9 SHA512 c307d268d2e3fc0c4517f627eea0c53679cb6f76cba06bb822beb2b6121e0ce0bdbe59539ff5fe716f0fd0083fa987d8a44d2999b888ccc05f8d3d9d693ded0b
-AUX memtest86+-5.01-no-C-headers.patch 1078 BLAKE2B 6e0fdb66ed5f411e73f8d6908edb7ef561427c735d3fc4416dd1ae47c41ae73e93c123827b078f4d6070eecd98ecb177d6eaae0b11b6e380c4020c68ae711c33 SHA512 8720da16f03e7ea511b1b26ff19f105737e698f9604cd87256b5a3703a7347b0334c1e0ec9ef3b7aafa2a8bca1de6d6deeb865a1de343cc5c3ccd13663fa796e
-AUX memtest86+-5.01-no-clean.patch 603 BLAKE2B cb00ec1f702c7fd1697c48599ba7113bc0e9b72be6ef810f6e2e212587b39fb8563f5b3abc8f0cb82197d3a4d790e5df22c5bab5a77215645c8b41d327471541 SHA512 39b86324428be68192f66a767d33b53e15cffb0f96857dfb4b0e96f0ba2e52953cfd2079a6891a31e73d529e33632122c40e03f227d2203a6ff25dc03f23a056
-AUX memtest86+-5.01-no-scp.patch 388 BLAKE2B a5b195d54c4a9d99c62771430822f87f20f6f97c7dfb28f8fc8db0f5e6aba79404bdce924ad303fbbb0cf04fcd5551abc81bf0fcbab9ac17884bd32f81832d33 SHA512 4b14e16fbe8e69a4d532e8327486fd2434798613a784aca24b381f1fb5ae39839344281494c32dfd0fe8a8a46b744abdaac7884be4a95a87b635e0baea63731a
-AUX memtest86+-5.01-objcopy.patch 654 BLAKE2B 34295b2ebb0edbdf007652009de46fef56bb723188fe31f25d19bd965f6b80b18d6bc41edc96e761afa5e7184b63e46e2867e7d84000a37571162337736e192d SHA512 f9c1152ef3bf546bf346a9ff53212fba7cf1ff43bf94f7ea3a3b897336b6ff4516b02e6bbf74dde7acf8adcf6bda5afac9469d09e0fabb32c49ae05483624a16
-AUX memtest86+-5.01-reboot-def.patch 326 BLAKE2B a17bcde8563a3f1a8e88c50e981b3d93439a19d0b1186c511826f9836be8efb5bcc2f0031c28887bf0c67ef9e8c9942eca641f923f87c458f070507645007f0a SHA512 2309da17ae7bfd32137b02c0533a9d4f30c95d70dea309a009219457f07f36e0b9192e1ac55485513a23d6364247476886a4720ffe83d33a2c493124a82797a1
-AUX memtest86+-5.01-test-random-cflags.patch 679 BLAKE2B 62ccc56c3f127b3e3213d6bb9605094dd8ba2580d2047873583db8b7a3d48db225eb8b7013319903e92ba9c658569470fb6b3de4f4b7f6b3686efdd5f9c132eb SHA512 a000cf28d69396b0707519bb995f086457f8fa5283299164d969dbf02abea86b566016d71fac7e887c6089bc39c58be9e5c885cfb5f8e7eb815ea1741e097bb6
AUX memtest86+-5.31b-discard-note_gnu_property.patch 723 BLAKE2B 852a5daf852991cde8dec0bd777524744c5303b1966cacd0e15abad9dfea06ea3d6616ea57777bf694da2edb0e4c8b828288c69d655c0e46e27b6a6463ef787b SHA512 923c71e9d037cc0c26006a55045c9362dabf1ed3a6cf20a5b9f61661d6fe9e6dd17f17bcee47d515497a2720485f5d4d34c0f7815c483997aff123ab9d2f5239
AUX memtest86+-5.31b-fix-gcc8-freeze-crash.patch 511 BLAKE2B 2a536d7c833f4758c9fd9c650dd98b0887610884aadab67b86c7f73cc682daca5a66052102a4db870550741a11c5da38dd0251a8f4afdd4943c452858d5dae56 SHA512 63b88c7e14c75e01291809fde47df88d323e68cc0e658921ccea600f94deafaf1a118de9b16e9303dd5b49bff205d48be5c23bc34782059d4ea112407103408b
AUX memtest86+-5.31b-gcc-473.patch 426 BLAKE2B c7ce26466a1d0a083e9da5ce4f1d5430c43c7a1264f9edf533f82905b8dfb290fcf4a67c8cff79277bd26a59003277ef9ea8d321e8c81b0952b2d662369883de SHA512 dde40a97c6ac8aec9b19ace1ab3cedf30146b908d6f9978eb0c6d1b2589242be35e1e4710b2aaa6f2def670d00add92761e4ab763f33724aec334f5b922254c9
@@ -18,8 +8,6 @@ AUX memtest86+-5.31b-hardcoded_cc.patch 316 BLAKE2B 9be278d20cfaeeb01a32628bb433
AUX memtest86+-5.31b-no-clean.patch 570 BLAKE2B 99fcdc691c44b4c116878713e48ec5056f7da80355ce17ba35ca6c3eb4de2f51bb84212bdc48127b870b87bff722be8e21e08b10e1b4f691b9111c374f2a70e4 SHA512 19ef0c4af27a6382729faa6c2b9666006d053cadf3f457e62d4e21fae266e42b54eb5db87d97817a0b3e2d6bd1f41a054bf6e6a85f8acda77816c6bdaf69a59e
AUX memtest86+-5.31b-objcopy.patch 610 BLAKE2B a7a68cefbca249a2db578fa2d1eac2095ebe35f4fba67b6b44b1a85360fdac86a154585b6776ac95ac2963c773ccfcf4e8d828b2c1736bab2741f483626b61a6 SHA512 ad55e5448e70db93a19801cb6dd7cddfd4bf52d9d11582ba00335e59906cb8ee9165b828e59a1ecd1b0ddb2a52aff7165803d69c2ad3984a18ff07f069d36ea1
AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d54daca34ad53a6eee0f7ce2592acfc60a60bf0c8f08adacc82ed67ae8e7ae7faa995d9b6efa0d0ea3cf0df33f5cda1a606a7e0d987 SHA512 98965cfe1ec90f5dee115da406609cd85651e09b9914232b717a3b8755b4c10b05f58ed08c8a470b2bd772f1ef4d93faf63516f902a0b48b9c33974eba4733a1
-DIST memtest86+-5.01.tar.gz 214877 BLAKE2B ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050 SHA512 d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
-EBUILD memtest86+-5.01-r5.ebuild 2843 BLAKE2B 6094eb3d890de7f7fd72012104c0b467746a313a5ad04c3546e1932556889b108edc8b6ed44442c0443b2305c335c3bbcd4f178c80564b0da9d7a5e11fc17d6f SHA512 dcea721c0ac1abfe2f4f1ccf0972284025d841caf84d7d439ae1b4d9dd891e46418ab08cd4b0807dab93a132cc29a4ee4cae6f72da7cc5dc356e8ef6d3e40859
EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881
MISC metadata.xml 551 BLAKE2B 8d899e354f3c3e84526674d2eab5fb81f20a2c585d599cafe7a12dec4aa9bf2b004ce6f54010474b0abd2ec0b347b00937aef25cc162794520554dedc89471ba SHA512 519fa8bbbeda2f082ce1eb5874089a61041d2ae0902c73183fd4e619e14b137c1aca2cb4d81557afad5f9620713ba8ee324d7c7674ac0618e9dab8a5d7abdc0e
diff --git a/sys-apps/memtest86+/files/39_memtest86+ b/sys-apps/memtest86+/files/39_memtest86+
deleted file mode 100644
index 9c9067a5e736..000000000000
--- a/sys-apps/memtest86+/files/39_memtest86+
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-
-. /usr/share/grub/grub-mkconfig_lib
-
-memtest=/boot/memtest86plus/memtest
-
-memtestbsd=/boot/memtest86plus/memtest.netbsd
-
-if [ -f "${memtest}" ] && [ -f "${memtestbsd}" ]; then
- multiple_memtest=true
-fi
-
-submenu_indentation=""
-if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
- submenu_indentation="${grub_tab}"
- cat <<EOF
-submenu 'Memtest86+' {
-EOF
-fi
-
-if [ -f "${memtest}" ]; then
- gettext_printf "Found memtest image: %s\n" "${memtest}" >&2
-
- device="$("${grub_probe}" --target=device "${memtest}")"
- path="$(make_system_path_relative_to_its_root "${memtest}")"
- cat <<EOF
-${submenu_indentation}menuentry 'Memtest86+' {
-EOF
-
- if [ -n "{submenu_indentation}" ]; then
- prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
- else
- prepare_grub_to_access_device "${device}" | grub_add_tab
- fi
-
- cat <<EOF
- ${submenu_indentation}linux16 "${path}"
-${submenu_indentation}}
-EOF
-fi
-
-if [ -f "${memtestbsd}" ]; then
- gettext_printf "Found memtest image: %s\n" "${memtestbsd}" >&2
-
- device="$("${grub_probe}" --target=device "${memtestbsd}")"
- path="$(make_system_path_relative_to_its_root "${memtestbsd}")"
- cat <<EOF
-${submenu_indentation}menuentry 'Memtest86+ (netbsd)' {
-EOF
-
- if [ -n "${submenu_indentation}" ]; then
- prepare_grub_to_access_device "${device}" | grub_add_tab | grub_add_tab
- else
- prepare_grub_to_access_device "${device}" | grub_add_tab
- fi
-
- cat <<EOF
- ${submenu_indentation}knetbsd "${path}"
-${submenu_indentation}}
-EOF
-fi
-
-if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; then
- cat <<EOF
-}
-EOF
-fi
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch
deleted file mode 100644
index af011d67c705..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-http://forum.canardpc.com/threads/110950-fix-controller-loop-error
-
---- memtest86+-5.01/controller.c
-+++ memtest86+-5.01/controller.c
-@@ -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;
---- memtest86+-5.01/Makefile
-+++ memtest86+-5.01/Makefile
-@@ -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
deleted file mode 100644
index 21b51c5b7fff..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Makefile.orig 2015-02-01 01:08:33.000000000 +0300
-+++ b/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+/files/memtest86+-5.01-io-extern-inline.patch b/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch
deleted file mode 100644
index 682dd5d01a1e..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-http://forum.canardpc.com/threads/110951-fix-build-with-newer-gcc-versions
-
-the meaning of extern inline changed between standards. use static inline
-for these tiny I/O functions everywhere to keep things simple.
-
---- a/io.h
-+++ b/io.h
-@@ -31,6 +31,6 @@
- */
-
- #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) \
-@@ -43,6 +43,6 @@
- __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) \
-@@ -55,6 +55,6 @@
- __IN1(s##c_p) __IN2(s,s1,"") : "=a" (_v) : "id" (port) ,##i ); SLOW_DOWN_IO; return _v; }
-
- #define __OUTS(s) \
--extern inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
-+static inline void outs##s(unsigned short port, const void * addr, unsigned long count) \
- { __asm__ __volatile__ ("cld ; rep ; outs" #s \
- : "=S" (addr), "=c" (count) : "d" (port),"0" (addr),"1" (count)); }
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch
deleted file mode 100644
index ce7f906a19d5..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-http://forum.canardpc.com/threads/110955-PATCH-don-t-pull-in-system-headers
-
-avoid using C library headers as it'd mean we'd need 32-bit glibc files available
-
-https://bugs.gentoo.org/592638
-
---- a/dmi.c
-+++ b/dmi.c
-@@ -10,7 +10,7 @@
-
-
- #include "test.h"
--#include <stdint.h>
-+#include "stdint.h"
-
-
- #define round_up(x,y) (((x) + (y) - 1) & ~((y)-1))
---- a/test.c
-+++ b/test.c
-@@ -14,7 +14,28 @@
- #include "stdint.h"
- #include "cpuid.h"
- #include "smp.h"
--#include <sys/io.h>
-+
-+static inline unsigned char
-+inb_p (unsigned short int __port)
-+{
-+ unsigned char _v;
-+
-+ __asm__ __volatile__ ("inb %w1,%0\noutb %%al,$0x80":"=a" (_v):"Nd" (__port));
-+ return _v;
-+}
-+
-+static inline void
-+outb (unsigned char __value, unsigned short int __port)
-+{
-+ __asm__ __volatile__ ("outb %b0,%w1": :"a" (__value), "Nd" (__port));
-+}
-+
-+static inline void
-+outb_p (unsigned char __value, unsigned short int __port)
-+{
-+ __asm__ __volatile__ ("outb %b0,%w1\noutb %%al,$0x80": :"a" (__value),
-+ "Nd" (__port));
-+}
-
- extern struct cpu_ident cpu_id;
- extern volatile int mstr_cpu;
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
deleted file mode 100644
index e9cbf10399c3..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-http://forum.canardpc.com/threads/110954-PATCH-fix-parallel-build-issues
-
-
-don't run the clean target when building all as we run into parallel races:
- - memtest kicks off building of a bunch of .o files
- - clean runs in parallel which runs `rm` and deletes some of the new .o
- - memtest goes to link and fails because objects are missing
-
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@
- smp.o vmem.o random.o
-
-
--all: clean memtest.bin memtest
-+all: memtest.bin memtest
-
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch
deleted file mode 100644
index 8d830e297ec2..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://forum.canardpc.com/threads/110953-PATCH-don-t-try-to-scp-after-building
-
-this makes no sense in a sane build world
-
---- a/Makefile
-+++ b/Makefile
-@@ -21,7 +21,6 @@
-
-
- all: clean memtest.bin memtest
-- scp memtest.bin root@192.168.0.12:/srv/tftp/mt86plus
-
- # Link it statically once so I know I don't have undefined
- # symbols and then link it dynamically so I have full
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-objcopy.patch b/sys-apps/memtest86+/files/memtest86+-5.01-objcopy.patch
deleted file mode 100644
index 5effe20027a9..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-objcopy.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Allow 'objcopy' override with user's OBJCOPY.
---- a/Makefile
-+++ b/Makefile
-@@ -8,6 +8,7 @@
- # Path for the floppy disk device
- #
- FDISK=/dev/fd0
-+OBJCOPY=objcopy
-
- CFLAGS= -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
- -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-@@ -30,7 +31,7 @@ memtest_shared: $(OBJS) memtest_shared.lds Makefile
- $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
-
- memtest_shared.bin: memtest_shared
-- objcopy -O binary $< memtest_shared.bin
-+ $(OBJCOPY) -O binary $< memtest_shared.bin
-
- memtest: memtest_shared.bin memtest.lds
- $(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch
deleted file mode 100644
index f4b42feb5fb3..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://forum.canardpc.com/threads/110952-fix-build-due-to-missing-reboot-symbol
-
-the reboot func is used elsewhere, so don't mark it inline
-
---- a/lib.c
-+++ b/lib.c
-@@ -33,7 +33,7 @@ struct ascii_map_str {
- int keycode;
- };
-
--inline void reboot(void)
-+void reboot(void)
- {
-
- /* tell the BIOS to do a cold start */
diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch b/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch
deleted file mode 100644
index dcdccb8c6e97..000000000000
--- a/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-make sure we re-use the existing CFLAGS settings so that we get all the right
-flags (like -fno-stack-protector). just append the few changes we want (the
-optimization levels).
-
-https://bugs.gentoo.org/590974
-
---- a/Makefile
-+++ b/Makefile
-@@ -52,10 +52,10 @@ reloc.o: reloc.c
- $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-
- test.o: test.c
-- $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin -ffreestanding test.c
-+test.o: CFLAGS += -O0 -fno-PIC
-
- random.o: random.c
-- $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding random.c
-+random.o: CFLAGS += -O3 -fno-PIC
-
- # rule for build number generation
- build_number:
diff --git a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild b/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
deleted file mode 100644
index e47609b69d52..000000000000
--- a/sys-apps/memtest86+/memtest86+-5.01-r5.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit mount-boot epatch 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="+boot floppy iso serial"
-
-BOOTDIR="/boot/memtest86plus"
-QA_PRESTRIPPED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
-QA_FLAGS_IGNORED="${BOOTDIR}/memtest /usr/share/${PN}/memtest"
-
-RDEPEND="floppy? ( sys-fs/mtools )"
-DEPEND="iso? ( app-cdr/cdrtools )"
-
-pkg_pretend() {
- use boot && mount-boot_pkg_pretend
-}
-
-src_prepare() {
- sed -i -e 's,0x10000,0x100000,' memtest.lds || die
- epatch "${FILESDIR}/${P}-gcc-473.patch" \
- "${FILESDIR}/${P}-hardcoded_cc.patch"
- epatch "${FILESDIR}"/${P}-no-scp.patch
- epatch "${FILESDIR}"/${P}-io-extern-inline.patch #548312
- epatch "${FILESDIR}"/${P}-reboot-def.patch #548312
- epatch "${FILESDIR}"/${P}-no-clean.patch #557890
- epatch "${FILESDIR}"/${P}-no-C-headers.patch #592638
- epatch "${FILESDIR}"/${P}-test-random-cflags.patch #590974
- epatch "${FILESDIR}"/${P}-objcopy.patch
-
- sed -i 's:genisoimage:mkisofs:' makeiso.sh || die
- if use serial ; then
- sed -i \
- -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \
- config.h \
- || die "sed failed"
- fi
- default
-}
-
-src_configure() {
- tc-ld-disable-gold #580212
- tc-export AS CC LD
-}
-
-src_compile() {
- emake OBJCOPY="$(tc-getOBJCOPY)"
- if use iso ; then
- ./makeiso.sh || die
- fi
-}
-
-src_test() { :; }
-
-src_install() {
- if use boot; then
- insinto "${BOOTDIR}"
- doins memtest memtest.bin
- fi
-
- insinto /usr/share/${PN}
- use iso && newins mt*.iso memtest.iso
- doins memtest memtest.bin
-
- exeinto /etc/grub.d
- newexe "${FILESDIR}"/39_${PN}-r1 39_${PN}
-
- dodoc README README.build-process FAQ changelog
-
- if use floppy ; then
- dobin "${FILESDIR}"/make-memtest86+-boot-floppy
- doman "${FILESDIR}"/make-memtest86+-boot-floppy.1
- fi
-}
-
-pkg_preinst() {
- use boot && mount-boot_pkg_preinst
-}
-
-pkg_postinst() {
- if use boot; then
- mount-boot_pkg_postinst
-
- elog "memtest86+ has been installed in ${BOOTDIR}/"
- elog "You may wish to update your bootloader configs by adding these lines:"
- elog " - For grub2 just run grub-mkconfig, a configuration file is installed"
- elog " as /etc/grub.d/39_${PN}"
- elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)"
- elog " > title=${PN}"
- elog " > root (hd?,?)"
- elog " > kernel ${BOOTDIR}/memtest.bin"
- elog " - For lilo:"
- elog " > image = ${BOOTDIR}/memtest.bin"
- elog " > label = ${PN}"
- elog ""
- elog "Note: For older configs, you might have to change from 'memtest' to 'memtest.bin'."
- fi
-}
-
-pkg_prerm() {
- use boot && mount-boot_pkg_prerm
-}
-
-pkg_postrm() {
- use boot && mount-boot_pkg_postrm
-}