diff options
Diffstat (limited to 'sys-freebsd/boot0')
-rw-r--r-- | sys-freebsd/boot0/ChangeLog | 107 | ||||
-rw-r--r-- | sys-freebsd/boot0/Manifest | 7 | ||||
-rw-r--r-- | sys-freebsd/boot0/boot0-7.0_pre200704.ebuild | 37 | ||||
-rw-r--r-- | sys-freebsd/boot0/files/boot0-6.0-gentoo.patch | 129 | ||||
-rw-r--r-- | sys-freebsd/boot0/files/boot0-7.0-gentoo.patch | 77 | ||||
-rw-r--r-- | sys-freebsd/boot0/files/freebsd-sources-6.2-sparc64.patch | 33 | ||||
-rw-r--r-- | sys-freebsd/boot0/metadata.xml | 5 |
7 files changed, 395 insertions, 0 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog new file mode 100644 index 0000000..17c8991 --- /dev/null +++ b/sys-freebsd/boot0/ChangeLog @@ -0,0 +1,107 @@ +# ChangeLog for sys-freebsd/boot0 +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.20 2007/01/15 21:33:57 drizzt Exp $ + +*boot0-6.2 (15 Jan 2007) + + 15 Jan 2007; Timothy Redaelli <drizzt@gentoo.org> -boot0-6.2_rc2.ebuild, + +boot0-6.2.ebuild: + Bump to 6.2 and remove old version. + + 05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> -boot0-6.1.ebuild: + Remove 6.1 ebuild. + +*boot0-6.2_rc2 (29 Dec 2006) + + 29 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> + -boot0-6.2_beta2.ebuild, -boot0-6.2_beta3.ebuild, -boot0-6.2_rc1.ebuild, + +boot0-6.2_rc2.ebuild: + Bump to rc2 and remove older versions. + + 19 Nov 2006; Timothy Redaelli <drizzt@gentoo.org> boot0-6.2_rc1.ebuild: + Patched to make it compile on GCC 4. + +*boot0-6.2_rc1 (19 Nov 2006) + + 19 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> +boot0-6.2_rc1.ebuild: + Version bump to 6.2-RC1. + +*boot0-6.2_beta3 (01 Nov 2006) + + 01 Nov 2006; Diego Pettenò <flameeyes@gentoo.org> + +boot0-6.2_beta3.ebuild: + Bump to 6.2_beta3. + + 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> ChangeLog: + Remove 6.2_beta1 ebuild. + + 19 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> + -boot0-6.2_beta1.ebuild: + Remove 6.2_beta1 ebuild. + + 17 Oct 2006; Roy Marples <uberlord@gentoo.org> + +files/freebsd-sources-6.2-sparc64.patch, boot0-6.2_beta2.ebuild: + Added ~sparc-fbsd keyword. + +*boot0-6.2_beta2 (05 Oct 2006) + + 05 Oct 2006; Diego Pettenò <flameeyes@gentoo.org> + +boot0-6.2_beta2.ebuild: + Version 6.2_beta2. + + 24 Sep 2006; Javier Villavicencio <the_paya@gentoo.org> + files/boot0-6.0-gentoo.patch: + Fix compilation over an i586 CHOST of boot2 by forcing -march=i386 to its + Makefile. + +*boot0-6.2_beta1 (21 Sep 2006) + + 21 Sep 2006; Diego Pettenò <flameeyes@gentoo.org> + +boot0-6.2_beta1.ebuild: + Add 6.2_beta1 ebuilds. + + 27 Jul 2006; Diego Pettenò <flameeyes@gentoo.org> -boot0-6.0.ebuild: + Remove 6.0 version. + + 18 Jul 2006; Javier Villavicencio <the_paya@gentoo.org> boot0-6.0.ebuild, + boot0-6.1.ebuild: + Fixes compilation with gcc-4.1.1. + +*boot0-6.1 (09 May 2006) + + 09 May 2006; Diego Pettenò <flameeyes@gentoo.org> -boot0-6.1_rc2.ebuild, + +boot0-6.1.ebuild: + Update to 6.1-RELEASE. + +*boot0-6.1_rc2 (02 May 2006) + + 02 May 2006; Diego Pettenò <flameeyes@gentoo.org> -boot0-6.1_rc1.ebuild, + +boot0-6.1_rc2.ebuild: + Update to 6.1_rc2. + +*boot0-6.1_rc1 (01 May 2006) + + 01 May 2006; Diego Pettenò <flameeyes@gentoo.org> boot0-6.0.ebuild, + +boot0-6.1_rc1.ebuild: + Update to 6.1_rc1 and disable stack protector. + + 02 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + -files/boot0-gentoo.patch: + Drop obsolete files. + +*boot0-6.0 (01 Apr 2006) + + 01 Apr 2006; Diego Pettenò <flameeyes@gentoo.org> + +files/boot0-6.0-gentoo.patch, +files/boot0-gentoo.patch, +metadata.xml, + +boot0-6.0.ebuild: + Import into portage. + +*boot0-5.4 (25 Aug 2005) + + 25 Aug 2005; Diego Pettenò <flameeyes@gentoo.org> + +files/boot0-gentoo.patch, +boot0-5.4.ebuild: + Moved to sys-freebsd. + + 29 Jul 2005; Diego Pettenò <flameeyes@gentoo.org> boot0-5.4.ebuild: + Adapt to recent bsdmk changes. + diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest new file mode 100644 index 0000000..c991c3c --- /dev/null +++ b/sys-freebsd/boot0/Manifest @@ -0,0 +1,7 @@ +AUX boot0-6.0-gentoo.patch 4463 RMD160 86f75013a4656bd8a481a3b9b12acf588f3d9ad6 SHA1 2304a507b99844427da9b49ed9bb236ea285d989 SHA256 39b6958ab6b47ad45e6ec176fc99b17e69b59fafc79ae16add2bfddcabc0795b +AUX boot0-7.0-gentoo.patch 2827 RMD160 7030ce28d62699f2ec48205f624cee2b8a82a777 SHA1 9ad44757dae03c719439939a23f1ed9ea42c814b SHA256 8b733bc7cdf6e9961c21ccf5fc238732715b603fb61f271b01b861f37af3f393 +AUX freebsd-sources-6.2-sparc64.patch 1239 RMD160 73b66e01b53d2233247e349b5c5a06af75d032cf SHA1 707675bc680ebf6096744450aed1ddc6cbe02304 SHA256 fcc6db401bf004b4985f0237408aed7fd3efba48de0b73769fb9566f9fe5083a +DIST freebsd-sys-7.0_pre200704.tar.bz2 20940473 RMD160 eee64418bd658056fa61d8f3344c2d95f21acd81 SHA1 2f8c7aa5636a2961e603b454b930b51585e6c98f SHA256 49fc2d930f2c01425610811a2e8c143131ce63c112b8f4a26574da7bf7ffdeba +EBUILD boot0-7.0_pre200704.ebuild 1044 RMD160 46edd500aa8429eda13312918771324055417569 SHA1 c79b9e26430c592fc4ac8b0183907bd6bb23719a SHA256 67da85182db13fa79a8ef7c92f7c400c014772d13b920092251881acca6a32c9 +MISC ChangeLog 3136 RMD160 2e9091942c8c24457eae5f37f70656e20a6a6f54 SHA1 e8de37a5fd966ace146cd0f88be39ffa8b56cc75 SHA256 458b9a4f155adf9161c6dba124a2fe16dbdbecb85069d0aecd1fdb55b3bcbdf4 +MISC metadata.xml 156 RMD160 60b5820a08275f307e5bd936d78f5afd1f141086 SHA1 d9d9d4f2b5afc58339ea3e562fca490156935f1f SHA256 30ab515d6ac492d3d6c36ac3c675511742c2149e56a6b3228c8d22ab8edb3ff7 diff --git a/sys-freebsd/boot0/boot0-7.0_pre200704.ebuild b/sys-freebsd/boot0/boot0-7.0_pre200704.ebuild new file mode 100644 index 0000000..e411b47 --- /dev/null +++ b/sys-freebsd/boot0/boot0-7.0_pre200704.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-6.2.ebuild,v 1.1 2007/01/15 21:33:57 drizzt Exp $ + +inherit bsdmk freebsd + +DESCRIPTION="FreeBSD's bootloader" +SLOT="0" +KEYWORDS=" ~x86-fbsd" + +IUSE="" + +SRC_URI="http://84.33.1.46/~drizzt/stages/${SYS}.tar.bz2" + +RDEPEND="" +DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-lib-${RV}*" + +S="${WORKDIR}/sys/boot" + +PATCHES="${FILESDIR}/boot0-7.0-gentoo.patch + ${FILESDIR}/freebsd-sources-6.2-sparc64.patch" + +src_unpack() { + freebsd_src_unpack + + grep -lr --null -- -ffreestanding "${S}" | xargs -0 sed -i -e \ + "s:-ffreestanding:-ffreestanding $(test-flags -fno-stack-protector -fno-stack-protector-all):g" || die +# sed -i -e '/-fomit-frame-pointer/d' "${S}"/i386/boot2/Makefile || die + sed -i -e 's/^BOOT2_UFS?\=.*/BOOT2_UFS?=UFS2_ONLY/' "${S}"/i386/boot2/Makefile || die +} + +src_install() { + dodir /boot/defaults + + mkinstall FILESDIR=/boot || die "mkinstall failed" +} diff --git a/sys-freebsd/boot0/files/boot0-6.0-gentoo.patch b/sys-freebsd/boot0/files/boot0-6.0-gentoo.patch new file mode 100644 index 0000000..6c62610 --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-6.0-gentoo.patch @@ -0,0 +1,129 @@ +Index: sys/boot/alpha/common/Makefile.common +=================================================================== +--- sys/boot/alpha/common/Makefile.common.orig ++++ sys/boot/alpha/common/Makefile.common +@@ -34,7 +34,7 @@ CLEANFILES+= vers.c ${BOOT} ${BOOT}.sym + + CFLAGS+= -Wall + +-CFLAGS+= -I${LIBSTANDDIR} ++CFLAGS+= -I/usr/include/libstand + CFLAGS+= -I${.CURDIR}/.. + + vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version +Index: sys/boot/alpha/libalpha/Makefile +=================================================================== +--- sys/boot/alpha/libalpha/Makefile.orig ++++ sys/boot/alpha/libalpha/Makefile +@@ -5,7 +5,7 @@ INTERNALLIB= + + #CFLAGS+= -DDISK_DEBUG + +-CFLAGS+= -I${LIBSTANDDIR} ++CFLAGS+= -I/usr/include/libstand + + # Pick up the bootstrap header for some interface items + CFLAGS+= -I${.CURDIR}/../../common +Index: sys/boot/arc/lib/Makefile +=================================================================== +--- sys/boot/arc/lib/Makefile.orig ++++ sys/boot/arc/lib/Makefile +@@ -7,7 +7,7 @@ CFLAGS+= -ffreestanding + .PATH: ${.CURDIR}/arch/${MACHINE_ARCH} + # XXX hack to pick up stand.h + LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand +-CFLAGS+= -I${LIBSTANDDIR} ++CFLAGS+= -I/usr/include/libstand + CFLAGS+= -DDEBUG + + # Pick up the bootstrap header for some interface items +Index: sys/boot/arc/loader/Makefile +=================================================================== +--- sys/boot/arc/loader/Makefile.orig ++++ sys/boot/arc/loader/Makefile +@@ -26,7 +26,7 @@ CLEANFILES+= machine + + CFLAGS+= -Wall + +-CFLAGS+= -I${LIBSTANDDIR} ++CFLAGS+= -I/usr/include/libstand + CFLAGS+= -I${.CURDIR}/../include + CRT= start.o + STRIP= +Index: sys/boot/efi/libefi/Makefile +=================================================================== +--- sys/boot/efi/libefi/Makefile.orig ++++ sys/boot/efi/libefi/Makefile +@@ -14,7 +14,7 @@ SRCS+= efifpswa.c pal.S + + CFLAGS+= -I${.CURDIR}/../include + CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH} +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand ++CFLAGS+= -I/usr/include/libstand + + # Pick up the bootstrap header for some interface items + CFLAGS+= -I${.CURDIR}/../../common +Index: sys/boot/i386/boot2/Makefile +=================================================================== +--- sys/boot/i386/boot2/Makefile.orig ++++ sys/boot/i386/boot2/Makefile +@@ -24,7 +24,7 @@ CFLAGS= -Os \ + -fno-guess-branch-probability \ + -fomit-frame-pointer \ + -fno-unit-at-a-time \ +- -mno-align-long-strings \ ++ -march=i386 \ + -mrtd \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \ + -D${BOOT2_UFS} \ +Index: sys/boot/i386/libi386/Makefile +=================================================================== +--- sys/boot/i386/libi386/Makefile.orig ++++ sys/boot/i386/libi386/Makefile +@@ -28,7 +28,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${. + -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../.. -I. + # the location of libstand +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ++CFLAGS+= -I/usr/include/libstand/ + + .if ${MACHINE_ARCH} == "amd64" + CLEANFILES+= machine +Index: sys/boot/ofw/libofw/Makefile +=================================================================== +--- sys/boot/ofw/libofw/Makefile.orig ++++ sys/boot/ofw/libofw/Makefile +@@ -7,7 +7,7 @@ SRCS= devicename.c elf_freebsd.c ofw_con + ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ + ofw_time.c openfirm.c + +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ++CFLAGS+= -I/usr/include/libstand/ + + # Pick up the bootstrap header for some interface items + CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +Index: sys/boot/pc98/libpc98/Makefile +=================================================================== +--- sys/boot/pc98/libpc98/Makefile.orig ++++ sys/boot/pc98/libpc98/Makefile +@@ -28,6 +28,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${. + -I${.CURDIR}/../../i386/libi386 \ + -I${.CURDIR}/../../.. -I. + # the location of libstand +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ++CFLAGS+= -I/usr/include/libstand/ + + .include <bsd.lib.mk> +Index: sys/boot/sparc64/loader/Makefile +=================================================================== +--- sys/boot/sparc64/loader/Makefile.orig ++++ sys/boot/sparc64/loader/Makefile +@@ -63,7 +63,7 @@ LIBOFW= ${.OBJDIR}/../../ofw/libofw/lib + CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ + + # where to get libstand from +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ++CFLAGS+= -I/usr/include/libstand/ + + DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND} + LDADD= ${LIBFICL} ${LIBOFW} -lstand diff --git a/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch b/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch new file mode 100644 index 0000000..6d13a7e --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch @@ -0,0 +1,77 @@ +Index: sys/boot/efi/libefi/Makefile +=================================================================== +--- sys/boot/efi/libefi/Makefile.orig ++++ sys/boot/efi/libefi/Makefile +@@ -14,7 +14,7 @@ SRCS+= efifpswa.c pal.S + + CFLAGS+= -I${.CURDIR}/../include + CFLAGS+= -I${.CURDIR}/../include/${MACHINE_ARCH:S/amd64/i386/} +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand ++CFLAGS+= -I/usr/include/libstand + + # Pick up the bootstrap header for some interface items + CFLAGS+= -I${.CURDIR}/../../common +Index: sys/boot/i386/boot2/Makefile +=================================================================== +--- sys/boot/i386/boot2/Makefile.orig ++++ sys/boot/i386/boot2/Makefile +@@ -24,7 +24,7 @@ CFLAGS= -Os \ + -fno-guess-branch-probability \ + -fomit-frame-pointer \ + -fno-unit-at-a-time \ +- -mno-align-long-strings \ ++ -march=i386 \ + -mrtd \ + -mno-mmx -mno-3dnow -mno-sse -mno-sse2 \ + -D${BOOT2_UFS} \ +Index: sys/boot/i386/libi386/Makefile +=================================================================== +--- sys/boot/i386/libi386/Makefile.orig ++++ sys/boot/i386/libi386/Makefile +@@ -28,7 +28,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${. + -I${.CURDIR}/../../../contrib/dev/acpica \ + -I${.CURDIR}/../../.. -I. + # the location of libstand +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ++CFLAGS+= -I/usr/include/libstand/ + + .if ${MACHINE_ARCH} == "amd64" + CLEANFILES+= machine +Index: sys/boot/ofw/libofw/Makefile +=================================================================== +--- sys/boot/ofw/libofw/Makefile.orig ++++ sys/boot/ofw/libofw/Makefile +@@ -7,7 +7,7 @@ SRCS= devicename.c elf_freebsd.c ofw_con + ofw_memory.c ofw_module.c ofw_net.c ofw_reboot.c \ + ofw_time.c openfirm.c + +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ++CFLAGS+= -I/usr/include/libstand/ + + # Pick up the bootstrap header for some interface items + CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. +Index: sys/boot/pc98/libpc98/Makefile +=================================================================== +--- sys/boot/pc98/libpc98/Makefile.orig ++++ sys/boot/pc98/libpc98/Makefile +@@ -28,6 +28,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${. + -I${.CURDIR}/../../i386/libi386 \ + -I${.CURDIR}/../../.. -I. + # the location of libstand +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ++CFLAGS+= -I/usr/include/libstand/ + + .include <bsd.lib.mk> +Index: sys/boot/sparc64/loader/Makefile +=================================================================== +--- sys/boot/sparc64/loader/Makefile.orig ++++ sys/boot/sparc64/loader/Makefile +@@ -63,7 +63,7 @@ LIBOFW= ${.OBJDIR}/../../ofw/libofw/lib + CFLAGS+= -I${.CURDIR}/../../ofw/libofw/ + + # where to get libstand from +-CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ ++CFLAGS+= -I/usr/include/libstand/ + + DPADD= ${LIBFICL} ${LIBOFW} ${LIBSTAND} + LDADD= ${LIBFICL} ${LIBOFW} -lstand diff --git a/sys-freebsd/boot0/files/freebsd-sources-6.2-sparc64.patch b/sys-freebsd/boot0/files/freebsd-sources-6.2-sparc64.patch new file mode 100644 index 0000000..7e10d00 --- /dev/null +++ b/sys-freebsd/boot0/files/freebsd-sources-6.2-sparc64.patch @@ -0,0 +1,33 @@ +FreeBSD only works on Sparc64 and freeBSD code relies on the __sparc64__ define. +gcc only defines __sparc64__ if -mcpu is not used. +gcc-4 defaults to using -mcpu=ultrasparc on FreeBSD. + +This causes us a problem. Infact, FreeBSD developers sent gcc a patch to always +define __sparc64__ when using -mcpu=ultrasparc, but this was rejected by most +people including NetBSD developers. + +The correct solution is to use __sparc__. +If platform detection is required, or the code is obviously 64 bit then we can +use the __arch64__ define as well. +This combination should be supported by all gcc versions:) + +--- ofw/libofw/ofw_net.c 2005-03-02 20:12:27 +0000 ++++ ofw/libofw/ofw_net.c 2006-10-11 08:10:48 +0100 +@@ -189,7 +189,7 @@ + if ((ch = index(path, ':')) != NULL) + *ch = '\0'; + netdev = OF_finddevice(path); +-#ifdef __sparc64__ ++#if defined(__sparc__) + if (OF_getprop(netdev, "mac-address", desc->myea, 6) == -1) + #else + if (OF_getprop(netdev, "local-mac-address", desc->myea, 6) == -1) +@@ -207,7 +207,7 @@ + printf("ofwn_init: Open Firmware instance handle: %08x\n", netinstance); + #endif + +-#ifndef __sparc64__ ++#ifndef __sparc__ + dmabuf = NULL; + if (OF_call_method("dma-alloc", netinstance, 1, 1, (64 * 1024), &dmabuf) + < 0) { diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml new file mode 100644 index 0000000..ecedda4 --- /dev/null +++ b/sys-freebsd/boot0/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>bsd</herd> +</pkgmetadata> |