diff options
| author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
| commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
| tree | 8c816148bcbd22757d892089c989ae614eae4f5a /sys-apps/memtest86+ | |
| parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) | |
gentoo resync : 09.07.2022
Diffstat (limited to 'sys-apps/memtest86+')
| -rw-r--r-- | sys-apps/memtest86+/Manifest | 2 | ||||
| -rw-r--r-- | sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/sys-apps/memtest86+/Manifest b/sys-apps/memtest86+/Manifest index 42b487a852c5..886d5a04555d 100644 --- a/sys-apps/memtest86+/Manifest +++ b/sys-apps/memtest86+/Manifest @@ -12,5 +12,5 @@ AUX memtest86+-5.31b-test-random-cflags.patch 636 BLAKE2B ab14809232dfdb0475fa8d DIST memtest86+-5.31b.tar.gz 227779 BLAKE2B 14aced912bb84115278a3aff7650a3571918b823335aaf7d09880ef10374c320f64878765d93d2ee5a75e2b33ef6c9c4886a9a168955bd77c668f06f5c86a6ca SHA512 ad5891fd0c430ce7a5d0cde2d10dee20b66ad8060d47c3e70e038461d9cde3a78dfc13442b5b09da7c662741945a670353c72dbc08fd5ee8bae82256001a9541 DIST memtest86+-6.00_beta2.tar.gz 214840 BLAKE2B 223c3023ba38d584c9ff1923e859ee37f1d943be657c80d4151d0b9ded79b4b363f3e2f7e51d58c7b2b637133ecada0f9a952fcdbbf03d8c34cb00a64762022c SHA512 78b13cc05f470e40e347f6eddb4441c2b377c47ea9aa0252096ef37c884f452bdfce1292452a36aa3ce0cf59c3eb0e53c0e069863b3f165dcd648d9eae9c76ea EBUILD memtest86+-5.31b-r3.ebuild 2858 BLAKE2B 47a6e5a68e77f6425b7761d5cc18378a13bc6f6b3febb2624277fa3bf24374e69265ab0c97a3854abbfa5acd96f984b2d1392acb29fb3cda37357370d57067c8 SHA512 8c8846addd0db5093b384c36a74eea8e853e66b174c7f9930d9a61abc71c41cdaf5e1967b01eaad77af68a4f81b7687517e0b23e26f26cd11ae104da0c49e881 -EBUILD memtest86+-6.00_beta2.ebuild 1611 BLAKE2B c0de373f6409919e2fcd15c8f2ebe0bdd17692d88016392173b9ab4a80e9f64ebfaaa5ce19bbb431e8f3635d1de838bd114db466653dfeb16a836c8c0ebca4db SHA512 2e07de7fd39f2f66c3cd337ee151e45fbf4f0b32a343290170727980232c75b212e910870f2d614abcea4ba912e4420d526e2ba90e8a3ed13fceb932fcdc37a3 +EBUILD memtest86+-6.00_beta2.ebuild 1730 BLAKE2B f3f7efb95a02123ce0af742f0a8f6a214e2e8d80d2338cdf4d59e16923fe5982ca41e13b3108d35d8bc559862655d8bf58501582813802d35c8899b715119a70 SHA512 f34ff95cba1c9ecc773511d7fb8480a1d9e4f368b49b22c5904fb90f5c095a6bd9369ea766fc72e851cb4d57761680f943d991f5793e9170278b23d0660c04d2 MISC metadata.xml 944 BLAKE2B fd7d12b3e27ea5dfa0ebf56502faf2bf43222f9a070fc718c7e983a03afb2cde239f71d5a45947548435005dc72faeff4d8b850f38a64f57f7def5f098896ac6 SHA512 e64965365707ad5c830fb07f4ed2a2c54dcf7703b5b898d24c87ea7c082312ac30277abb77af643c9a7c021c56578de0d8b9b2f12cb01017b68ddf61885a13d4 diff --git a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild index 2107fd4d4b8f..eb5778e25fdf 100644 --- a/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild +++ b/sys-apps/memtest86+/memtest86+-6.00_beta2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit mount-boot +inherit mount-boot toolchain-funcs MY_PV=${PV/_/-} @@ -29,12 +29,19 @@ BDEPEND=" S=${WORKDIR}/memtest86plus-${MY_PV} src_prepare() { - sed -i -e "s#/sbin/mkdosfs#mkfs.vfat#" build{32,64}/Makefile || die - sed -i -e "s/^AS = as/AS +=/" -e "/^CC/d" build{32,64}/Makefile || die + sed -i \ + -e 's#/sbin/mkdosfs#mkfs.vfat#' \ + -e 's/^AS = as/AS +=/' \ + -e '/^CC/d' \ + -e 's/objcopy/$(OBJCOPY)/' \ + -e 's/shell size/shell $(SIZE)/' \ + build{32,64}/Makefile || die default } src_compile() { + tc-export OBJCOPY + export SIZE=$(tc-getPROG SIZE size) pushd build32 use bios32 && emake memtest.bin use efi32 && emake memtest.efi @@ -44,7 +51,7 @@ src_compile() { pushd build64 use bios64 && emake memtest.bin use efi64 && emake memtest.efi - use iso32 && emake iso + use iso64 && emake iso popd } |