From 01eb263f7a5aaa12520ca53c5f00f2ded65c698d Mon Sep 17 00:00:00 2001 From: Joshua Kinard Date: Fri, 14 Oct 2005 17:32:26 +0000 Subject: Tweaks to arcload; add an identifier to loader/detect.c for R14K cpus, and make detectbaud() return a default of 9600bps in loader/detect.c (Portage version: 2.0.53_rc5) --- sys-boot/arcload/ChangeLog | 10 ++- sys-boot/arcload/Manifest | 9 +-- sys-boot/arcload/arcload-0.43-r1.ebuild | 78 +++++++++++++++++++++++ sys-boot/arcload/arcload-0.43.ebuild | 69 -------------------- sys-boot/arcload/files/arcload-0.43-tweaks1.patch | 20 ++++++ sys-boot/arcload/files/digest-arcload-0.43 | 1 - sys-boot/arcload/files/digest-arcload-0.43-r1 | 1 + 7 files changed, 113 insertions(+), 75 deletions(-) create mode 100644 sys-boot/arcload/arcload-0.43-r1.ebuild delete mode 100644 sys-boot/arcload/arcload-0.43.ebuild create mode 100644 sys-boot/arcload/files/arcload-0.43-tweaks1.patch delete mode 100644 sys-boot/arcload/files/digest-arcload-0.43 create mode 100644 sys-boot/arcload/files/digest-arcload-0.43-r1 (limited to 'sys-boot/arcload') diff --git a/sys-boot/arcload/ChangeLog b/sys-boot/arcload/ChangeLog index c3a16743ad50..c2a8d60a3019 100644 --- a/sys-boot/arcload/ChangeLog +++ b/sys-boot/arcload/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-boot/arcload # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/ChangeLog,v 1.2 2005/09/11 01:58:09 kumba Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/ChangeLog,v 1.3 2005/10/14 17:32:26 kumba Exp $ + +*arcload-0.43-r1 (15 Oct 2005) + + 15 Oct 2005; Joshua Kinard + +files/arcload-0.43-tweaks1.patch, +arcload-0.43-r1.ebuild, + -arcload-0.43.ebuild: + Tweaks to arcload; add an identifier to loader/detect.c for R14K cpus, and + make detectbaud() return a default of 9600bps in loader/detect.c *arcload-0.43 (11 Sep 2005) diff --git a/sys-boot/arcload/Manifest b/sys-boot/arcload/Manifest index 15e352fe3d45..4ea70a2c1ee2 100644 --- a/sys-boot/arcload/Manifest +++ b/sys-boot/arcload/Manifest @@ -1,6 +1,7 @@ +MD5 1c4cd070f8b005de77607f361d9bf837 ChangeLog 956 MD5 fb6f9d40d2ded3c067ac1eefaf219a55 arcload-0.41.ebuild 2191 -MD5 58a9ae7662a7e557b27a74c70106c08d metadata.xml 366 -MD5 95d0a3b86aadfed04ba818b7f6072462 ChangeLog 645 -MD5 7281132ec00607d4eb227d4e61fb4573 arcload-0.43.ebuild 2284 +MD5 6a209b070944918d6a727c3a53c39c7e arcload-0.43-r1.ebuild 2504 +MD5 4c218c8e9298938004593523435f45b6 files/arcload-0.43-tweaks1.patch 615 MD5 15044a63205fe66a9f42ccf799b328fe files/digest-arcload-0.41 64 -MD5 a95a426a82a8a6ad6249e843a4fcedff files/digest-arcload-0.43 64 +MD5 a95a426a82a8a6ad6249e843a4fcedff files/digest-arcload-0.43-r1 64 +MD5 58a9ae7662a7e557b27a74c70106c08d metadata.xml 366 diff --git a/sys-boot/arcload/arcload-0.43-r1.ebuild b/sys-boot/arcload/arcload-0.43-r1.ebuild new file mode 100644 index 000000000000..904f101ee0e8 --- /dev/null +++ b/sys-boot/arcload/arcload-0.43-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/arcload-0.43-r1.ebuild,v 1.1 2005/10/14 17:32:26 kumba Exp $ + +inherit eutils toolchain-funcs + +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/${P}.tar.bz2" +LICENSE="as-is" +SLOT="0" +KEYWORDS="-* ~mips" +IUSE="" +DEPEND="sys-boot/dvhtool" +RESTRICT="nostrip" + + +pkg_setup() { + # See if we're on a cobalt system + if [ "${PROFILE_ARCH}" = "cobalt" ]; then + echo -e "" + eerror "This package is only intended for SGI systems. It will not work on any" + eerror "other types of MIPS-based systems or any other architectures" + echo -e "" + die + fi +} + +src_unpack() { + unpack ${A} + + # Adds in detection support for the R14000, and + # tweaks detectbaud() in loader/detect.c to return + # a default of 9600bps when the function fails + epatch ${FILESDIR}/${P}-tweaks1.patch +} + +src_compile() { + echo -e "" + einfo ">>> Building 32-bit version (sashARCS) for IP22/IP32 ..." + cd ${S} + make MODE=M32 clean || die + make CC=$(tc-getCC) LD=$(tc-getLD) MODE=M32 || die + cp ${S}/arcload.ecoff ${WORKDIR}/sashARCS + + echo -e "" + einfo ">>> Building 64-bit version (sash64) for IP27/IP28/IP30 ..." + make MODE=M64 clean || die + make CC=$(tc-getCC) LD=$(tc-getLD) MODE=M64 || die + cp ${S}/arcload ${WORKDIR}/sash64 +} + +src_install() { + cd ${S} + 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 +} + +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' (make sure it is copied 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.43.ebuild b/sys-boot/arcload/arcload-0.43.ebuild deleted file mode 100644 index 3b1d26c7f4c6..000000000000 --- a/sys-boot/arcload/arcload-0.43.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/arcload/arcload-0.43.ebuild,v 1.1 2005/09/11 01:58:09 kumba Exp $ - -inherit eutils toolchain-funcs - -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/${P}.tar.bz2" -LICENSE="as-is" -SLOT="0" -KEYWORDS="-* ~mips" -IUSE="" -DEPEND="sys-boot/dvhtool" -RESTRICT="nostrip" - - -pkg_setup() { - # See if we're on a cobalt system - if [ "${PROFILE_ARCH}" = "cobalt" ]; then - echo -e "" - eerror "This package is only intended for SGI systems. It will not work on any" - eerror "other types of MIPS-based systems or any other architectures" - echo -e "" - die - fi -} - -src_compile() { - echo -e "" - einfo ">>> Building 32-bit version (sashARCS) for IP22/IP32 ..." - cd ${S} - make MODE=M32 clean || die - make CC=$(tc-getCC) LD=$(tc-getLD) MODE=M32 || die - cp ${S}/arcload.ecoff ${WORKDIR}/sashARCS - - echo -e "" - einfo ">>> Building 64-bit version (sash64) for IP27/IP28/IP30 ..." - make MODE=M64 clean || die - make CC=$(tc-getCC) LD=$(tc-getLD) MODE=M64 || die - cp ${S}/arcload ${WORKDIR}/sash64 -} - -src_install() { - cd ${S} - 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 -} - -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' (make sure it is copied 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/files/arcload-0.43-tweaks1.patch b/sys-boot/arcload/files/arcload-0.43-tweaks1.patch new file mode 100644 index 000000000000..143cbb151312 --- /dev/null +++ b/sys-boot/arcload/files/arcload-0.43-tweaks1.patch @@ -0,0 +1,20 @@ +diff -Naurp arcload-0.43.orig/loader/detect.c arcload-0.43/loader/detect.c +--- arcload-0.43.orig/loader/detect.c 2005-09-05 13:32:44 -0400 ++++ arcload-0.43/loader/detect.c 2005-10-14 00:36:46 -0400 +@@ -30,6 +30,7 @@ static struct { + {0x0004, "r4000"}, + {0x0009, "r10000"}, + {0x000e, "r12000"}, ++ {0x000f, "r14000"}, + {0x0020, "r4600"}, + {0x0021, "r4700"}, + {0x0023, "r5000"}, +@@ -194,7 +195,7 @@ static char *detectbaud(void) + if(var && var[0]=='d') { + var=ArcGetEnvironmentVariable("dbaud"); + if(!var) +- return NULL; ++ return "baud=9600"; + sprintf(baudrate,"baud=%s",var); + return baudrate; + } diff --git a/sys-boot/arcload/files/digest-arcload-0.43 b/sys-boot/arcload/files/digest-arcload-0.43 deleted file mode 100644 index 3856b419b4a9..000000000000 --- a/sys-boot/arcload/files/digest-arcload-0.43 +++ /dev/null @@ -1 +0,0 @@ -MD5 c57072225b381f8a6bd59a421e815761 arcload-0.43.tar.bz2 22419 diff --git a/sys-boot/arcload/files/digest-arcload-0.43-r1 b/sys-boot/arcload/files/digest-arcload-0.43-r1 new file mode 100644 index 000000000000..3856b419b4a9 --- /dev/null +++ b/sys-boot/arcload/files/digest-arcload-0.43-r1 @@ -0,0 +1 @@ +MD5 c57072225b381f8a6bd59a421e815761 arcload-0.43.tar.bz2 22419 -- cgit v1.2.3-65-gdbad