From 78f392693b4d21958c3f9e73171c7c65cb437bb5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Aug 2023 06:14:44 +0100 Subject: gentoo auto-resync : 15:08:2023 - 06:14:43 --- sys-apps/memtest86/Manifest | 4 +- sys-apps/memtest86/files/39_memtest86-r1 | 2 +- sys-apps/memtest86/memtest86-4.3.7-r2.ebuild | 75 ---------------------------- sys-apps/memtest86/memtest86-4.3.7-r3.ebuild | 75 ++++++++++++++++++++++++++++ 4 files changed, 78 insertions(+), 78 deletions(-) delete mode 100644 sys-apps/memtest86/memtest86-4.3.7-r2.ebuild create mode 100644 sys-apps/memtest86/memtest86-4.3.7-r3.ebuild (limited to 'sys-apps/memtest86') diff --git a/sys-apps/memtest86/Manifest b/sys-apps/memtest86/Manifest index 9b83c710ddee..32e18356926c 100644 --- a/sys-apps/memtest86/Manifest +++ b/sys-apps/memtest86/Manifest @@ -1,8 +1,8 @@ -AUX 39_memtest86-r1 1691 BLAKE2B cb39628a3e8010573d79a4dc202a17a254abec6ed997441776e125a7e34070bb01fe468cbe28529da4ddf6c57b8baca5d88297f132ae4514e46392372e011120 SHA512 71a5bf7c7f85723386b0d6acdf0e4e9f51d845d676f0d15997bab397b1c7939fda9573a25823de15384682d9200026c48fbf968f5ffd2479cdf41838f4c9655f +AUX 39_memtest86-r1 1692 BLAKE2B 8313d06cf43fb70deaec75fb0d875903fbd1ca0fe4b564db156a555ae5c5ee22b5e310201040e0f701d953961b496d763a4f33dcd93d09a6a74b16ccacec7d69 SHA512 5a43be9c5def7dc4cdb704281c13843a4a8c9b070f5018f95955e007485987d45da0c20015981d3e44fae2279cdc0d4cc819a7121e7028df4c29af249194e070 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-r2.ebuild 1864 BLAKE2B 50cf23c800735946659b0fdf77c104a06feeaf8a0fb68a6b01795c80af081bb390820a299046154d1215a743792619e0136f8fd1a617209051ed2240fd2f1681 SHA512 91bd68a6ceade49b7bc55a65eb362b1182a39f91cd6ae7888aed0bbcffc20ee065d135e112722b0233f7b6f02e574ff46b86ee83dc368bce1c27a909c756054b +EBUILD memtest86-4.3.7-r3.ebuild 1864 BLAKE2B 50cf23c800735946659b0fdf77c104a06feeaf8a0fb68a6b01795c80af081bb390820a299046154d1215a743792619e0136f8fd1a617209051ed2240fd2f1681 SHA512 91bd68a6ceade49b7bc55a65eb362b1182a39f91cd6ae7888aed0bbcffc20ee065d135e112722b0233f7b6f02e574ff46b86ee83dc368bce1c27a909c756054b MISC metadata.xml 331 BLAKE2B b0a4c3f621f5aef821b2e318dc59461bc4659218a7a9c61fde44592e5a1c45b55d94fd6401ee08e51a31e90f4a1ed97d8ca51a200bb4b4680c9145563b87e516 SHA512 3c1fec8616b98333afc0b9e66f98a1995962ef5b4fb982b151d8763b29aa31be92a4ee44b9aff047defcfc61a5967a89350d1943139746d8af603d58896a8303 diff --git a/sys-apps/memtest86/files/39_memtest86-r1 b/sys-apps/memtest86/files/39_memtest86-r1 index 596a676cceb2..dc630d594626 100644 --- a/sys-apps/memtest86/files/39_memtest86-r1 +++ b/sys-apps/memtest86/files/39_memtest86-r1 @@ -27,7 +27,7 @@ if [ -f "${memtest}" ]; then ${submenu_indentation}menuentry 'Memtest86' { 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 diff --git a/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild b/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild deleted file mode 100644 index 70ce741c82d1..000000000000 --- a/sys-apps/memtest86/memtest86-4.3.7-r2.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit mount-boot 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-r3.ebuild b/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild new file mode 100644 index 000000000000..70ce741c82d1 --- /dev/null +++ b/sys-apps/memtest86/memtest86-4.3.7-r3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +inherit mount-boot 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'." +} -- cgit v1.2.3