diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-apps/memtest86 | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-apps/memtest86')
-rw-r--r-- | sys-apps/memtest86/Manifest | 3 | ||||
-rw-r--r-- | sys-apps/memtest86/files/39_memtest86 | 18 | ||||
-rw-r--r-- | sys-apps/memtest86/files/memtest86-3.2-solar.patch | 27 | ||||
-rw-r--r-- | sys-apps/memtest86/files/memtest86-3.3-funky-test.patch | 15 | ||||
-rw-r--r-- | sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch | 12 | ||||
-rw-r--r-- | sys-apps/memtest86/files/memtest86-4.0-build.patch | 41 | ||||
-rw-r--r-- | sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch | 47 | ||||
-rw-r--r-- | sys-apps/memtest86/files/memtest86-4.3.3-build.patch | 43 | ||||
-rw-r--r-- | sys-apps/memtest86/memtest86-3.3.ebuild | 55 | ||||
-rw-r--r-- | sys-apps/memtest86/memtest86-4.3.6.ebuild | 65 | ||||
-rw-r--r-- | sys-apps/memtest86/memtest86-4.3.7.ebuild | 65 | ||||
-rw-r--r-- | sys-apps/memtest86/metadata.xml | 8 |
12 files changed, 399 insertions, 0 deletions
diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest new file mode 100644 index 000000000000..d00c7355f805 --- /dev/null +++ b/sys-apps/memtest86/Manifest @@ -0,0 +1,3 @@ +DIST memtest86-3.3.tar.gz 137922 SHA256 f4580d15636b18885709c8aca06759a512911b2efa76d28de2389165dfb9548c +DIST memtest86-4.3.6-src.tar.gz 125475 SHA256 bbe2e2d13cd9f8a39232bd4f0fa70e01e1614515aeae7fac08755628a8d77361 SHA512 42f4478deca9550692ca36d704037b7eb85ca979a6d0f3f0ee3ed88cdfc7b10652340fc986135c3bf4403b6b6f5355f838a3cb1030758f68b2327bb1ff7030f0 WHIRLPOOL 166415dd84b8cc23958255058277d8a0ed67e351e506dfad6a119d207d436b72d7deff20db116b89bf2c82400e9a22b77554f20344cd1a838b5933671f95a53d +DIST memtest86-4.3.7-src.tar.gz 125583 SHA256 784bf81107a8f8dbf06eadf5d8cc9f57a3249cade67c0635fea8b0e8691a96e7 SHA512 f1cee9085e157b399869222310c65e8094c028565d2b21fe40fd485505b988d20cff49b2c56559181ac114c39089b60c6eacb9aa5d7652df78b3f8e7530cb644 WHIRLPOOL 55283adb62b47f95e689e61e3bebdb65c51712b2d54e4cae0b012ffc4bb11f68309ad2a6ed31c911586e4e5ea5261d117fa827265935ce6e4f7341c58e5dc833 diff --git a/sys-apps/memtest86/files/39_memtest86 b/sys-apps/memtest86/files/39_memtest86 new file mode 100644 index 000000000000..a736bce6a316 --- /dev/null +++ b/sys-apps/memtest86/files/39_memtest86 @@ -0,0 +1,18 @@ +#!/bin/sh + +. /usr/share/grub/grub-mkconfig_lib + +memtest=/boot/memtest86/memtest + +if [ -f "${memtest}" ]; then + device="$("${grub_probe}" --target=device "${memtest}")" + path="$(make_system_path_relative_to_its_root "${memtest}")" + cat <<EOF +menuentry "MemTest86" { +EOF + prepare_grub_to_access_device "${device}" | grub_add_tab + cat <<EOF + linux16 "${path}" +} +EOF +fi diff --git a/sys-apps/memtest86/files/memtest86-3.2-solar.patch b/sys-apps/memtest86/files/memtest86-3.2-solar.patch new file mode 100644 index 000000000000..fa7effbeaac4 --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-3.2-solar.patch @@ -0,0 +1,27 @@ +--- Makefile.orig 2004-11-12 07:16:25.000000000 -0500 ++++ Makefile 2005-01-10 21:35:19.000000000 -0500 +@@ -12,7 +12,7 @@ + # + # gcc compiler options, these settings should suffice + # +-CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding ++CCFLAGS=-Wall -march=i486 -m32 -Os -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector + + AS=as -32 + +@@ -21,10 +21,13 @@ + all: memtest.bin memtest + + reloc.o: reloc.c +- $(CC) -c -m32 -fPIC -Wall -O -fno-strict-aliasing reloc.c ++ $(CC) -c -m32 -fPIC -Wall -O -fno-strict-aliasing reloc.c -fno-stack-protector ++ ++random.o: ++ $(CC) -c $(CCFLAGS) -fPIC random.c + + test.o: test.c test.h defs.h config.h +- $(CC) -c $(CCFLAGS) test.c ++ $(CC) -c $(CCFLAGS) -fno-PIC test.c + + main.o: main.c test.h defs.h + $(CC) -c $(CCFLAGS) -fPIC main.c diff --git a/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch b/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch new file mode 100644 index 000000000000..68fd355b2e08 --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-3.3-funky-test.patch @@ -0,0 +1,15 @@ +i can only guess at what this test was trying to accomplish ... + +ive submitted this upstream + +--- main.c ++++ main.c +@@ -465,7 +465,7 @@ + } + compute_segments(window); + window = 0; +- for (v->pass_ticks=0, i=0; i<DEFTESTS != NULL; i++) { ++ for (v->pass_ticks=0, i=0; i<DEFTESTS; i++) { + + /* Test to see if this test is selected for execution */ + if (v->testsel >= 0) { diff --git a/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch b/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch new file mode 100644 index 000000000000..397b2c8bbee7 --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-3.3-gnu-hash.patch @@ -0,0 +1,12 @@ +sent upstream already ... + +--- memtest_shared.lds ++++ memtest_shared.lds +@@ -19,6 +19,7 @@ + .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-4.0-build.patch b/sys-apps/memtest86/files/memtest86-4.0-build.patch new file mode 100644 index 000000000000..7dfd6c2f6aae --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-4.0-build.patch @@ -0,0 +1,41 @@ +--- 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-nopie.patch b/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch new file mode 100644 index 000000000000..adbbe6f86dc7 --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-4.3.3-build-nopie.patch @@ -0,0 +1,47 @@ +diff -Naur src.orig/Makefile src/Makefile +--- src.orig/Makefile 2013-10-10 16:52:14.292140058 -0400 ++++ src/Makefile 2013-10-10 16:51:37.431138380 -0400 +@@ -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 -fno-pie $(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,10 +48,10 @@ + $(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
++ $(CC) -c -Wall -march=i486 -m32 -O3 -fomit-frame-pointer -fno-builtin -ffreestanding -fno-stack-protector -fno-pie random.c
+
+ clean:
+ rm -f *.o *.s *.iso memtest.bin memtest memtest_shared \
+@@ -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
++
diff --git a/sys-apps/memtest86/files/memtest86-4.3.3-build.patch b/sys-apps/memtest86/files/memtest86-4.3.3-build.patch new file mode 100644 index 000000000000..2c5906ad5cad --- /dev/null +++ b/sys-apps/memtest86/files/memtest86-4.3.3-build.patch @@ -0,0 +1,43 @@ +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
++
diff --git a/sys-apps/memtest86/memtest86-3.3.ebuild b/sys-apps/memtest86/memtest86-3.3.ebuild new file mode 100644 index 000000000000..c908800ffc89 --- /dev/null +++ b/sys-apps/memtest86/memtest86-3.3.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +inherit mount-boot eutils + +DESCRIPTION="A stand alone memory test for x86 computers" +HOMEPAGE="http://www.memtest86.com/" +SRC_URI="http://www.memtest86.com/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* amd64 x86" +IUSE="serial" +RESTRICT="test" + +DEPEND="" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/${PN}-3.2-solar.patch #66630 + epatch "${FILESDIR}"/${P}-funky-test.patch + epatch "${FILESDIR}"/${P}-gnu-hash.patch + + if use serial ; then + sed -i \ + -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ + config.h \ + || die "sed failed" + fi +} + +src_install() { + insinto /boot/memtest86 + doins memtest.bin || die "doins failed" + dodoc README README.build-process +} + +pkg_postinst() { + mount-boot_pkg_postinst + einfo + einfo "memtest.bin has been installed in /boot/memtest86/" + einfo "You may wish to update your bootloader configs" + einfo "by adding these lines:" + einfo " - For grub: (replace '?' with correct numbers for your boot partition)" + einfo " > root (hd?,?)" + einfo " > title=Memtest86" + einfo " > kernel /boot/memtest86/memtest.bin" + einfo " - For lilo:" + einfo " > image = /boot/memtest86/memtest.bin" + einfo " > label = Memtest86" + einfo +} diff --git a/sys-apps/memtest86/memtest86-4.3.6.ebuild b/sys-apps/memtest86/memtest86-4.3.6.ebuild new file mode 100644 index 000000000000..7a543827d99a --- /dev/null +++ b/sys-apps/memtest86/memtest86-4.3.6.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit mount-boot eutils toolchain-funcs + +DESCRIPTION="A stand alone memory test for x86 computers" +HOMEPAGE="http://www.memtest86.com/" +SRC_URI="http://www.memtest86.com/downloads/${P}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="serial" +S="${WORKDIR}/src" + +BOOTDIR=/boot/memtest86 + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.3.3-build-nopie.patch #66630 + #206726 + + sed -i -e 's,0x10000,0x100000,' memtest.lds || die + + if use serial ; then + sed -i \ + -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ + config.h \ + || die "sed failed" + fi + + tc-export AS CC LD +} + +src_test() { :; } + +src_install() { + insinto ${BOOTDIR} + newins memtest.bin memtest + dosym memtest ${BOOTDIR}/memtest.bin + + exeinto /etc/grub.d + doexe "${FILESDIR}"/39_memtest86 + + dodoc README README.build-process README.background +} + +pkg_postinst() { + mount-boot_pkg_postinst + elog + elog "memtest has been installed in ${BOOTDIR}/" + elog "You may wish to update your bootloader configs" + elog "by adding these lines:" + elog " - For grub2 just run grub-mkconfig, a configuration file is installed" + elog " as /etc/grub/39_${PN}" + elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" + elog " > title=${PN}" + elog " > root (hd?,?)" + elog " > kernel ${BOOTDIR}/memtest" + elog " - For lilo:" + elog " > image = ${BOOTDIR}/memtest" + elog " > label = ${PN}" + elog +} diff --git a/sys-apps/memtest86/memtest86-4.3.7.ebuild b/sys-apps/memtest86/memtest86-4.3.7.ebuild new file mode 100644 index 000000000000..7a543827d99a --- /dev/null +++ b/sys-apps/memtest86/memtest86-4.3.7.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit mount-boot eutils toolchain-funcs + +DESCRIPTION="A stand alone memory test for x86 computers" +HOMEPAGE="http://www.memtest86.com/" +SRC_URI="http://www.memtest86.com/downloads/${P}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64 ~x86" +IUSE="serial" +S="${WORKDIR}/src" + +BOOTDIR=/boot/memtest86 + +src_prepare() { + epatch "${FILESDIR}"/${PN}-4.3.3-build-nopie.patch #66630 + #206726 + + sed -i -e 's,0x10000,0x100000,' memtest.lds || die + + if use serial ; then + sed -i \ + -e '/^#define SERIAL_CONSOLE_DEFAULT/s:0:1:' \ + config.h \ + || die "sed failed" + fi + + tc-export AS CC LD +} + +src_test() { :; } + +src_install() { + insinto ${BOOTDIR} + newins memtest.bin memtest + dosym memtest ${BOOTDIR}/memtest.bin + + exeinto /etc/grub.d + doexe "${FILESDIR}"/39_memtest86 + + dodoc README README.build-process README.background +} + +pkg_postinst() { + mount-boot_pkg_postinst + elog + elog "memtest has been installed in ${BOOTDIR}/" + elog "You may wish to update your bootloader configs" + elog "by adding these lines:" + elog " - For grub2 just run grub-mkconfig, a configuration file is installed" + elog " as /etc/grub/39_${PN}" + elog " - For grub legacy: (replace '?' with correct numbers for your boot partition)" + elog " > title=${PN}" + elog " > root (hd?,?)" + elog " > kernel ${BOOTDIR}/memtest" + elog " - For lilo:" + elog " > image = ${BOOTDIR}/memtest" + elog " > label = ${PN}" + elog +} diff --git a/sys-apps/memtest86/metadata.xml b/sys-apps/memtest86/metadata.xml new file mode 100644 index 000000000000..6865707310d8 --- /dev/null +++ b/sys-apps/memtest86/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>base-system</herd> +<use> + <flag name='serial'>Compile with serial console support</flag> +</use> +</pkgmetadata> |