[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86/files/, sys-apps/memtest86/

2023-08-28 Thread Sam James 
commit: abce894dde2ad1b4babeaa1f4fc86e76e22e0c45
Author: Sam James  gentoo  org>
AuthorDate: Mon Aug 28 19:14:35 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 28 19:32:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abce894d

sys-apps/memtest86: fix build w/ binutils-2.41[hardened]

Closes: https://bugs.gentoo.org/912343
Signed-off-by: Sam James  gentoo.org>

 .../memtest86-4.3.7-binutils-2.41-textrels.patch   | 31 ++
 sys-apps/memtest86/memtest86-4.3.7-r3.ebuild   |  3 ++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git 
a/sys-apps/memtest86/files/memtest86-4.3.7-binutils-2.41-textrels.patch 
b/sys-apps/memtest86/files/memtest86-4.3.7-binutils-2.41-textrels.patch
new file mode 100644
index ..d95b96402be7
--- /dev/null
+++ b/sys-apps/memtest86/files/memtest86-4.3.7-binutils-2.41-textrels.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/912343
+--- a/Makefile
 b/Makefile
+@@ -21,15 +21,15 @@ all: memtest.bin memtest
+ # symbols and then link it dynamically so I have full
+ # relocation information
+ memtest_shared: $(OBJS) memtest_shared.lds Makefile
+-  $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds 
-m elf_i386 \
++  $(LD) --warn-constructors --warn-common -static -z notext 
--no-warn-rwx-segments -T memtest_shared.lds -m elf_i386 \
+   -o $@ $(OBJS) && \
+-  $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
++  $(LD) -shared -Bsymbolic -z notext --no-warn-rwx-segments -T 
memtest_shared.lds -o $@ $(OBJS)
+ 
+ memtest_shared.bin: memtest_shared
+   objcopy -O binary $< memtest_shared.bin
+ 
+ memtest: memtest_shared.bin memtest.lds
+-  $(LD) -s -T memtest.lds -b binary memtest_shared.bin -o $@
++  $(LD) -s -z notext --no-warn-rwx-segments -T memtest.lds -b binary 
memtest_shared.bin -o $@
+ 
+ head.s: head.S config.h defs.h test.h
+   $(CC) -E -traditional $< -o $@
+@@ -41,7 +41,7 @@ setup.s: setup.S config.h defs.h
+   $(CC) -E -traditional $< -o $@
+ 
+ memtest.bin: memtest_shared.bin bootsect.o setup.o memtest.bin.lds
+-  $(LD) -T memtest.bin.lds bootsect.o setup.o -b binary \
++  $(LD) -z notext --no-warn-rwx-segments -T memtest.bin.lds bootsect.o 
setup.o -b binary \
+   memtest_shared.bin -o memtest.bin
+ 
+ reloc.o: reloc.c

diff --git a/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild 
b/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild
index 70ce741c82d1..58740a968ccc 100644
--- a/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild
+++ b/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -19,6 +19,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-4.3.7-io-extern-inline.patch #548312 #568292
"${FILESDIR}"/${PN}-4.3.7-reboot-def.patch #548312 #568292
"${FILESDIR}"/${PN}-4.3.7-no-clean.patch #557890
+   "${FILESDIR}"/${PN}-4.3.7-binutils-2.41-textrels.patch #912343
 )
 
 S="${WORKDIR}/src"

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

2023-05-19 Thread Ben Kohler 
commit: 1cb153f2fddd44769e159e0fd0a24298f88d36ab
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri May 19 12:57:07 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri May 19 12:59:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb153f2

sys-apps/memtest86+: fix syntax error in grub.d file

This minor syntax error would cause some indentation inconsistency

