From b24bd25253fe093f722ab576d29fdc41d04cb1ee Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 2 Aug 2019 19:14:55 +0100 Subject: gentoo resync : 02.08.2019 --- sys-apps/memtest86/Manifest | 4 +- sys-apps/memtest86/files/39_memtest86 | 18 ------- sys-apps/memtest86/memtest86-4.3.7-r1.ebuild | 71 -------------------------- sys-apps/memtest86/memtest86-4.3.7-r2.ebuild | 75 ++++++++++++++++++++++++++++ sys-apps/memtest86/memtest86-4.3.7.ebuild | 67 ------------------------- 5 files changed, 76 insertions(+), 159 deletions(-) delete mode 100644 sys-apps/memtest86/files/39_memtest86 delete mode 100644 sys-apps/memtest86/memtest86-4.3.7-r1.ebuild create mode 100644 sys-apps/memtest86/memtest86-4.3.7-r2.ebuild delete mode 100644 sys-apps/memtest86/memtest86-4.3.7.ebuild (limited to 'sys-apps/memtest86') diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest index 787a3fb9bc5e..abb52efd7694 100644 --- a/sys-apps/memtest86/Manifest +++ b/sys-apps/memtest86/Manifest @@ -1,10 +1,8 @@ -AUX 39_memtest86 366 BLAKE2B 6d40a02f00f963eca9c15368fa8e86d2458ed94a6faf3782d0a9e27c08bca854ddc37871fc052cd3dfbfefb7cba7e968912d50c4bf60a62ad41ebb7d67c17aa5 SHA512 2d672fa0836f31323b8eac5cf3b6300ce7601e635de395789b0bc11e6320af73888352ca577e2919086abf99f2eac1125742c3202b1a473cc808a0469f026493 AUX 39_memtest86-r1 1691 BLAKE2B cb39628a3e8010573d79a4dc202a17a254abec6ed997441776e125a7e34070bb01fe468cbe28529da4ddf6c57b8baca5d88297f132ae4514e46392372e011120 SHA512 71a5bf7c7f85723386b0d6acdf0e4e9f51d845d676f0d15997bab397b1c7939fda9573a25823de15384682d9200026c48fbf968f5ffd2479cdf41838f4c9655f AUX memtest86-4.3.3-build-nopie.patch 1727 BLAKE2B e49e3014b9f3eb1295bcc49d6bd1642bc6517ae73b8bd73e71ba2cd3effec7b43348c543e5ccd2b92aa37a410a24d97a490c8110fe9b4cd1015cb0eec9b704d2 SHA512 9aee733b27ce73243f14161606819f9161b9d1dee1bb34718b81ac4cd66238f904a2fc69be8a2a1bf13d3ba180257b130e2a7e708a295ad4300d0e869f76e8c8 AUX memtest86-4.3.7-io-extern-inline.patch 1128 BLAKE2B 9ee86f121772490fa1859568d78c156af44e961ae885ed2483245ee799779fbb3357236ce3ee6dbd712dd629ae3892096fb2405d229c99ee35cbc3380fa6beb1 SHA512 9ad8149bafee75aac120420838f20030d9e42fc60579f61114c76a5829e4c5197067e86dccea7c4cf306e62c43a1203028476fa9536e81f32d53c04e536e4f32 AUX memtest86-4.3.7-no-clean.patch 636 BLAKE2B a7488c0f556929607a7d1a94de1f727cc00ac6c673b2b03fbbb5ea45a64accf5028df89ca56f49e9d9e97228a5129b8ed4673b287bff05c59249a5eea48d4ed3 SHA512 7bac031e907a10bf66d260d29ef209362395bce3c1a735abf77bebd9a8662f0ecfc3bd2ed33abbfaeebae77da4868b5c53f0814e82a0ac930b4a01fd25a6e8b1 AUX memtest86-4.3.7-reboot-def.patch 253 BLAKE2B 8213b6deb590a23316fe560493ebb96b53944f368b5f7040d6988296d3bba432b4f070a44e034cf4b9e03dc502cfd9ae8129a4452c70e3f6a06874e6f09665a6 SHA512 0587d2b4de397813f5a2a95859c7a656b0c760653dd711ffe8bd0d0602a64c4ed340c494fbfe2de6825f89aa21021df6a92c4a9e030b72aedf70f83b483a1160 DIST memtest86-4.3.7-src.tar.gz 125583 BLAKE2B ef74b599f5a0b3a550854c7aba12afcddd9e8115418d60e50aee2b1d83b5a838a7d747039cbdd542e1cc136dd5426e8e803f305147121d38edac1a3de814918f SHA512 f1cee9085e157b399869222310c65e8094c028565d2b21fe40fd485505b988d20cff49b2c56559181ac114c39089b60c6eacb9aa5d7652df78b3f8e7530cb644 -EBUILD memtest86-4.3.7-r1.ebuild 1882 BLAKE2B 2925acd74ab48cdd715407493f32202c0d53de3982b652bae03f2b4762e172e785cac15419e836faa2266ed90da4a92ae721fbf0b929ec9c66ec76e95e08d57a SHA512 924a1b5739d4c805277e962ea81aa2c3ea3a25dee55fad283df5858def098ab60e8e0f1de8d07d5dbf89fb8bb1724d4957d5d4e951626e66149678437c983cad -EBUILD memtest86-4.3.7.ebuild 1720 BLAKE2B edc6bef2450f491abea4fb5e1a125df95d9458350ee21221621afb0ecc51897a91a67e9d14d2235a612bb05bbc78572ce063fb111e667b6bb20ca919a641a2d9 SHA512 20ee22412ec27ed6c4104bde2365fa2cd62d0c9f4bf0286c771f19022c54a5c59aad4bc1d898b78a366f2bb6c3d2e8f31089a2ec665aa75778a25f0a47e7ac4c +EBUILD memtest86-4.3.7-r2.ebuild 1871 BLAKE2B 99eec4d7eb37698d37ec8cef376875f6f14f09206885f76467eda2da285b51ec65fcb31fb6526153c6b717c1a9cc77bd246e46af5d95c13f08e893d2471b6a86 SHA512 16fbaeeacd1d0678106f65e60473ce798ab463490de9a5419b25995825a8baaf712cdd074d878c45d536f4fc086a9f59a916ea6e6a02e2d87eed9e0786f5ff87 MISC metadata.xml 330 BLAKE2B 6f4b07ab61c2988a16203242719afc8653fa5bc4dbe7a0a0e83c1c8ed51eb743228fcc03213cca774d30a746b3947c88c10e141229b6cfb01b63d4f280f37498 SHA512 09543a0051e47f888e650455b2774012b9b4284a0ae01a4605f673b4548bc3f8bd1af0309c7de5887c5a2bafc6dde828d580c2a8e7c1ac74b93d70c6b6180d6b diff --git a/sys-apps/memtest86/files/39_memtest86 b/sys-apps/memtest86/files/39_memtest86 deleted file mode 100644 index a736bce6a316..000000000000 --- a/sys-apps/memtest86/files/39_memtest86 +++ /dev/null @@ -1,18 +0,0 @@ -#!/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 < 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'." -} diff --git a/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild b/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild new file mode 100644 index 000000000000..bf0d326968cd --- /dev/null +++ b/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit mount-boot eutils toolchain-funcs + +DESCRIPTION="A stand alone memory test for x86 computers" +HOMEPAGE="https://www.memtest86.com/" +SRC_URI="https://www.memtest86.com/downloads/${P}-src.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="-* amd64 x86" +IUSE="serial" + +PATCHES=( + "${FILESDIR}"/${PN}-4.3.3-build-nopie.patch #66630 + #206726 + "${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 +) + +S="${WORKDIR}/src" + +BOOTDIR="/boot/memtest86" +QA_PRESTRIPPED="${BOOTDIR}/memtest" +QA_FLAGS_IGNORED="${BOOTDIR}/memtest" + +src_prepare() { + default + + 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 +} + +src_configure() { + tc-export AS CC LD +} + +src_test() { :; } + +src_install() { + insinto "${BOOTDIR}" + doins memtest memtest.bin + + exeinto /etc/grub.d + newexe "${FILESDIR}"/39_${PN}-r1 39_${PN} + + dodoc README README.build-process README.background +} + +pkg_postinst() { + mount-boot_pkg_postinst + + elog "${PN} 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'." +} diff --git a/sys-apps/memtest86/memtest86-4.3.7.ebuild b/sys-apps/memtest86/memtest86-4.3.7.ebuild deleted file mode 100644 index bd402545b0c8..000000000000 --- a/sys-apps/memtest86/memtest86-4.3.7.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit mount-boot eutils toolchain-funcs - -DESCRIPTION="A stand alone memory test for x86 computers" -HOMEPAGE="https://www.memtest86.com/" -SRC_URI="https://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 - epatch "${FILESDIR}"/${PN}-4.3.7-io-extern-inline.patch #548312 #568292 - epatch "${FILESDIR}"/${PN}-4.3.7-reboot-def.patch #548312 #568292 - epatch "${FILESDIR}"/${PN}-4.3.7-no-clean.patch #557890 - - 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 -} -- cgit v1.2.3