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 45C4B1381F3 for ; Thu, 29 Nov 2012 14:07:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C2588E058F; Thu, 29 Nov 2012 14:07:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 11CC5E0587 for ; Thu, 29 Nov 2012 14:07:34 +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 6C86C33DA8E for ; Thu, 29 Nov 2012 14:07:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id D4A01E5444 for ; Thu, 29 Nov 2012 14:07:31 +0000 (UTC) From: "Yuta SATOH" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yuta SATOH" Message-ID: <1354196819.82a45b55660bee177954a4f91d58ec45af52b0fd.yuta_satoh@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_rc3.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: yuta_satoh X-VCS-Committer-Name: Yuta SATOH X-VCS-Revision: 82a45b55660bee177954a4f91d58ec45af52b0fd X-VCS-Branch: master Date: Thu, 29 Nov 2012 14:07:31 +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: 98328904-f220-4885-859e-a09edc961da7 X-Archives-Hash: d576c28f8465b3ebb92afd6da989dbe9 commit: 82a45b55660bee177954a4f91d58ec45af52b0fd Author: Yuta SATOH gentoo gr jp> AuthorDate: Thu Nov 29 13:46:59 2012 +0000 Commit: Yuta SATOH 0x100 com> CommitDate: Thu Nov 29 13:46:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoo-bsd.git;a=commit;h=82a45b55 add sys-freebsd/boot0 -- fix fails to build using clang or >=gcc-4.6, bug 409815 --- sys-freebsd/boot0/Manifest | 6 + sys-freebsd/boot0/boot0-9.1_rc3.ebuild | 62 +++++++++ sys-freebsd/boot0/files/boot0-7.0-gentoo.patch | 131 ++++++++++++++++++++ .../boot0/files/boot0-8.2-zfsboot-makefile.patch | 13 ++ 4 files changed, 212 insertions(+), 0 deletions(-) diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest new file mode 100644 index 0000000..c3500b9 --- /dev/null +++ b/sys-freebsd/boot0/Manifest @@ -0,0 +1,6 @@ +AUX boot0-7.0-gentoo.patch 5523 SHA256 deb18a75bb96314fb34da515f12af3706df711b53d6ebf0c7c2d10c3ba8a6ace SHA512 0601b498a610ddd2880288ff83ebedfbbdc96a3811d457e6cbf10394d7a385b18cee51559b3f24896fc6047f55f84e85cb01ad50c81e42da098c42fdc9bcdbab WHIRLPOOL 8f88bbec2e010a0a2a39f4b152ca54bb8438f1cd62f21f900f9667fd40ed6ef2c84a38a1392ab438443deafac39a88d8a792d5711b877231539db3b9736f3e0a +AUX boot0-8.2-zfsboot-makefile.patch 436 SHA256 74a494fce8011f018542a54d6d188c1aa9977b982a3b0c333ea64445dbfab994 SHA512 2d2c1572415362eed73580b681a6e6cd95b1f4abb415221e8904097ac078c620223ca652282404c4f1881dcb605f25f126b53ec0b8409ad4fbbd9bed603ba7c2 WHIRLPOOL ddf074f25ebf256f543cd5ceb8e64934cc045e6dc81f49ef14aad009de69c84309d0b7927c87ff36c75c008fae975e25708b9ec8f21cb083bba77daf3e5107d4 +DIST freebsd-contrib-9.1_rc3.tar.bz2 54754779 SHA256 90613296d804b3632902fb6fe180e6c2525ef29ba02a11efc3d73657b0476a8b SHA512 6564c77b02f472e063c439d2cbfd3bbdbd7d6507d9591eb020d0748fafa9eaaab1927f06c379f2b059f515cb2f77e13c5337f856866f0210be34d9a803885f20 WHIRLPOOL a2db66d867c4c65c7f95d627e38ea3615b650bd0eadda722e2f5e38cb34167c7c822dbe5a87b02d16bb11f37605e306764aef50368b54a8beb8cd39537702ea0 +DIST freebsd-lib-9.1_rc3.tar.bz2 3205238 SHA256 da7001a8c23fcc614b230414cb830c12d7b238c38a15c905c695c5a1621c10f8 SHA512 761219c55b0ac067685057b519e506869fba6c472179f9d151b0e12eeacad11004ec2ec504953ace7139694c934785555e98bc16b41a248470241464599e6914 WHIRLPOOL 653258d8752cfc401a632ca59a05cce02821cf1ca279696463c6c0f71e761853617b9b0f51b1849e89b4067dc1799b1b4c528644bcd42b260af0f851caccc63e +DIST freebsd-sys-9.1_rc3.tar.bz2 32605500 SHA256 5194ac93850aff4f10978b739573ab8ee54a95a0b2d4e46f754314ae381b442b SHA512 17cd41ea66bf1d2e10b56001e6e1c80db78e1572aff4ad1ac945bc24d38dfef612e1a4b7eead8bc50b94df798b0bde3dcc13a0596860322569272b3239a30b9b WHIRLPOOL 8628c5a97675b3fe4ebfcb92c4fb6d5aebaa3a11551e4f16004a6ffb23b3d10334b623c70f255762038bf1fc80a7a27abd587f10ac9706ac1bb0b22adda266b8 +EBUILD boot0-9.1_rc3.ebuild 1684 SHA256 fbbc75d601f244e7dda562e80a5abbf328fdcac57eb2b688b46a348980139c6d SHA512 e2f02b804e5fcea503f736cc15bdcd1be4963fbd5f78dd40757d2bd8c9e3620f45a3abc5aa2c9d2c6c99c71a0eacd919a4c7fab34de03713edfd8be4153851cf WHIRLPOOL 0f3015ab9626d1a9c789224f3e51ac91455955c5d49374161e2a42f001ff6a39d6a670b9b4ff2d836712feb70c19d00670818dd779c8d68d069109985450cd52 diff --git a/sys-freebsd/boot0/boot0-9.1_rc3.ebuild b/sys-freebsd/boot0/boot0-9.1_rc3.ebuild new file mode 100644 index 0000000..a369539 --- /dev/null +++ b/sys-freebsd/boot0/boot0-9.1_rc3.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/boot0/boot0-9.1_rc3.ebuild,v 1.1 2012/11/06 12:52:54 aballier Exp $ + +EAPI=2 + +inherit bsdmk freebsd flag-o-matic toolchain-funcs + +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 '/-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 + + # gcc-4.6 or later version support, bug #409815 + if ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -ge 6 ]] ) ; then + sed -i -e '/-m elf_i386_fbsd/d' "${S}"/i386/Makefile.inc || die + for dir in boot2 gptboot gptzfsboot zfsboot; do + echo "LDFLAGS+= -m elf_i386_fbsd" >> "${S}"/i386/${dir}/Makefile || die + done + echo "CFLAGS+= -fno-asynchronous-unwind-tables" >> "${S}"/i386/boot2/Makefile || die + fi +} + +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 new file mode 100644 index 0000000..a5830c1 --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-7.0-gentoo.patch @@ -0,0 +1,131 @@ +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 new file mode 100644 index 0000000..a3a33d5 --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch @@ -0,0 +1,13 @@ +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