Closes: https://bugs.gentoo.org/839174

Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/memtest86+/files/39_memtest86+-r2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/memtest86+/files/39_memtest86+-r2 
b/sys-apps/memtest86+/files/39_memtest86+-r2
index a213e0325609..d53f83cc311a 100644
--- a/sys-apps/memtest86+/files/39_memtest86+-r2
+++ b/sys-apps/memtest86+/files/39_memtest86+-r2
@@ -30,7 +30,7 @@ ${submenu_indentation}if [ "x\$grub_platform" = xpc ]; then
 ${submenu_indentation}menuentry 'Memtest86+ 32bit' {
 EOF
 
-   if [ -n "{submenu_indentation}" ]; then
+   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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/

2023-05-19 Thread Ben Kohler 
commit: b17dd9cc9097d341529cdd513cb54d6ef9dbfcb7
Author: Ben Kohler  gentoo  org>
AuthorDate: Fri May 19 12:54:26 2023 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Fri May 19 12:55:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b17dd9cc

sys-apps/memtest86+: drop 5.31b-r3

Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/memtest86+/Manifest   |   1 -
 sys-apps/memtest86+/files/39_memtest86+-r1 |  69 
 .../memtest86+/files/make-memtest86+-boot-floppy   | 111 ---
 .../memtest86+/files/make-memtest86+-boot-floppy.1 |  39 ---
 ...emtest86+-5.31b-discard-note_gnu_property.patch |  23 
 .../memtest86+-5.31b-fix-gcc8-freeze-crash.patch   |  12 ---
 .../files/memtest86+-5.31b-gcc-473.patch   |  13 ---
 .../files/memtest86+-5.31b-hardcoded_cc.patch  |  16 ---
 .../files/memtest86+-5.31b-no-clean.patch  |  19 
 .../files/memtest86+-5.31b-objcopy.patch   |  21 
 .../memtest86+-5.31b-test-random-cflags.patch  |  17 ---
 sys-apps/memtest86+/memtest86+-5.31b-r3.ebuild | 117 -
 12 files changed, 458 deletions(-)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a49e75d87f01..443b509c1c6f 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,3 +1,2 @@
-DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 
14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca
 SHA512 
ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
 DIST memtest86+-6.10.tar.gz 230056 BLAKE2B 
2462c31f1ca27aa166c447e51a9b388872faaf7f845100a122f5dd8eb11dc76e26c503dc14d0825bda397c7180a5259094a020d25dd9d43b1997bfbe424c7f65
 SHA512 
2fb8e6d375f7ced53b1c2d50ffeeafcee1282b2495ea4241958e210c0b4a3500701025041469459c0db1662c448a3b65a51a994d19bc8ac217e23fa935700e42
 DIST memtest86+-6.20.tar.gz 232436 BLAKE2B 
6e3bea4b18049446f27da2cb1313300c578ef7fdb774b6a20df603271b66a6c0066be64a91b0a6d4ffcc63f1e139132942290a8111f6a9910a5586cac966
 SHA512 
b12856bd6ba82dac6308bb9f611ddb16df68c3da4d00ad9abf23bcf5d3f2e5c424fc1bccedd8c0732b4c68013c421ed20c5db56c39b619bbe77c4c1f5e8504f0

diff --git a/sys-apps/memtest86+/files/39_memtest86+-r1 
b/sys-apps/memtest86+/files/39_memtest86+-r1
deleted file mode 100644
index 20422b74d65a..
--- a/sys-apps/memtest86+/files/39_memtest86+-r1
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/sh
-
-. /usr/share/grub/grub-mkconfig_lib
-
-memtest=/boot/memtest86plus/memtest.bin
-
-memtestelf=/boot/memtest86plus/memtest
-
-if [ -f "${memtest}" ] && [ -f "${memtestelf}" ]; then
-   multiple_memtest=true
-fi
-
-submenu_indentation=""
-if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; 
then
-   submenu_indentation="${grub_tab}"
-   cat <&2
-
-   device="$("${grub_probe}" --target=device "${memtest}")"
-   path="$(make_system_path_relative_to_its_root "${memtest}")"
-   cat <&2
-
-   device="$("${grub_probe}" --target=device "${memtestelf}")"
-   path="$(make_system_path_relative_to_its_root "${memtestelf}")"
-   cat <
-#  - original version
-# (c) 2004 Yann Dirson 
-#  - added parameters
-#  - ability to work on a floppy image instead of a real floppy
-#  - adapted patches from Martin Koeppe , to use
-#mtools and install full grub
-
-# TODO:
-# - add a flag to generate a default boot entry for (hd0)
-
-set -e
-
-MEMTEST=/boot/memtest86plus/memtest.bin
-FLOPPYIMAGE=/dev/fd0
-GRUBBIN=/sbin/grub
-GRUBLIB=/lib/grub
-MFORMAT=/usr/bin/mformat
-
-arch=$(uname -m)
-
-case "$arch" in
-   i386|i486|i686) GRUBARCH=i386-pc;;
-   x86_64) GRUBARCH=x86_64-pc;;
-   *)  error "Unsupported 
architecture: $arch";;
-esac
-
-error()
-{
-echo >&2 "$0: $*"
-exit 1
-}
-
-needsarg()
-{
-[ $1 -ge 2 ] || error "syntax error"
-}
-
-[ -d $GRUBLIB ] || error "Can't find $GRUBLIB - did you install a recent grub 
package (0.95+cvs20040624 or later) ?"
-[ -x $MFORMAT ] || error "Can't find mformat - did you install the mtools 
package ?"
-
-while [ $# -gt 0 ]
-do
-case "$1" in
---help) echo "$0 [--memtest $MEMTEST] [--floppyimage $FLOPPYIMAGE]"; exit 
0 ;;
---memtest) needsarg $#; MEMTEST="$2"; shift ;;
---floppyimage) needsarg $#; FLOPPYIMAGE="$2"; shift ;;
-*) error "syntax error" ;;
-esac
-shift
-done
-
-MOUNTPOINT=$(mktemp -d)
-
-if [ -b "$FLOPPYIMAGE" ]
-then
-FINALDEV="$FLOPPYIMAGE"
-FLOPPYIMAGE="$(mktemp)"
-else
-FINALDEV=""
-fi
-
-echo "* Creating msdos file system"
-echo
-if [ ! -s "$FLOPPYIMAGE" ]; then
-# unless a non-empty image exists, create a blank one first
-dd bs=1024 count=1440 if=/dev/zero of="$FLOPPYIMAGE"
-fi
-# FIXME: "-f 1440" should probably be dropped
-mformat -i

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/

