From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B5F21138010 for ; Tue, 11 Sep 2012 17:13:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EA50EE0760; Tue, 11 Sep 2012 17:10:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id A94DEE075B for ; Tue, 11 Sep 2012 17:10:49 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E6D3A33CBF2 for ; Tue, 11 Sep 2012 17:10:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 5579DE543C for ; Tue, 11 Sep 2012 17:10:46 +0000 (UTC) From: "Alexis Ballier" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexis Ballier" Message-ID: <1347382582.5801e468034c872ead9f6d7f29a5691b6e024964.aballier@gentoo> Subject: [gentoo-commits] proj/gentoo-bsd:master commit in: sys-freebsd/boot0/files/, sys-freebsd/boot0/ X-VCS-Repository: proj/gentoo-bsd X-VCS-Files: sys-freebsd/boot0/Manifest sys-freebsd/boot0/boot0-9.1_rc1.ebuild sys-freebsd/boot0/files/boot0-7.0-gentoo.patch sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch X-VCS-Directories: sys-freebsd/boot0/files/ sys-freebsd/boot0/ X-VCS-Committer: aballier X-VCS-Committer-Name: Alexis Ballier X-VCS-Revision: 5801e468034c872ead9f6d7f29a5691b6e024964 X-VCS-Branch: master Date: Tue, 11 Sep 2012 17:10:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a69d2bb3-eaa3-4a2d-8b68-d86564999dbc X-Archives-Hash: 9ee1289b80b14f90425f8c6efca311e8 commit: 5801e468034c872ead9f6d7f29a5691b6e024964 Author: Alexis Ballier gentoo org> AuthorDate: Tue Sep 11 16:56:22 2012 +0000 Commit: Alexis Ballier gentoo org> CommitDate: Tue Sep 11 16:56:22 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=5801e468 remove boot0, merged to the main tree --- sys-freebsd/boot0/Manifest | 6 - sys-freebsd/boot0/boot0-9.1_rc1.ebuild | 53 -------- sys-freebsd/boot0/files/boot0-7.0-gentoo.patch | 131 -------------------- .../boot0/files/boot0-8.2-zfsboot-makefile.patch | 13 -- 4 files changed, 0 insertions(+), 203 deletions(-) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest deleted file mode 100644 index b1058eb..0000000 --- a/sys-freebsd/boot0/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX boot0-7.0-gentoo.patch 5523 RMD160 d6805e228c05acfd47deb42a8363a8aac2091aec SHA1 c77f9526f0eee1ec82b4e4f851b6cc9a9da0d0a0 SHA256 deb18a75bb96314fb34da515f12af3706df711b53d6ebf0c7c2d10c3ba8a6ace -AUX boot0-8.2-zfsboot-makefile.patch 436 RMD160 2e0615b7d16389e0f659893fe1b99411fb5c9e63 SHA1 d30e0dd3cf71beec22ff8b01568f43eee435e75e SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 -DIST freebsd-contrib-9.1_rc1.tar.bz2 54330060 RMD160 9b455ff06a8a4ec62e8d5e4a3ae14243a41de7ec SHA1 b2f93389475bf368cac731f0f855a609c413d291 SHA256 b9be1e2328cd3cf5b7b010f033a1a4233e4df19bf305c6125f2442f56a895c9d -DIST freebsd-lib-9.1_rc1.tar.bz2 3210622 RMD160 be2d13a21d9938eaa832c8ee3894e098979bd528 SHA1 d89ecc023712d91203f5c583400c2e76f313ab56 SHA256 afa4631d86c0e6bc1811199e1408bc8302a72808d6a0bffcf078e6d81d9a7a12 -DIST freebsd-sys-9.1_rc1.tar.bz2 32435903 RMD160 14a7d3cec29ae5fb76e090563f15eb73e86d95a5 SHA1 c78a688b3156a136a6f9c9bf1035da878251d9ed SHA256 7c5e705cc9ca5efb60f9959a71315c118cb8cfe910c923c59a7f6180cfa86a0f -EBUILD boot0-9.1_rc1.ebuild 1178 RMD160 da55d0223bf78f52db6294cc9b8798efbe0a6d68 SHA1 af63f066eac61e71e45d8ff9b5574b89493f9b05 SHA256 88c7c10275df54bc20d131923b7a2eb764732a8af500bb721cabf64759634459 diff --git a/sys-freebsd/boot0/boot0-9.1_rc1.ebuild b/sys-freebsd/boot0/boot0-9.1_rc1.ebuild deleted file mode 100644 index c8e681e..0000000 --- a/sys-freebsd/boot0/boot0-9.1_rc1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI=2 - -inherit bsdmk freebsd flag-o-matic - -DESCRIPTION="FreeBSD's bootloader" -SLOT="0" -KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" - -IUSE="bzip2 ieee1394 tftp zfs" - -SRC_URI="mirror://gentoo/${SYS}.tar.bz2 - mirror://gentoo/${LIB}.tar.bz2 - mirror://gentoo/${CONTRIB}.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 "-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 a5830c1..0000000 --- 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 -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 diff --git a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch deleted file mode 100644 index a3a33d5..0000000 --- a/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile -index bb16ea3..7dedb49 100644 ---- a/sys/boot/i386/zfsboot/Makefile -+++ b/sys/boot/i386/zfsboot/Makefile -@@ -83,6 +83,8 @@ zfsboot.bin: zfsboot.out - zfsboot.out: ${BTXCRT} zfsboot.o sio.o drv.o cons.o util.o - ${LD} ${LDFLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} - -+drv.o: drv.c xreadorg.h -+ - zfsboot.o: zfsboot.s - - SRCS= zfsboot.c xreadorg.h