From 05c5709a01f95a094c53caae71e543f336395e96 Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Mon, 4 May 2015 05:01:37 +0000 Subject: Comment out the 'deb-elf64-on-m32' patch due to problems on some systems. See #543978. Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xD25D95E3 --- sys-boot/arcload/ChangeLog | 9 ++- sys-boot/arcload/Manifest | 30 ++++---- sys-boot/arcload/arcload-0.50-r2.ebuild | 129 -------------------------------- sys-boot/arcload/arcload-0.50-r3.ebuild | 129 ++++++++++++++++++++++++++++++++ 4 files changed, 152 insertions(+), 145 deletions(-) delete mode 100644 sys-boot/arcload/arcload-0.50-r2.ebuild create mode 100644 sys-boot/arcload/arcload-0.50-r3.ebuild (limited to 'sys-boot') diff --git a/sys-boot/arcload/ChangeLog b/sys-boot/arcload/ChangeLog index a015aa45044e..8322deedf7c7 100644 --- a/sys-boot/arcload/ChangeLog +++ b/sys-boot/arcload/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-boot/arcload # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/ChangeLog,v 1.18 2015/03/21 18:22:44 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/ChangeLog,v 1.19 2015/05/04 05:01:22 kumba Exp $ + +*arcload-0.50-r3 (04 May 2015) + + 04 May 2015; Joshua Kinard -arcload-0.50-r2.ebuild, + +arcload-0.50-r3.ebuild: + Comment out the 'deb-elf64-on-m32' patch due to problems on some systems. See + #543978. 21 Mar 2015; Joshua Kinard +arcload-0.50-r1.ebuild: Add arcload-0.50-r1 back until Bug #543978 can be resolved. diff --git a/sys-boot/arcload/Manifest b/sys-boot/arcload/Manifest index 5ac47ec993e1..9dd4391fb868 100644 --- a/sys-boot/arcload/Manifest +++ b/sys-boot/arcload/Manifest @@ -5,23 +5,23 @@ AUX arcload.8 2068 SHA256 8aff3d9e0f2f476ada1e9564558ed7a032d98f4687f3f9ed95e99a DIST arcload-0.5.tar.bz2 47690 SHA256 69cc45f7d27b30256875ccda115b6f74dd3bd894033f0f81b6f87ea1d8f7a0ac DIST arcload-0.50-patches-v1.tar.xz 10320 SHA256 161ef360576e3af354022e1a7398ba3af2111f81bb6b6575db5e4c3cd93ce631 SHA512 7687b08bc70a96f8db9a620976b466ff4bb70c8ed77b0c241d060feb8dcab6019d753ac3b182a74139331c9d33f27e090897a0c7c41c1663e16575fef6e21bdf WHIRLPOOL 77b2e51035dcdc9c4f5cd621d2ad44023752e57e6fe7bc1589b365de473c3979eef85aa5391f6e6679993c67036b81895845338c35b1e23406a282b354bb1378 EBUILD arcload-0.50-r1.ebuild 2898 SHA256 1bc23952a06869e2a3495e13e6e6b28f0cefb67ed05d778504d1c29b35ac4dc8 SHA512 0c51d9f54fcdf7e43b74d80e9866cf5de0c91514c9e657ad103d132eb3f2b4b7da7c7a1f6afdf6b90d78e138170ca556d9b792e6aee18330770bec22e240ad22 WHIRLPOOL c7293462ff21f14f58121c143029992cfba43f00b7dee58aac1dfe658ca3e9552e3acb94f784c0a8116058c93ef1852e59aea4a68d6a5e9cb3fc9cd96037f221 -EBUILD arcload-0.50-r2.ebuild 4392 SHA256 97b68685e3d1f6f23bb610e0706241f671e4fa24b2801e406e021aa5788930e5 SHA512 17889a67ebc2d1beefd973a75b51234ddcd7dc8fc6a4c414978c570c17fa3324b6c8fa7fd176ff34d8555f79fed1d5da74946d9ebb1d867b8d8ea6aefc4fb361 WHIRLPOOL 5d408d054e47c3d66c9b0d0494288ecf637b617172a6a3e8b59028e897dd6c4410a5a9463fce9810f4b5a1d6f5930c36e1891181a9ce812fdbd84a69de4cf065 -MISC ChangeLog 3853 SHA256 12516b9d55af4512fe634cecc36b12189b83aec1df36e451e7fdba85e74ea5a7 SHA512 e8fc3f7d02cb2d39cc03bbb573e28f83cd261fbedff49334dfb161f90217e8b1828111927dfaf174dca367f617218a331fde6e6ac2ab417a06278bd0e357b023 WHIRLPOOL 34784ecc11b8f5fb793903cb822b6943f531ee9e150f4b796af660bfea42032de94775da07d1cd977fba36486330234f044611979ab277944675676e2d32dd7e +EBUILD arcload-0.50-r3.ebuild 4408 SHA256 694ee1668b9641f326c13ad0949bca93e24f5234731b105b4689b3c2fed6bb6f SHA512 aab3a1bbc7e92b6a54ea7c6563d287e582d0ae4394e056b081bc40e86549fe60937faa504096e143ecbd47c9fcd7cf3add2c8e9765754c1405103a994053d0f8 WHIRLPOOL 51e530cd873ad749798fa7ed79389380dba9dd01ed0f8af68e0cc0c525e3d50fb1af8e9d1a3a183c9dc667336a6d80c64a92db5c83f60d153b96f55e70de15ee +MISC ChangeLog 4077 SHA256 55db2282abd07bdc29a3576607339da940d251da3b76c7e1957facf6c805c86e SHA512 6eb5f9ccbd76cc34affb807de94784e9cdadb88c61879dc143d944612ab5fedfe83ca5c7645b4ec8216e2b32039cbbfa13885c68cb31bff25e013ae4a510c3cf WHIRLPOOL 49df6f44f23f69961bd465637a4d7c5f1af93011180f7006156c3b562ed561e88dc66bc8896ea1dc60b5861d9218ffa0ae2d7b9c16093c356dda9fd23fba8c3f MISC metadata.xml 278 SHA256 8b9d1872cbd786725fe219abeb254e89529a7a7839bb207d6a005c73ba9ea12d SHA512 026b05e266dcad8e1b470ffe917554de4666504d4149bc6a5e5781fb8f49902c96c57e23cbef5dec387a202c0e6d6ec70a5594490a14c00b08b7d8379d5ee20e WHIRLPOOL 42fbf8cea3569fb772805bf29753e879ce6c8fe9c898eec7aede4a9714f90906fdb4f5f8cea0270a9ccbca83af1def382daed548c2b2d858fce06050a0558be7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVDbb0AAoJENsjoH7SXZXj3bUP/1SD4grWGU5pTZ01drN4yApk -HZ5U1J+T3F7faJFbNCs2M4Aa5tGhthXuKXkquDp8Jrn53sllKHyd6/+2UFtGHFtO -dBiuxE3/1eEK4VHODcpAaH+UbGe2tfCKavABkVBXBySTbO8zsjnBN0FiDUq7z+iN -E6dSkMC17874yQjhfkPg65g5PzEG/P1IzQMAWkbCBH9nV1Eix21fmVILP01Znbsg -Gxk5oS1e6/BaQpnnKrkfDrUVFJ7k7+E2qjXhxuNkN2czD+AtDOM0OmeN88/CJSB3 -eMoBlzISrDBCULUnnhg2EMV+BSFdco2gasg7WHYPjoI5Z9U5xjqIxNzm3M8TfF5h -MgqFWpLHIE9xCF2BUpC0KzUM7tWAGyBC8ZLTt6nxovn3oqseXG/6gkVMaDfIHq1K -IyfVyNH1U5FHrCX6HBe2LTL+X1U+yWDWrC2+ZJfNbF6sXtcKt3w+V5mQa4rzhMVD -STCBoWr0ZWWU/oD6uXGJbR7UVFmA1Y5hG1Q45pmF7OVEjTFZm+cxJ6L/sdN/ahIb -Lf3p4ow2LvpkfPfYjseT34jJ/QceNXzlL1MTh7sxvWTwdjb1mev7Uo91SyoOrboy -UNBame3ChNSJgP+LhezAc+UEOEO8OksFBQE0aM+CMGOEHq6eXIn5Y6AOIG4rEVsI -/HBhLAXR/oErx4ruRaBc -=otBn +iQIcBAEBCAAGBQJVRv0dAAoJENsjoH7SXZXjJ60P/3M+FED42gekL30QtIGvc8ng +ayau8pzOGOAooqAEJ/t2hiVjxnbe8y5Rkgc83e25Z7/tYws7flhPxMxuylfcBDZi +PnYD150g/ngQ394P4oo7nb3Vy4ZDJyGfjZATAzxa3sSN/uFHXuJV6nufexvDhwLf +pV33OX8rqmAjNCtp7dRbmgCHAB3yEQSo+dzOFyrU33I/O038uNqL2by3/Ij3Rcy/ +sRVQOlcrpRifLZrQRL0UmG93PXjS8rJTilR69mNAQ1gQlBB76lN0gTztbWuhmW0U +s52dZrv5ogA9QbE/WvQqLq109e6AUL4yhAdtWPvCnd7kkAvQlhtcEL7iOJD9xTYr +HrZ1tvMAFfzTv9Wr8JP9JmksLP0T7SPxsYdQgGIrvP1ni8PclL4+6gD2iAabmWrY +mYiBOEHtEYzd/DTOD5AgBhyaeGgP3xvpDvhUTmneERXI+Qg67zIX4PMXlCbRcAfH +YRRAkBCzgpF3JDMto+ZJ3sz/jEEqgKwlokrBTPHh7acOvgDQSm6kat0MDAoA63px +FKoRYXiglhbwXYIEXOaqmKucvphztDXriJ1xlL8PJNMKQEPjlwUpat+d/TtO+vZy +uR9bb5WMJ/Q29mKBWS3hyohukCyyIsBwK3RKdeK1x3swqPTC402owE+/byy3Z0re +vf1Bg8eDqfErCfZNNWv5 +=T66I -----END PGP SIGNATURE----- diff --git a/sys-boot/arcload/arcload-0.50-r2.ebuild b/sys-boot/arcload/arcload-0.50-r2.ebuild deleted file mode 100644 index 1e7340a6b34b..000000000000 --- a/sys-boot/arcload/arcload-0.50-r2.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/arcload-0.50-r2.ebuild,v 1.1 2015/03/05 04:45:30 kumba Exp $ - -EAPI=4 - -inherit eutils toolchain-funcs versionator - -# Hack until upstream renames from 0.5 to 0.50 -MY_PV="${PV/50/5}" - -PATCHREV="1" -DESCRIPTION="ARCLoad - SGI Multi-bootloader. Able to bootload many different SGI Systems" -HOMEPAGE="http://www.linux-mips.org/wiki/index.php/ARCLoad" -SRC_URI="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/${PN}-${MY_PV}.tar.bz2 - mirror://gentoo/${P}-patches-v${PATCHREV}.tar.xz" -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="-* ~mips" -IUSE="" -DEPEND="sys-boot/dvhtool - abi_mips_o32? ( sys-devel/kgcc64 )" -RDEPEND="" -RESTRICT="strip" - -S="${WORKDIR}/${PN}-${MY_PV}" -PATCHDIR="${WORKDIR}/${P}-patches" - -src_prepare() { - # For gcc-4.x, quiet down some of the warnings - epatch "${PATCHDIR}"/${P}-shut-gcc4x-up.patch - - # Redefine the targets in the primary Makefile to give us - # finer control over building the tools. This is for properly - # cross-compiling arcload - epatch "${PATCHDIR}"/${P}-makefile-targets.patch - - # Patches borrowed from Debian: - # - Load ELF64 images on 32-bit systems - # - Pass an arcload label name directly on the PROM cmdline. - # - Look for arc.cf in /etc and fallback to /. - epatch "${PATCHDIR}"/${P}_deb-elf64-on-m32.patch - epatch "${PATCHDIR}"/${P}_deb-cmdline-config.patch - epatch "${PATCHDIR}"/${P}_deb-config-in-etc.patch - - # Building arcload on different MIPS ABIs can be difficult, - # so we include specific bits from standard system headers - # to make the compiler happy. These should rarely, if ever, - # change... - epatch "${PATCHDIR}"/${P}-local-elf_h.patch - - # Patch wreckoff.c to handle the new .MIPS.abiflags section. - epatch "${PATCHDIR}"/${P}-wreckoff-abiflags-fix.patch - - # In order to convert from ELF to ECOFF, we need to disable - # SSP, as that adds additional program headers that I don't - # know how to handle in wreckoff.c. - epatch "${PATCHDIR}"/${P}-disable-ssp.patch - - # The code is old and has a lot of issues. But it's just a - # simple bootloader, so silence the various warnings until - # it can be re-written. - epatch "${PATCHDIR}"/${P}-silence-warnings.patch -} - -src_compile() { - local myCC myCC64 myLD myLD64 - - myCC="$(tc-getCC)" - myLD="$(tc-getLD)" - if use abi_mips_o32; then - myCC64=${myCC/mips/mips64} - myLD64=${myLD/mips/mips64} - else - myCC64=${myCC} - myLD64=${myLD} - fi - - # Build the wreckoff tool first. It converts a 32bit MIPS ELF - # into a relocatable ECOFF image. We call for BUILD_CC - # on the offchance that we're cross-compiling. - echo -e "" - einfo ">>> Building the 'wreckoff' utility with $(tc-getBUILD_CC) ..." - emake CC=$(tc-getBUILD_CC) tools_clean tools - - # 32bit copy (sashARCS for IP22/IP32) - echo -e "" - einfo ">>> Building 32-bit version (sashARCS) for IP22/IP32 with ${myCC} ..." - cd "${S}" - emake MODE=M32 bootloader_clean - emake CC=${myCC} LD=${myLD} MODE=M32 bootloader - cp "${S}"/arcload.ecoff "${WORKDIR}"/sashARCS - - # 64bit copy (sash64 for IP27/IP28/IP30) - echo -e "" - einfo ">>> Building 64-bit version (sash64) for IP27/IP28/IP30 ${myCC/mips/mips64} ..." - emake MODE=M64 bootloader_clean - emake CC=${myCC64} LD=${myLD64} MODE=M64 bootloader - cp "${S}"/arcload "${WORKDIR}"/sash64 -} - -src_install() { - dodir /usr/lib/arcload - cp "${WORKDIR}"/sashARCS "${D}"/usr/lib/arcload - cp "${WORKDIR}"/sash64 "${D}"/usr/lib/arcload - cp "${S}"/arc.cf-bootcd "${D}"/usr/lib/arcload/arc-bootcd.cf - cp "${S}"/arc.cf-octane "${D}"/usr/lib/arcload/arc-octane.cf - - # Add a manpage for arcload(8) from the Debian Project. - doman "${FILESDIR}/arcload.8" -} - -pkg_postinst() { - echo -e "" - einfo "ARCLoad binaries copied to: /usr/lib/arcload" - echo -e "" - einfo "Use of ARCLoad is relatively easy:" - einfo "\t1) Determine which version you need" - einfo "\t\tA) sashARCS for IP22/IP32" - einfo "\t\tB) sash64 for IP27/IP28/IP30" - einfo "\t2) Copy that to the volume header using 'dvhtool'" - einfo "\t3) Edit /usr/lib/arcload/arc-*.cf to fit your specific system" - einfo "\t (See ${HOMEPAGE} for" - einfo "\t an explanation of the format of the config file)" - einfo "\t4) Copy the config file to the volume header with 'dvhtool' as 'arc.cf'" - einfo "\t5) Copy any kernels to the volume header that you want to be bootable" - einfo "\t6) Reboot, and enjoy!" - echo -e "" -} diff --git a/sys-boot/arcload/arcload-0.50-r3.ebuild b/sys-boot/arcload/arcload-0.50-r3.ebuild new file mode 100644 index 000000000000..84c3a6f3caeb --- /dev/null +++ b/sys-boot/arcload/arcload-0.50-r3.ebuild @@ -0,0 +1,129 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/arcload-0.50-r3.ebuild,v 1.1 2015/05/04 05:01:22 kumba Exp $ + +EAPI=4 + +inherit eutils toolchain-funcs versionator + +# Hack until upstream renames from 0.5 to 0.50 +MY_PV="${PV/50/5}" + +PATCHREV="1" +DESCRIPTION="ARCLoad - SGI Multi-bootloader. Able to bootload many different SGI Systems" +HOMEPAGE="http://www.linux-mips.org/wiki/index.php/ARCLoad" +SRC_URI="ftp://ftp.linux-mips.org/pub/linux/mips/people/skylark/${PN}-${MY_PV}.tar.bz2 + mirror://gentoo/${P}-patches-v${PATCHREV}.tar.xz" +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="-* ~mips" +IUSE="" +DEPEND="sys-boot/dvhtool + abi_mips_o32? ( sys-devel/kgcc64 )" +RDEPEND="" +RESTRICT="strip" + +S="${WORKDIR}/${PN}-${MY_PV}" +PATCHDIR="${WORKDIR}/${P}-patches" + +src_prepare() { + # For gcc-4.x, quiet down some of the warnings + epatch "${PATCHDIR}"/${P}-shut-gcc4x-up.patch + + # Redefine the targets in the primary Makefile to give us + # finer control over building the tools. This is for properly + # cross-compiling arcload + epatch "${PATCHDIR}"/${P}-makefile-targets.patch + + # Patches borrowed from Debian: + # - Load ELF64 images on 32-bit systems - XXX: #543978 + # - Pass an arcload label name directly on the PROM cmdline. + # - Look for arc.cf in /etc and fallback to /. +# epatch "${PATCHDIR}"/${P}_deb-elf64-on-m32.patch + epatch "${PATCHDIR}"/${P}_deb-cmdline-config.patch + epatch "${PATCHDIR}"/${P}_deb-config-in-etc.patch + + # Building arcload on different MIPS ABIs can be difficult, + # so we include specific bits from standard system headers + # to make the compiler happy. These should rarely, if ever, + # change... + epatch "${PATCHDIR}"/${P}-local-elf_h.patch + + # Patch wreckoff.c to handle the new .MIPS.abiflags section. + epatch "${PATCHDIR}"/${P}-wreckoff-abiflags-fix.patch + + # In order to convert from ELF to ECOFF, we need to disable + # SSP, as that adds additional program headers that I don't + # know how to handle in wreckoff.c. + epatch "${PATCHDIR}"/${P}-disable-ssp.patch + + # The code is old and has a lot of issues. But it's just a + # simple bootloader, so silence the various warnings until + # it can be re-written. + epatch "${PATCHDIR}"/${P}-silence-warnings.patch +} + +src_compile() { + local myCC myCC64 myLD myLD64 + + myCC="$(tc-getCC)" + myLD="$(tc-getLD)" + if use abi_mips_o32; then + myCC64=${myCC/mips/mips64} + myLD64=${myLD/mips/mips64} + else + myCC64=${myCC} + myLD64=${myLD} + fi + + # Build the wreckoff tool first. It converts a 32bit MIPS ELF + # into a relocatable ECOFF image. We call for BUILD_CC + # on the offchance that we're cross-compiling. + echo -e "" + einfo ">>> Building the 'wreckoff' utility with $(tc-getBUILD_CC) ..." + emake CC=$(tc-getBUILD_CC) tools_clean tools + + # 32bit copy (sashARCS for IP22/IP32) + echo -e "" + einfo ">>> Building 32-bit version (sashARCS) for IP22/IP32 with ${myCC} ..." + cd "${S}" + emake MODE=M32 bootloader_clean + emake CC=${myCC} LD=${myLD} MODE=M32 bootloader + cp "${S}"/arcload.ecoff "${WORKDIR}"/sashARCS + + # 64bit copy (sash64 for IP27/IP28/IP30) + echo -e "" + einfo ">>> Building 64-bit version (sash64) for IP27/IP28/IP30 ${myCC/mips/mips64} ..." + emake MODE=M64 bootloader_clean + emake CC=${myCC64} LD=${myLD64} MODE=M64 bootloader + cp "${S}"/arcload "${WORKDIR}"/sash64 +} + +src_install() { + dodir /usr/lib/arcload + cp "${WORKDIR}"/sashARCS "${D}"/usr/lib/arcload + cp "${WORKDIR}"/sash64 "${D}"/usr/lib/arcload + cp "${S}"/arc.cf-bootcd "${D}"/usr/lib/arcload/arc-bootcd.cf + cp "${S}"/arc.cf-octane "${D}"/usr/lib/arcload/arc-octane.cf + + # Add a manpage for arcload(8) from the Debian Project. + doman "${FILESDIR}/arcload.8" +} + +pkg_postinst() { + echo -e "" + einfo "ARCLoad binaries copied to: /usr/lib/arcload" + echo -e "" + einfo "Use of ARCLoad is relatively easy:" + einfo "\t1) Determine which version you need" + einfo "\t\tA) sashARCS for IP22/IP32" + einfo "\t\tB) sash64 for IP27/IP28/IP30" + einfo "\t2) Copy that to the volume header using 'dvhtool'" + einfo "\t3) Edit /usr/lib/arcload/arc-*.cf to fit your specific system" + einfo "\t (See ${HOMEPAGE} for" + einfo "\t an explanation of the format of the config file)" + einfo "\t4) Copy the config file to the volume header with 'dvhtool' as 'arc.cf'" + einfo "\t5) Copy any kernels to the volume header that you want to be bootable" + einfo "\t6) Reboot, and enjoy!" + echo -e "" +} -- cgit v1.2.3-65-gdbad