2022-06-07 Thread Ben Kohler 
commit: b28d427224c238f876169474ba9c8c865c989f73
Author: Ben Kohler  gentoo  org>
AuthorDate: Tue Jun  7 17:02:49 2022 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Tue Jun  7 17:42:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b28d4272

sys-apps/memtest86+: add 6.00_beta2

Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/memtest86+/Manifest |   1 +
 sys-apps/memtest86+/files/39_memtest86+-r2   | 126 +++
 sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild |  71 +
 sys-apps/memtest86+/metadata.xml |   6 ++
 4 files changed, 204 insertions(+)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index a3c17016ab5d..30e66ca497f9 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1 +1,2 @@
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 
14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca
 SHA512 
ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541
+DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 
223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c
 SHA512 
78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea

diff --git a/sys-apps/memtest86+/files/39_memtest86+-r2 
b/sys-apps/memtest86+/files/39_memtest86+-r2
new file mode 100644
index ..a213e0325609
--- /dev/null
+++ b/sys-apps/memtest86+/files/39_memtest86+-r2
@@ -0,0 +1,126 @@
+#!/bin/sh
+
+. /usr/share/grub/grub-mkconfig_lib
+
+mtbios32=/boot/memtest86plus/memtest32.bios
+mtbios64=/boot/memtest86plus/memtest64.bios
+mtefi32=/boot/memtest86plus/memtest.efi32
+mtefi64=/boot/memtest86plus/memtest.efi64
+
+if [ $(ls /boot/memtest86plus | wc -l) -gt 1 ]; then
+   multiple_memtest=true
+fi
+
+submenu_indentation=""
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; 
then
+   submenu_indentation="${grub_tab}"
+   cat <&2
+
+   device="$("${grub_probe}" --target=device "${mtbios32}")"
+   path="$(make_system_path_relative_to_its_root "${mtbios32}")"
+   cat <&2
+
+device="$("${grub_probe}" --target=device "${mtbios64}")"
+path="$(make_system_path_relative_to_its_root "${mtbios64}")"
+cat <&2
+
+device="$("${grub_probe}" --target=device "${mtefi32}")"
+path="$(make_system_path_relative_to_its_root "${mtefi32}")"
+cat <&2
+
+device="$("${grub_probe}" --target=device "${mtefi64}")"
+path="$(make_system_path_relative_to_its_root "${mtefi64}")"
+cat

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/

2022-02-19 Thread Ben Kohler 
commit: 2f7d6a63dfed0ce91010bc92f32163591b218894
Author: Ben Kohler  gentoo  org>
AuthorDate: Sat Feb 19 13:00:52 2022 +
Commit: Ben Kohler  gentoo  org>
CommitDate: Sat Feb 19 13:14:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7d6a63

sys-apps/memtest86+: drop old

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Ben Kohler  gentoo.org>

 sys-apps/memtest86+/Manifest   |   1 -
 sys-apps/memtest86+/files/39_memtest86+|  67 
 .../memtest86+/files/memtest86+-5.01-gcc-473.patch |  33 --
 .../files/memtest86+-5.01-hardcoded_cc.patch   |  16 ---
 .../files/memtest86+-5.01-io-extern-inline.patch   |  31 --
 .../files/memtest86+-5.01-no-C-headers.patch   |  49 -
 .../files/memtest86+-5.01-no-clean.patch   |  19 
 .../memtest86+/files/memtest86+-5.01-no-scp.patch  |  14 ---
 .../memtest86+/files/memtest86+-5.01-objcopy.patch |  20 
 .../files/memtest86+-5.01-reboot-def.patch |  15 ---
 .../files/memtest86+-5.01-test-random-cflags.patch |  21 
 sys-apps/memtest86+/memtest86+-5.01-r5.ebuild  | 115 -
 12 files changed, 401 deletions(-)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 48b2ddc7961f..a3c17016ab5d 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1,2 +1 @@
-DIST memtest86+-5.01.tar.gz 214877 BLAKE2B 
ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050
 SHA512 
d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
 DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 
14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca
 SHA512 
ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541

diff --git a/sys-apps/memtest86+/files/39_memtest86+ 
b/sys-apps/memtest86+/files/39_memtest86+
deleted file mode 100644
index 9c9067a5e736..
--- 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 <&2
-
-   device="$("${grub_probe}" --target=device "${memtest}")"
-   path="$(make_system_path_relative_to_its_root "${memtest}")"
-   cat <&2
-
-   device="$("${grub_probe}" --target=device "${memtestbsd}")"
-   path="$(make_system_path_relative_to_its_root "${memtestbsd}")"
-   cat

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/

2021-08-13 Thread Lars Wendler 
commit: c08f36620da95e3f707a57b068bcd4ef5cb8e6e6
Author: PPed72  iol  it>
AuthorDate: Thu Nov 19 17:09:50 2020 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Fri Aug 13 13:22:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c08f3662

sys-apps/memtest86+: version bump to 5.31b

