From 4f29ac888efef717d00d03f49fde506aecde994d Mon Sep 17 00:00:00 2001 From: Gustavo Zacarias Date: Fri, 21 Apr 2006 14:00:36 +0000 Subject: Fix default/timer issues on IIi/IIe machines (Portage version: 2.0.54) --- sys-boot/silo/ChangeLog | 9 ++++- sys-boot/silo/Manifest | 17 +++------ sys-boot/silo/files/digest-silo-1.4.11 | 1 - sys-boot/silo/files/digest-silo-1.4.11-r1 | 1 + sys-boot/silo/files/silo-1.4.11-timer.patch | 41 +++++++++++++++++++++ sys-boot/silo/silo-1.4.11-r1.ebuild | 56 +++++++++++++++++++++++++++++ sys-boot/silo/silo-1.4.11.ebuild | 55 ---------------------------- 7 files changed, 110 insertions(+), 70 deletions(-) delete mode 100644 sys-boot/silo/files/digest-silo-1.4.11 create mode 100644 sys-boot/silo/files/digest-silo-1.4.11-r1 create mode 100644 sys-boot/silo/files/silo-1.4.11-timer.patch create mode 100644 sys-boot/silo/silo-1.4.11-r1.ebuild delete mode 100644 sys-boot/silo/silo-1.4.11.ebuild (limited to 'sys-boot/silo') diff --git a/sys-boot/silo/ChangeLog b/sys-boot/silo/ChangeLog index 11bd197a21d3..a5ad50ebbb5f 100644 --- a/sys-boot/silo/ChangeLog +++ b/sys-boot/silo/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sys-boot/silo # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.26 2006/03/09 22:33:45 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/ChangeLog,v 1.27 2006/04/21 14:00:36 gustavoz Exp $ + +*silo-1.4.11-r1 (21 Apr 2006) + + 21 Apr 2006; Gustavo Zacarias + +files/silo-1.4.11-timer.patch, -silo-1.4.11.ebuild, + +silo-1.4.11-r1.ebuild: + Fix default/timer issues on IIi/IIe machines *silo-1.4.11 (09 Mar 2006) diff --git a/sys-boot/silo/Manifest b/sys-boot/silo/Manifest index 7f02397296db..c05e6dc23a9b 100644 --- a/sys-boot/silo/Manifest +++ b/sys-boot/silo/Manifest @@ -1,15 +1,13 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 29eae0afe0b8aced609187773e8ce3c2 ChangeLog 5952 +MD5 eee61dbe136f415844b337486e5caa69 ChangeLog 6166 MD5 d64a6c9a2051c74be817cf525ead4db5 files/digest-silo-1.3.1 62 MD5 d64a6c9a2051c74be817cf525ead4db5 files/digest-silo-1.3.1-r1 62 MD5 ba569526e64ff4aae31e2eb37150f62d files/digest-silo-1.3.2 62 MD5 ba569526e64ff4aae31e2eb37150f62d files/digest-silo-1.3.2-r1 62 MD5 29a3724ae5f040a147baf7a1c24722b0 files/digest-silo-1.4.10 63 -MD5 50fe6ee9522f16caeddffa6284299b68 files/digest-silo-1.4.11 63 +MD5 50fe6ee9522f16caeddffa6284299b68 files/digest-silo-1.4.11-r1 63 MD5 3b110f5f5e2b67c92ae41c3e16839bff files/digest-silo-1.4.8 62 MD5 debfd1b078cc4d196b01f68d5b4ea9c4 files/digest-silo-1.4.9 62 +MD5 c3140abf619f875c0d65b0562ea70dfa files/silo-1.4.11-timer.patch 1230 MD5 93989216de8957ab881809407b2e386c files/silo-1.4.9-sparc_cpu.patch 3206 MD5 22b27dc36d3080c4122445a914faaa18 files/silo-1.4.x-noglibc_time.patch 407 MD5 64e92dc3614963db8a397f670749b6cf metadata.xml 369 @@ -18,13 +16,6 @@ MD5 7430217ab6709c3e0e09415a2f85281d silo-1.3.1.ebuild 941 MD5 e2c700249cac8fbd5a4f30987c94175e silo-1.3.2-r1.ebuild 1094 MD5 d4adf943377a89eea8998fd151f12b2d silo-1.3.2.ebuild 942 MD5 9109a2ab578452cfc24caf9d86b02cef silo-1.4.10.ebuild 1388 -MD5 02c3d0a325c0fde230c7009f46c38ba2 silo-1.4.11.ebuild 1389 +MD5 b3f29ac12c55cf7a38ad2dbba1e07b6e silo-1.4.11-r1.ebuild 1330 MD5 dba5c7816e8702338640505a292b92fa silo-1.4.8.ebuild 1258 MD5 a331d811f2c84acac4588507939f4b5a silo-1.4.9.ebuild 1490 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.1-ecc0.1.6 (GNU/Linux) - -iD8DBQFEEK1eKRy60XGEcJIRApEPAKCHSzRirQdv228LoKYePUNGQNSZAQCfbGmF -3TS+FbB7f7SkKX49qyT0yEc= -=M6B+ ------END PGP SIGNATURE----- diff --git a/sys-boot/silo/files/digest-silo-1.4.11 b/sys-boot/silo/files/digest-silo-1.4.11 deleted file mode 100644 index c58a59443be7..000000000000 --- a/sys-boot/silo/files/digest-silo-1.4.11 +++ /dev/null @@ -1 +0,0 @@ -MD5 c39c000e1c4acce431da37df292670ea silo-1.4.11.tar.gz 178406 diff --git a/sys-boot/silo/files/digest-silo-1.4.11-r1 b/sys-boot/silo/files/digest-silo-1.4.11-r1 new file mode 100644 index 000000000000..c58a59443be7 --- /dev/null +++ b/sys-boot/silo/files/digest-silo-1.4.11-r1 @@ -0,0 +1 @@ +MD5 c39c000e1c4acce431da37df292670ea silo-1.4.11.tar.gz 178406 diff --git a/sys-boot/silo/files/silo-1.4.11-timer.patch b/sys-boot/silo/files/silo-1.4.11-timer.patch new file mode 100644 index 000000000000..251b43c2d70c --- /dev/null +++ b/sys-boot/silo/files/silo-1.4.11-timer.patch @@ -0,0 +1,41 @@ +--- second/timer.c.~1~ 2006-04-20 21:18:49.000000000 -0700 ++++ second/timer.c 2006-04-20 21:21:19.000000000 -0700 +@@ -40,6 +40,8 @@ + static volatile struct sun4c_timer_info *sun4c_timer; + static unsigned char *addr_to_free = 0; + static int len_to_free; ++static unsigned long long sun4u_tickcmpr; ++static int sun4u_notimer = 0; + static struct mostek48t02 *mregs; + static long clock_frequency; + +@@ -154,6 +156,16 @@ + } + if (!foundcpu || !clock_frequency) + clock_frequency = prom_getint(prom_root_node, "clock-frequency") / 100; ++ if (notimer) { ++ sun4u_notimer = 1; ++ __asm__ __volatile__ ("\t" ++ "rd %%tick_cmpr, %%g1\n\t" ++ "stx %%g1, [%0]\n\t" ++ "mov 1, %%g1\n\t" ++ "sllx %%g1, 63, %%g1\n\t" ++ "wr %%g1, 0, %%tick_cmpr" ++ : : "r" (&sun4u_tickcmpr) : "g1"); ++ } + return 0; + } + +@@ -194,6 +206,12 @@ + + void close_timer () + { ++ if (sun4u_notimer) { ++ __asm__ __volatile__("\t" ++ "ldx [%0], %%g1\n\t" ++ "wr %%g1, 0, %%tick_cmpr" ++ : : "r" (&sun4u_tickcmpr) : "g1"); ++ } + if (addr_to_free) { + if (addr_to_free == (unsigned char *)0xffffffff) + sun4c_unmapio (TICKER_VIRTUAL); diff --git a/sys-boot/silo/silo-1.4.11-r1.ebuild b/sys-boot/silo/silo-1.4.11-r1.ebuild new file mode 100644 index 000000000000..6dd1646cb486 --- /dev/null +++ b/sys-boot/silo/silo-1.4.11-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.11-r1.ebuild,v 1.1 2006/04/21 14:00:36 gustavoz Exp $ + +inherit mount-boot flag-o-matic toolchain-funcs + +DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc" +SRC_URI="http://www.sparc-boot.org/pub/silo/${P}.tar.gz" +HOMEPAGE="http://www.sparc-boot.org" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="-* ~sparc" +IUSE="hardened" + +PROVIDE="virtual/bootloader" + +DEPEND="sys-fs/e2fsprogs + sys-apps/sparc-utils" + +ABI_ALLOW="sparc32" + +src_unpack() { + unpack ${A} + cd ${S} + + epatch ${FILESDIR}/silo-1.4.x-noglibc_time.patch + epatch ${FILESDIR}/${P}-timer.patch +} + +src_compile() { + filter-flags "-fstack-protector" + + if use hardened + then + make ${MAKEOPTS} CC="$(tc-getCC) -fno-stack-protector -fno-pic" + else + make ${MAKEOPTS} CC="$(tc-getCC)" || die + fi +} + +src_install() { + make DESTDIR=${D} install || die + dodoc COPYING ChangeLog first-isofs/README.SILO_ISOFS docs/README* + + # Fix maketilo manpage + rm ${D}/usr/share/man/man1/maketilo.1 + dosym /usr/share/man/man1/tilo.1 /usr/share/man/man1/maketilo.1 +} + +pkg_postinst() { + ewarn "NOTE: If this is an upgrade to an existing SILO install," + ewarn " you will need to re-run silo as the /boot/second.b" + ewarn " file has changed, else the system will fail to load" + ewarn " SILO at the next boot." +} diff --git a/sys-boot/silo/silo-1.4.11.ebuild b/sys-boot/silo/silo-1.4.11.ebuild deleted file mode 100644 index 646c1677d76b..000000000000 --- a/sys-boot/silo/silo-1.4.11.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/silo/silo-1.4.11.ebuild,v 1.1 2006/03/09 22:33:45 gustavoz Exp $ - -inherit mount-boot flag-o-matic toolchain-funcs - -DESCRIPTION="SPARC/UltraSPARC Improved Loader, a boot loader for sparc" -SRC_URI="http://www.sparc-boot.org/pub/silo/${P}.tar.gz" -HOMEPAGE="http://www.sparc-boot.org" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="-* ~sparc" -IUSE="hardened" - -PROVIDE="virtual/bootloader" - -DEPEND="sys-fs/e2fsprogs - sys-apps/sparc-utils" - -ABI_ALLOW="sparc32" - -src_unpack() { - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/silo-1.4.x-noglibc_time.patch -} - -src_compile() { - filter-flags "-fstack-protector" - - if use hardened - then - make ${MAKEOPTS} CC="$(tc-getCC) -fno-stack-protector -fno-pic" - else - make ${MAKEOPTS} CC="$(tc-getCC)" || die - fi -} - -src_install() { - make DESTDIR=${D} install || die - dodoc COPYING ChangeLog first-isofs/README.SILO_ISOFS docs/README* - - # Fix maketilo manpage - rm ${D}/usr/share/man/man1/maketilo.1 - dosym /usr/share/man/man1/tilo.1 /usr/share/man/man1/maketilo.1 -} - -pkg_postinst() { - ewarn "NOTE: If this is an upgrade to an existing SILO install," - ewarn " you will need to re-run silo as the /boot/second.b" - ewarn " file has changed, else the system will fail to load" - ewarn " SILO at the next boot." -} -- cgit v1.2.3-65-gdbad