diff options
| -rw-r--r-- | sys-freebsd/boot0/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-freebsd/boot0/boot0-7.2.ebuild | 37 | ||||
| -rw-r--r-- | sys-freebsd/boot0/boot0-8.0.ebuild | 52 | ||||
| -rw-r--r-- | sys-freebsd/boot0/files/boot0-7.0-gentoo.patch | 131 |
4 files changed, 5 insertions, 221 deletions
diff --git a/sys-freebsd/boot0/ChangeLog b/sys-freebsd/boot0/ChangeLog index 6bc59cda654f..38fd277e5633 100644 --- a/sys-freebsd/boot0/ChangeLog +++ b/sys-freebsd/boot0/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-freebsd/boot0 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.41 2013/06/18 23:14:29 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/ChangeLog,v 1.42 2013/06/18 23:18:17 aballier Exp $ + + 18 Jun 2013; Alexis Ballier <aballier@gentoo.org> -boot0-7.2.ebuild, + -boot0-8.0.ebuild, -files/boot0-7.0-gentoo.patch: + remove old 18 Jun 2013; Alexis Ballier <aballier@gentoo.org> boot0-9.1.ebuild: Build libstand here so that we can drop it from freebsd-lib. diff --git a/sys-freebsd/boot0/boot0-7.2.ebuild b/sys-freebsd/boot0/boot0-7.2.ebuild deleted file mode 100644 index 431726a52804..000000000000 --- a/sys-freebsd/boot0/boot0-7.2.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-7.2.ebuild,v 1.1 2009/05/22 11:08:14 aballier Exp $ - -inherit bsdmk freebsd - -DESCRIPTION="FreeBSD's bootloader" -SLOT="0" -KEYWORDS="~sparc-fbsd ~x86-fbsd" - -IUSE="" - -SRC_URI="mirror://gentoo/${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" ) - -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 -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \ - -i "${S}"/i386/boot2/Makefile \ - -i "${S}"/i386/gptboot/Makefile || die -} - -src_install() { - dodir /boot/defaults - - mkinstall FILESDIR=/boot || die "mkinstall failed" -} diff --git a/sys-freebsd/boot0/boot0-8.0.ebuild b/sys-freebsd/boot0/boot0-8.0.ebuild deleted file mode 100644 index baed3c7ab292..000000000000 --- a/sys-freebsd/boot0/boot0-8.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-8.0.ebuild,v 1.1 2010/03/19 11:51:04 aballier Exp $ - -EAPI=2 - -inherit bsdmk freebsd flag-o-matic - -DESCRIPTION="FreeBSD's bootloader" -SLOT="0" -KEYWORDS="~sparc-fbsd ~x86-fbsd" - -IUSE="bzip2 ieee1394 tftp zfs" - -SRC_URI="mirror://gentoo/${SYS}.tar.bz2" - -RDEPEND="" -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* - =sys-freebsd/freebsd-lib-${RV}*" - -S="${WORKDIR}/sys/boot" - -boot0_use_enable() { - use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" -} - -pkg_setup() { - boot0_use_enable ieee1394 FIREWIRE - boot0_use_enable zfs ZFS - boot0_use_enable tftp TFTP - boot0_use_enable bzip2 BZIP2 -} - -src_prepare() { - sed -e '/-fomit-frame-pointer/d' -e '/-mno-align-long-strings/d' \ - -i "${S}"/i386/boot2/Makefile \ - -i "${S}"/i386/gptboot/Makefile \ - -i "${S}"/i386/gptzfsboot/Makefile \ - -i "${S}"/i386/zfsboot/Makefile || die -} - -src_compile() { - strip-flags - append-flags "-I/usr/include/libstand/" - append-flags "-fno-strict-aliasing" - NOFLAGSTRIP="yes" freebsd_src_compile -} - -src_install() { - dodir /boot/defaults - mkinstall FILESDIR=/boot || die "mkinstall failed" -} diff --git a/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch b/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch deleted file mode 100644 index a5830c178f27..000000000000 --- a/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch +++ /dev/null @@ -1,131 +0,0 @@ -diff -ur ../src.orig/sys/boot/efi/libefi/Makefile sys/boot/efi/libefi/Makefile ---- ../src.orig/sys/boot/efi/libefi/Makefile 2006-11-05 23:03:03.000000000 +0100 -+++ sys/boot/efi/libefi/Makefile 2008-03-14 11:15:48.482695423 +0100 -@@ -8,7 +8,7 @@ - - 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 -diff -ur ../src.orig/sys/boot/i386/boot2/Makefile sys/boot/i386/boot2/Makefile ---- ../src.orig/sys/boot/i386/boot2/Makefile 2007-05-19 07:07:47.000000000 +0200 -+++ sys/boot/i386/boot2/Makefile 2008-03-14 11:21:16.247014910 +0100 -@@ -24,7 +24,7 @@ - -fno-guess-branch-probability \ - -fomit-frame-pointer \ - -fno-unit-at-a-time \ -- -mno-align-long-strings \ -+ -march=i586 \ - -mrtd \ - -mno-mmx -mno-3dnow -mno-sse -mno-sse2 -mno-sse3 \ - -D${BOOT2_UFS} \ -diff -ur ../src.orig/sys/boot/i386/libfirewire/Makefile sys/boot/i386/libfirewire/Makefile ---- ../src.orig/sys/boot/i386/libfirewire/Makefile 2007-05-29 16:35:57.000000000 +0200 -+++ sys/boot/i386/libfirewire/Makefile 2008-03-14 11:15:48.502696288 +0100 -@@ -10,7 +10,7 @@ - CFLAGS+= -D_BOOT - - CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. --CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -+CFLAGS+= -I/usr/include/libstand - CFLAGS+= -I${.CURDIR}/../btx/lib - CFLAGS+= -I${.CURDIR}/../libi386 - -diff -ur ../src.orig/sys/boot/i386/libi386/Makefile sys/boot/i386/libi386/Makefile ---- ../src.orig/sys/boot/i386/libi386/Makefile 2006-04-11 22:11:30.000000000 +0200 -+++ sys/boot/i386/libi386/Makefile 2008-03-14 11:15:48.506695959 +0100 -@@ -36,7 +36,7 @@ - -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 -diff -ur ../src.orig/sys/boot/ia64/common/Makefile sys/boot/ia64/common/Makefile ---- ../src.orig/sys/boot/ia64/common/Makefile 2006-11-05 23:03:03.000000000 +0100 -+++ sys/boot/ia64/common/Makefile 2008-03-14 11:15:48.486695372 +0100 -@@ -10,7 +10,7 @@ - CFLAGS+= -I${.CURDIR}/../../efi/include - CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} - CFLAGS+= -I${.CURDIR}/../../.. --CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -+CFLAGS+= -I/usr/include/libstand - - .if ${MK_FORTH} != "no" - BOOT_FORTH= yes -diff -ur ../src.orig/sys/boot/ia64/efi/Makefile sys/boot/ia64/efi/Makefile ---- ../src.orig/sys/boot/ia64/efi/Makefile 2006-11-05 23:03:03.000000000 +0100 -+++ sys/boot/ia64/efi/Makefile 2008-03-14 11:15:48.490695322 +0100 -@@ -15,7 +15,7 @@ - CFLAGS+= -I${.CURDIR}/../../efi/include - CFLAGS+= -I${.CURDIR}/../../efi/include/${MACHINE_ARCH} - CFLAGS+= -I${.CURDIR}/../../.. --CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -+CFLAGS+= -I/usr/include/libstand - - LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH} - LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic -diff -ur ../src.orig/sys/boot/ia64/ski/Makefile sys/boot/ia64/ski/Makefile ---- ../src.orig/sys/boot/ia64/ski/Makefile 2006-11-05 23:03:04.000000000 +0100 -+++ sys/boot/ia64/ski/Makefile 2008-03-14 11:15:48.494695551 +0100 -@@ -14,7 +14,7 @@ - CFLAGS+= -I${.CURDIR}/../common - CFLAGS+= -I${.CURDIR}/../../common - CFLAGS+= -I${.CURDIR}/../../.. --CFLAGS+= -I${.CURDIR}/../../../../lib/libstand -+CFLAGS+= -I/usr/include/libstand - - LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH} - LDFLAGS= -Wl,-T${LDSCRIPT} -diff -ur ../src.orig/sys/boot/ofw/libofw/Makefile sys/boot/ofw/libofw/Makefile ---- ../src.orig/sys/boot/ofw/libofw/Makefile 2007-06-17 02:17:15.000000000 +0200 -+++ sys/boot/ofw/libofw/Makefile 2008-03-14 11:15:48.478695194 +0100 -@@ -7,7 +7,7 @@ - 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. -diff -ur ../src.orig/sys/boot/pc98/libpc98/Makefile sys/boot/pc98/libpc98/Makefile ---- ../src.orig/sys/boot/pc98/libpc98/Makefile 2006-04-11 22:11:30.000000000 +0200 -+++ sys/boot/pc98/libpc98/Makefile 2008-03-14 11:15:48.510696188 +0100 -@@ -31,6 +31,6 @@ - -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> -diff -ur ../src.orig/sys/boot/powerpc/loader/Makefile sys/boot/powerpc/loader/Makefile ---- ../src.orig/sys/boot/powerpc/loader/Makefile 2006-03-17 19:54:36.000000000 +0100 -+++ sys/boot/powerpc/loader/Makefile 2008-03-14 11:15:48.515695706 +0100 -@@ -82,7 +82,7 @@ - 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 -ur ../src.orig/sys/boot/sparc64/loader/Makefile sys/boot/sparc64/loader/Makefile ---- ../src.orig/sys/boot/sparc64/loader/Makefile 2006-03-17 19:54:36.000000000 +0100 -+++ sys/boot/sparc64/loader/Makefile 2008-03-14 11:15:48.498695501 +0100 -@@ -65,7 +65,7 @@ - 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 |