Closes: https://bugs.gentoo.org/728766
Signed-off-by: Paolo Pedroni  iol.it>
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/18324
Signed-off-by: Lars Wendler  gentoo.org>

 sys-apps/memtest86+/Manifest   |   1 +
 .../files/memtest86+-5.31b-gcc-473.patch   |  13 +++
 .../files/memtest86+-5.31b-hardcoded_cc.patch  |  16 +++
 .../files/memtest86+-5.31b-no-clean.patch  |  19 
 .../files/memtest86+-5.31b-objcopy.patch   |  21 
 .../memtest86+-5.31b-test-random-cflags.patch  |  17 +++
 sys-apps/memtest86+/memtest86+-5.31b.ebuild| 114 +
 7 files changed, 201 insertions(+)

diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest
index 95326fdd945..48b2ddc7961 100644
--- a/sys-apps/memtest86+/Manifest
+++ b/sys-apps/memtest86+/Manifest
@@ -1 +1,2 @@
 DIST memtest86+-5.01.tar.gz 214877 BLAKE2B 
ef63eaabaf6d3d27b85c73618c692dd61cce52f3670a57958d181623888bdc3aa538855da9a82ec2ab70b180938e3df99f0b06f606b2d6f64e8aabbe781b3050
 SHA512 
d872db35ef733ec8f49094251f2bf6b98cc80eb06d04044be3aecf28d534f24ba293a08b9979b112dbd07cf27368148939a33a32c7010fc9581a3a5b150c94d7
+DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 
14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca
 SHA512 
ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541

diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch 
b/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch
new file mode 100644
index 000..76c0761512b
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-gcc-473.patch
@@ -0,0 +1,13 @@
+http://forum.canardpc.com/threads/110950-fix-controller-loop-error
+
+--- a/Makefile
 b/Makefile
+@@ -12,7 +12,7 @@ FDISK=/dev/fd0
+ AS=as -32
+ CC=gcc
+ 
+-CFLAGS= -Wall -Werror -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
++CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
+ 
+ SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g

diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch 
b/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch
new file mode 100644
index 000..4ee174478b7
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-hardcoded_cc.patch
@@ -0,0 +1,16 @@
+--- a/Makefile
 b/Makefile
+@@ -9,11 +9,10 @@
+ #
+ FDISK=/dev/fd0
+ 
+-AS=as -32
+-CC=gcc
+-
+ CFLAGS= -Wall -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
++CPPFLAGS= -m32
++ASFLAGS= -32
+ 
+ SELF_TEST_CFLAGS = -Wall -Werror -march=i486 -m32 -O1 -g
+ 

diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch 
b/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch
new file mode 100644
index 000..dbb560e506b
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-no-clean.patch
@@ -0,0 +1,19 @@
+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
+@@ -22,7 +22,7 @@
+ 
+ SELF_TEST_OBJS = test.o self_test.o cpuid.o random.o
+ 
+-all: clean memtest.bin memtest
++all: memtest.bin memtest
+ 
+ run_self_test : self_test
+   ./self_test && touch run_self_test

diff --git a/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch 
b/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch
new file mode 100644
index 000..9398c4163a4
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.31b-objcopy.patch
@@ -0,0 +1,21 @@
+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 -Werror -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin \
+  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
+@@ -36,7 +37,7 @@
+   $(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 $@

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

2019-11-23 Thread Aaron Bauman 
commit: f023e69d4cc14664dd707619628e840c555847ec
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Nov 22 08:18:38 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Nov 24 00:40:21 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f023e69d

sys-apps/memtest86+: remove unused patch

Signed-off-by: Michael Mair-Keimberger  gmail.com>
Signed-off-by: Aaron Bauman  gentoo.org>

 .../files/memtest86+-4.20-hardcoded_cc.patch   | 30 --
 1 file changed, 30 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch 
b/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch
deleted file mode 100644
index 2eb750c8dd9..000
--- a/sys-apps/memtest86+/files/memtest86+-4.20-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp memtest86+-4.10-orig/Makefile memtest86+-4.10/Makefile
 memtest86+-4.10-orig/Makefile  2010-06-24 00:27:22.864634431 +0200
-+++ memtest86+-4.10/Makefile   2010-06-24 00:28:42.402478590 +0200
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fPIC -fno-stack-protector
-+CFLAGS=-Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fPIC -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 linuxbios.o memsize.o pci.o controller.o random.o spd.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
-   memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--  $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+  $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--  $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin 
-ffreestanding test.c
-+  $(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fno-stack-protector -fno-pie test.c
- 
- clean:
-   rm -f *.o *.s *.iso memtest.bin memtest memtest_shared 
memtest_shared.bin

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

2018-06-26 Thread Mike Gilbert 
commit: 8cac92aeabcd6dfdf6cfd39138a2b382beea0db8
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Wed Jun 13 18:09:26 2018 +
Commit: Mike Gilbert  gentoo  org>
CommitDate: Tue Jun 26 15:04:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cac92ae

sys-apps/memtest86+: remove unused patches

 .../files/memtest86+-1.70-gnu_hash.patch   | 11 
 .../files/memtest86+-2.01-hardcoded_cc.patch   | 30 --
 .../files/memtest86+-4.00-hardcoded_cc.patch   | 30 --
 3 files changed, 71 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch 
b/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
deleted file mode 100644
index 5a9e06dc06d..000
--- a/sys-apps/memtest86+/files/memtest86+-1.70-gnu_hash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naurp memtest86+-1.70-orig/memtest_shared.lds 
memtest86+-1.70/memtest_shared.lds
 memtest86+-1.70-orig/memtest_shared.lds2007-01-27 13:34:16.0 
+0100
-+++ memtest86+-1.70/memtest_shared.lds 2007-01-27 13:41:30.0 +0100
-@@ -18,6 +18,7 @@ SECTIONS {
-   .dynsym : { *(.dynsym) }
-   .dynstr : { *(.dynstr) }
-   .hash   : { *(.hash) }
-+  .gnu.hash   : { *(.gnu.hash) }
-   .dynamic: { *(.dynamic) }
- 
-   .rel.text: { *(.rel.text   .rel.text.*) }

diff --git a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch 
b/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
deleted file mode 100644
index 3b07731daad..000
--- a/sys-apps/memtest86+/files/memtest86+-2.01-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Naurp memtest86+-2.01-orig/Makefile memtest86+-2.01/Makefile
 memtest86+-2.01-orig/Makefile  2008-03-11 21:04:28.0 +0100
-+++ memtest86+-2.01/Makefile   2008-03-11 21:05:25.0 +0100
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin 
-ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -m32 -march=i486 -O1 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-   config.o linuxbios.o memsize.o pci.o controller.o random.o extra.o \
-@@ -47,10 +46,10 @@ memtest.bin: memtest_shared.bin bootsect
-   memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--  $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+  $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--  $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin 
-ffreestanding test.c
-+  $(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fno-stack-protector -fno-pie -nopie test.c
- 
- clean:
-   rm -f *.o *.s *.iso memtest.bin memtest memtest_shared 
memtest_shared.bin

diff --git a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch 
b/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
deleted file mode 100644
index f2950b64e80..000
--- a/sys-apps/memtest86+/files/memtest86+-4.00-hardcoded_cc.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*rej' --exclude '*~' 
memtest86+-4.00.orig/Makefile memtest86+-4.00/Makefile
 memtest86+-4.00.orig/Makefile  2009-09-21 17:35:46.0 -0700
-+++ memtest86+-4.00/Makefile   2009-09-25 09:04:23.0 -0700
-@@ -8,10 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
--
--CFLAGS= -Wall -march=i486 -m32 -O2 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fPIC
-+CPPFLAGS=-m32
-+CFLAGS=-Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fPIC -fno-stack-protector
-+ASFLAGS=-32
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-   config.o linuxbios.o memsize.o pci.o controller.o random.o spd.o \
-@@ -47,10 +46,10 @@
-   memtest_shared.bin -o memtest.bin
- 
- reloc.o: reloc.c
--  $(CC) -c $(CFLAGS) -fno-strict-aliasing reloc.c
-+  $(CC) -c $(CFLAGS) -fno-strict-aliasing -fno-stack-protector reloc.c
- 
- test.o: test.c
--  $(CC) -c -Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin 
-ffreestanding test.c
-+  $(CC) -c -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fno-stack-protector -fno-pie -nopie test.c
- 
- clean:
-   rm -f *.o *.s *.iso memtest.bin memtest memtest_shared 
memtest_shared.bin

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

2018-06-15 Thread Sergei Trofimovich 
commit: ecccf6635134e7f11ef37d366c5e8b840c7b5c00
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Fri Jun 15 07:01:37 2018 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri Jun 15 07:02:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecccf663

sys-apps/memtest86+: tweak patch to be appliable as -p1

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch 
b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
index f140a7fc660..21b51c5b7ff 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-hardcoded_cc.patch
@@ -1,5 +1,5 @@
 Makefile.orig  2015-02-01 01:08:33.0 +0300
-+++ Makefile   2015-02-01 01:10:17.624757244 +0300
+--- a/Makefile.orig2015-02-01 01:08:33.0 +0300
 b/Makefile 2015-02-01 01:10:17.624757244 +0300
 @@ -9,11 +9,10 @@
  #
  FDISK=/dev/fd0

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86/files/, sys-apps/memtest86/

2017-03-20 Thread Mike Frysinger 
commit: b2f095cc8a812ca6b9e57dafc2825b7041c41aec
Author: Mike Frysinger  gentoo  org>
AuthorDate: Mon Mar 20 07:19:42 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Mon Mar 20 07:19:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2f095cc

sys-apps/memtest86: install memtest & memtest.bin #613228

This installs files as upstream names them:
- memtest.bin: bootable image
- memtest: bare metal ELF

 sys-apps/memtest86/files/39_memtest86-r1 | 69 +++
 sys-apps/memtest86/memtest86-4.3.7-r1.ebuild | 71 
 2 files changed, 140 insertions(+)

diff --git a/sys-apps/memtest86/files/39_memtest86-r1 
b/sys-apps/memtest86/files/39_memtest86-r1
new file mode 100644
index 000..596a676cceb
--- /dev/null
+++ b/sys-apps/memtest86/files/39_memtest86-r1
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+. /usr/share/grub/grub-mkconfig_lib
+
+memtest=/boot/memtest86/memtest.bin
+
+memtestelf=/boot/memtest86/memtest
+
+if [ -f "${memtest}" ] && [ -f "${memtestelf}" ]; then
+   multiple_memtest=true
+fi
+
+submenu_indentation=""
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; 
then
+   submenu_indentation="${grub_tab}"
+   cat <&2
+
+   device="$("${grub_probe}" --target=device "${memtest}")"
+   path="$(make_system_path_relative_to_its_root "${memtest}")"
+   cat <&2
+
+   device="$("${grub_probe}" --target=device "${memtestelf}")"
+   path="$(make_system_path_relative_to_its_root "${memtestelf}")"
+   cat  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'."
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/

2017-03-14 Thread Mike Frysinger 
commit: 08eded4644881cf6de9a4acd78f047ed86d27276
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Mar 14 23:52:49 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Mar 14 23:54:28 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08eded46

sys-apps/memtest86+: rename installed files to match upstream #382757

We move back to using:
- memtest.bin: bootable image
- memtest: bare metal ELF

We drop the "memtest.netbsd" file since it was never related to NetBSD.
It was simply an ELF file (renamed from "memtest").  It used that name
simply because we used grub's netbsd boot logic to load it (since it
supports booting ELF files).

 sys-apps/memtest86+/files/39_memtest86+-r1| 69 
 sys-apps/memtest86+/memtest86+-5.01-r3.ebuild | 90 +++
 2 files changed, 159 insertions(+)

diff --git a/sys-apps/memtest86+/files/39_memtest86+-r1 
b/sys-apps/memtest86+/files/39_memtest86+-r1
new file mode 100644
index 000..20422b74d65
--- /dev/null
+++ b/sys-apps/memtest86+/files/39_memtest86+-r1
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+. /usr/share/grub/grub-mkconfig_lib
+
+memtest=/boot/memtest86plus/memtest.bin
+
+memtestelf=/boot/memtest86plus/memtest
+
+if [ -f "${memtest}" ] && [ -f "${memtestelf}" ]; then
+   multiple_memtest=true
+fi
+
+submenu_indentation=""
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; 
then
+   submenu_indentation="${grub_tab}"
+   cat <&2
+
+   device="$("${grub_probe}" --target=device "${memtest}")"
+   path="$(make_system_path_relative_to_its_root "${memtest}")"
+   cat <&2
+
+   device="$("${grub_probe}" --target=device "${memtestelf}")"
+   path="$(make_system_path_relative_to_its_root "${memtestelf}")"
+   cat  title=${PN}"
+   elog "> root (hd?,?)"
+   elog "> kernel ${BOOTDIR}/memtest.bin"
+   elog " - For lilo:"
+   elog "> image  = ${BOOTDIR}/memtest.bin"
+   elog "> label  = ${PN}"
+   elog
+}

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

2017-03-14 Thread Mike Frysinger 
commit: 8fe39c8d9fd69b55db808f93edb8c1cbee496f36
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Mar 14 23:46:48 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Mar 14 23:54:27 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fe39c8d

sysa-apps/memtest86+: rework grub shell style

Drop old portable shell style as we don't care about such insane shells.

 sys-apps/memtest86+/files/39_memtest86+ | 11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/sys-apps/memtest86+/files/39_memtest86+ 
b/sys-apps/memtest86+/files/39_memtest86+
index 10e1964cb8d..9c9067a5e73 100644
--- a/sys-apps/memtest86+/files/39_memtest86+
+++ b/sys-apps/memtest86+/files/39_memtest86+
@@ -11,16 +11,14 @@ if [ -f "${memtest}" ] && [ -f "${memtestbsd}" ]; then
 fi
 
 submenu_indentation=""
-if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; 
then
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; 
then
submenu_indentation="${grub_tab}"
cat <&2
 
device="$("${grub_probe}" --target=device "${memtest}")"
@@ -29,7 +27,7 @@ if [ -f "${memtest}" ]; then
 ${submenu_indentation}menuentry 'Memtest86+' {
 EOF
 
-   if [ "x${submenu_indentation}" != "x" ]; then
+   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
@@ -42,7 +40,6 @@ EOF
 fi
 
 if [ -f "${memtestbsd}" ]; then
-
gettext_printf "Found memtest image: %s\n" "${memtestbsd}" >&2
 
device="$("${grub_probe}" --target=device "${memtestbsd}")"
@@ -51,7 +48,7 @@ if [ -f "${memtestbsd}" ]; then
 ${submenu_indentation}menuentry 'Memtest86+ (netbsd)' {
 EOF
 
-   if [ "x${submenu_indentation}" != "x" ]; then
+   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
@@ -63,7 +60,7 @@ ${submenu_indentation}}
 EOF
 fi
 
-if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; 
then
+if [ "${multiple_memtest}" = "true" ] && [ "${GRUB_DISABLE_SUBMENU}" != "y" ]; 
then
cat <

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

2017-03-14 Thread Mike Frysinger 
commit: 270d1954363def0d88b42054d5991c9fde0a8071
Author: Mike Frysinger  gentoo  org>
AuthorDate: Tue Mar 14 23:35:50 2017 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Tue Mar 14 23:36:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270d1954

sys-apps/memtest86+: make sure we keep -fno-PIC on test.o/random.o objects 
#538596

 sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
index 8a76d046414..dcdccb8c6e9 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-test-random-cflags.patch
@@ -11,11 +11,11 @@ https://bugs.gentoo.org/590974
  
  test.o: test.c
 -  $(CC) -c -Wall -march=i486 -m32 -O0 -fomit-frame-pointer -fno-builtin 
-ffreestanding test.c
-+test.o: CFLAGS += -O0
++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
++random.o: CFLAGS += -O3 -fno-PIC

  # rule for build number generation  
  build_number:

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86/files/

2017-02-04 Thread David Seifert 
commit: de59178c073786477ba88719c2247a9ff3e52b18
Author: Michael Mair-Keimberger (asterix)  gmail 
 com>
AuthorDate: Fri Feb  3 15:12:25 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  4 21:19:49 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de59178c

sys-apps/memtest86: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/3791

 sys-apps/memtest86/files/memtest86-4.0-build.patch | 41 -
 .../memtest86/files/memtest86-4.3.3-build.patch| 43 --
 2 files changed, 84 deletions(-)

diff --git a/sys-apps/memtest86/files/memtest86-4.0-build.patch 
b/sys-apps/memtest86/files/memtest86-4.0-build.patch
deleted file mode 100644
index 7dfd6c2..
--- a/sys-apps/memtest86/files/memtest86-4.0-build.patch
+++ /dev/null
@@ -1,41 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -8,11 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
-+ASFLAGS=-32
- 
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
--  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fPIC -fno-stack-protector $(SMP_FL)
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-   config.o linuxbios.o memsize.o error.o smp.o cpuid.o vmem.o random.o
-@@ -23,7 +21,7 @@
- # symbols and then link it dynamically so I have full
- # relocation information
- memtest_shared: $(OBJS) memtest_shared.lds Makefile
--  $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
-+  $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds 
-m elf_i386 \
-   -o $@ $(OBJS) && \
-   $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
- 
-@@ -50,7 +48,7 @@
-   $(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
-+  $(CC) -c $(CFLAGS:-fPIC=) -o $@ $<
- 
- random.o: random.c
-   $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin 
-ffreestanding random.c
-@@ -72,3 +70,6 @@
- dos: all
-   cat mt86+_loader memtest.bin > memtest.exe
- 
-+head.o: head.s
-+bootsect.o: bootsect.s
-+setup.o: setup.s

diff --git a/sys-apps/memtest86/files/memtest86-4.3.3-build.patch 
b/sys-apps/memtest86/files/memtest86-4.3.3-build.patch
deleted file mode 100644
index 2c5906a..
--- a/sys-apps/memtest86/files/memtest86-4.3.3-build.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -uNr src.orig/Makefile src/Makefile
 src.orig/Makefile  2013-10-10 19:35:27.354179645 +0100
-+++ src/Makefile   2013-10-10 19:38:07.344184547 +0100
-@@ -8,11 +8,9 @@
- #
- FDISK=/dev/fd0
- 
--AS=as -32
--CC=gcc
-+ASFLAGS=-32
- 
--CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin \
--  -ffreestanding -fPIC $(SMP_FL) -fno-stack-protector
-+CFLAGS= -Wall -march=i486 -m32 -O1 -fomit-frame-pointer -fno-builtin 
-ffreestanding -fPIC -fno-stack-protector $(SMP_FL)
- 
- OBJS= head.o reloc.o main.o test.o init.o lib.o patn.o screen_buffer.o \
-   config.o memsize.o error.o smp.o cpuid.o vmem.o random.o
-@@ -23,7 +21,7 @@
- # symbols and then link it dynamically so I have full
- # relocation information
- memtest_shared: $(OBJS) memtest_shared.lds Makefile
--  $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds \
-+  $(LD) --warn-constructors --warn-common -static -T memtest_shared.lds 
-m elf_i386 \
-   -o $@ $(OBJS) && \
-   $(LD) -shared -Bsymbolic -T memtest_shared.lds -o $@ $(OBJS)
- 
-@@ -50,7 +48,7 @@
-   $(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
-+  $(CC) -c $(CFLAGS:-fPIC=) -o $@ $<
- 
- random.o: random.c
-   $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin 
-ffreestanding random.c
-@@ -72,3 +70,7 @@
- dos: all
-   cat mt86+_loader memtest.bin > memtest.exe
- 
-+head.o: head.s
-+bootsect.o: bootsect.s
-+setup.o: setup.s
-+

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/

2016-11-25 Thread Mike Frysinger 
commit: 3a9c391e65d1ddf5f92632c43379e722391e2db3
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sat Nov 26 00:31:47 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sat Nov 26 00:32:00 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a9c391e

sys-apps/memtest86+: add links to patches sent upstream

 sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch  | 12 ++--
 .../memtest86+/files/memtest86+-5.01-io-extern-inline.patch  |  2 ++
 sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch |  2 ++
 sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch |  3 +++
 sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch   |  2 ++
 sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch   |  2 ++
 6 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch 
b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch
index b793c32..af011d6 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-gcc-473.patch
@@ -1,6 +1,7 @@
-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.0 -0400
-+++ memtest86+-5.01/controller.c   2014-06-22 11:01:17.347923472 -0400
+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 */
@@ -19,9 +20,8 @@ diff -Narup memtest86+-5.01-orig/controller.c 
memtest86+-5.01/controller.c
pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, );
pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, );
vid &= 0x;
-diff -Narup memtest86+-5.01-orig/Makefile memtest86+-5.01/Makefile
 memtest86+-5.01-orig/Makefile  2013-08-09 22:01:58.0 -0400
-+++ memtest86+-5.01/Makefile   2014-06-22 10:59:27.463573842 -0400
+--- memtest86+-5.01/Makefile
 memtest86+-5.01/Makefile
 @@ -12,7 +12,7 @@ FDISK=/dev/fd0
  AS=as -32
  CC=gcc

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
index 8dc13b1..682dd5d 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-io-extern-inline.patch
@@ -1,3 +1,5 @@
+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.
 

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
index bbb2228..ce7f906 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch
@@ -1,3 +1,5 @@
+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

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch 
b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
index 876edcf..e9cbf10 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
@@ -1,3 +1,6 @@
+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

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch 
b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch
index 8303ccf..8d830e2 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-scp.patch
@@ -1,3 +1,5 @@
+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

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch 
b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch
index a121fde..f4b42fe 100644
--- a/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-reboot-def.patch
@@ -1,3 +1,5 @@
+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

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/

2016-11-25 Thread Mike Frysinger 
commit: 580f0a573f324bac4862ebd2030234b27e9a1d59
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sat Nov 26 00:09:15 2016 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sat Nov 26 00:09:28 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580f0a57

sys-apps/memtest86+: fix build w/out 32-bit glibc #592638

 .../files/memtest86+-5.01-no-C-headers.patch   | 47 ++
 sys-apps/memtest86+/memtest86+-5.01-r2.ebuild  |  1 +
 2 files changed, 48 insertions(+)

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
new file mode 100644
index ..bbb2228
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-C-headers.patch
@@ -0,0 +1,47 @@
+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 
++#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 
++
++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 intmstr_cpu;

diff --git a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild 
b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
index 7d3372c..831cf32 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r2.ebuild
@@ -30,6 +30,7 @@ src_prepare() {
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
 
if use serial ; then
sed -i \

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/

2016-07-09 Thread NP Hardass 
commit: 0eb2ba9f9d96fad560ae3bbfcaed940c43d7fb4f
Author: NP-Hardass  gentoo  org>
AuthorDate: Sat May 14 22:40:28 2016 +
Commit: NP Hardass  gentoo  org>
CommitDate: Sun Jul 10 02:48:23 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0eb2ba9f

sys-apps/memtest86+: Update 39_memtest86+ to support grub submenus

Package-Manager: portage-2.2.28

 sys-apps/memtest86+/files/39_memtest86+| 59 ++
 ...6+-4.20-r2.ebuild => memtest86+-4.20-r3.ebuild} |  2 +-
 ...6+-5.01-r1.ebuild => memtest86+-5.01-r2.ebuild} |  2 +-
 3 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/sys-apps/memtest86+/files/39_memtest86+ 
b/sys-apps/memtest86+/files/39_memtest86+
index 14f27a2..10e1964 100644
--- a/sys-apps/memtest86+/files/39_memtest86+
+++ b/sys-apps/memtest86+/files/39_memtest86+
@@ -4,30 +4,67 @@
 
 memtest=/boot/memtest86plus/memtest
 
+memtestbsd=/boot/memtest86plus/memtest.netbsd
+
+if [ -f "${memtest}" ] && [ -f "${memtestbsd}" ]; then
+   multiple_memtest=true
+fi
+
+submenu_indentation=""
+if [ "x${multiple_memtest}" = xtrue ] && [ "x${GRUB_DISABLE_SUBMENU}" != xy ]; 
then
+   submenu_indentation="${grub_tab}"
+   cat <&2
+
device="$("${grub_probe}" --target=device "${memtest}")"
path="$(make_system_path_relative_to_its_root "${memtest}")"
cat <&2
+
+   device="$("${grub_probe}" --target=device "${memtestbsd}")"
+   path="$(make_system_path_relative_to_its_root "${memtestbsd}")"
cat <

[gentoo-commits] repo/gentoo:master commit in: sys-apps/memtest86+/files/, sys-apps/memtest86+/

2015-12-12 Thread Mike Frysinger 
commit: eeb88b23cd80c5926eb8d31a06a5661709f09df1
Author: Mike Frysinger  gentoo  org>
AuthorDate: Sat Dec 12 23:32:15 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Sat Dec 12 23:32:15 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eeb88b23

sys-apps/memtest+: fix parallel build errors #557890

 sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch | 16 
 sys-apps/memtest86+/memtest86+-5.01-r1.ebuild|  1 +
 2 files changed, 17 insertions(+)

diff --git a/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch 
b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
new file mode 100644
index 000..876edcf
--- /dev/null
+++ b/sys-apps/memtest86+/files/memtest86+-5.01-no-clean.patch
@@ -0,0 +1,16 @@
+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+/memtest86+-5.01-r1.ebuild 
b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild
index f18f5b0..6186228 100644
--- a/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild
+++ b/sys-apps/memtest86+/memtest86+-5.01-r1.ebuild
@@ -29,6 +29,7 @@ src_prepare() {
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
 
if use serial ; then
sed -i \