diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /sys-freebsd/boot0 | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'sys-freebsd/boot0')
-rw-r--r-- | sys-freebsd/boot0/Manifest | 5 | ||||
-rw-r--r-- | sys-freebsd/boot0/boot0-10.1.ebuild | 96 | ||||
-rw-r--r-- | sys-freebsd/boot0/boot0-8.2.ebuild | 54 | ||||
-rw-r--r-- | sys-freebsd/boot0/boot0-9.1.ebuild | 64 | ||||
-rw-r--r-- | sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch | 26 | ||||
-rw-r--r-- | sys-freebsd/boot0/files/boot0-10.1-gcc46.patch | 67 | ||||
-rw-r--r-- | sys-freebsd/boot0/files/boot0-8.2-zfsboot-makefile.patch | 13 | ||||
-rw-r--r-- | sys-freebsd/boot0/files/boot0-9.2-gcc46.patch | 66 | ||||
-rw-r--r-- | sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch | 11 | ||||
-rw-r--r-- | sys-freebsd/boot0/metadata.xml | 9 |
10 files changed, 411 insertions, 0 deletions
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest new file mode 100644 index 000000000000..a54ad00b053f --- /dev/null +++ b/sys-freebsd/boot0/Manifest @@ -0,0 +1,5 @@ +DIST freebsd-contrib-9.1.tar.bz2 54751432 SHA256 e7ffa056d4050ce03ee8e23e276e2a9a494326a98d60c43bee2afcc59576deb8 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438 WHIRLPOOL a2a84423175499208d34809e802284d6ba649f317c3a9ad8b7312fa19efe142ebadab0048bac0db8e988e59f9a7468ac7c5d0d25e78b82bdb269a20d18153cee +DIST freebsd-lib-9.1.tar.bz2 3206685 SHA256 f31fa8107b4de711c548f6d0c1bb1f81d09f51bcc3b14a1e9e90bb0e7cc4a35d SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e WHIRLPOOL 581878bf9c43184b043b4293409b85901c9ed1f9bd279e965414aca41ba50950848ebda3ee10a503a028135dfd2765e95a11acd4e62a11c528e104392bbbd8d0 +DIST freebsd-src-10.1.tar.xz 115049476 SHA256 f919287a5ef51d4f133f27c99c54f2e8054f408d3dd53bc60f4e233cc75ec03d SHA512 4ded32b451e2807e24a06305502f88ea633b2899a7ccd9cab3dc98fc865ef91324c93c512a08cf6e295313a8d7e79aa9d7af07da40e7276d986b06419b984152 WHIRLPOOL 1eff9419d89b8a70f064171883d92e160b250cd637972eb9107a19d7b3c904b554c4f51eaa9ff9642ef2c4234bde05cf9aef16d0c39280b55084f831700dea80 +DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15 +DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3 diff --git a/sys-freebsd/boot0/boot0-10.1.ebuild b/sys-freebsd/boot0/boot0-10.1.ebuild new file mode 100644 index 000000000000..ad1175e410d4 --- /dev/null +++ b/sys-freebsd/boot0/boot0-10.1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit bsdmk freebsd flag-o-matic toolchain-funcs + +DESCRIPTION="FreeBSD's bootloader" +SLOT="0" + +IUSE="bzip2 ieee1394 tftp zfs" + +if [[ ${PV} != *9999* ]]; then + KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +fi + +EXTRACTONLY=" + sys/ + lib/ + contrib/bzip2/ +" + +RDEPEND="" +DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}* + =sys-freebsd/freebsd-lib-${RV}*" + +S="${WORKDIR}/sys/boot" + +PATCHES=( "${FILESDIR}/${PN}-10.1-gcc46.patch" + "${FILESDIR}/${PN}-10.1-drop-unsupport-cflags.patch" + "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) + +boot0_use_enable() { + use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\"" + use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= " +} + +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 +} + +src_compile() { + strip-flags + append-flags "-fno-strict-aliasing" + + if use amd64-fbsd; then + cd "${S}/userboot/libstand" || die + freebsd_src_compile + cd "${S}/userboot/zfs" || die + freebsd_src_compile + fi + + cd "${S}/libstand32" || die + freebsd_src_compile + + # bug542676 + if [[ $(tc-getCC) == *clang* ]]; then + cd "${S}/i386/btx" || die + freebsd_src_compile + cd "${S}/i386/boot2" || die + CC=${CHOST}-gcc freebsd_src_compile + fi + + cd "${WORKDIR}/lib/libstand" || die + freebsd_src_compile + + cd "${S}" + CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" + LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand" + export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a" + NOFLAGSTRIP="yes" freebsd_src_compile +} + +src_install() { + dodir /boot/defaults + mkinstall FILESDIR=/boot || die "mkinstall failed" + + cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die + insinto /boot + newins GENERIC.hints device.hints + + echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0 + doenvd "${T}"/50boot0 +} diff --git a/sys-freebsd/boot0/boot0-8.2.ebuild b/sys-freebsd/boot0/boot0-8.2.ebuild new file mode 100644 index 000000000000..e17030f53876 --- /dev/null +++ b/sys-freebsd/boot0/boot0-8.2.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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" + +PATCHES=( "${FILESDIR}"/${P}-zfsboot-makefile.patch ) + +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/boot0-9.1.ebuild b/sys-freebsd/boot0/boot0-9.1.ebuild new file mode 100644 index 000000000000..f7d9d2b31bb1 --- /dev/null +++ b/sys-freebsd/boot0/boot0-9.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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" + +PATCHES=( "${FILESDIR}/${PN}-9.2-gcc46.patch" + "${FILESDIR}/${PN}-add-nossp-cflags.patch" ) + +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" + + cd "${WORKDIR}/lib/libstand" || die + freebsd_src_compile + + cd "${S}" + CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand" + LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand" + export LIBSTAND="${WORKDIR}/lib/libstand/libstand.a" + NOFLAGSTRIP="yes" freebsd_src_compile +} + +src_install() { + dodir /boot/defaults + mkinstall FILESDIR=/boot || die "mkinstall failed" +} diff --git a/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch new file mode 100644 index 000000000000..4ab415b115b9 --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-10.1-drop-unsupport-cflags.patch @@ -0,0 +1,26 @@ +diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile +index 76ed0ca..2d1d39d 100644 +--- a/sys/boot/efi/libefi/Makefile ++++ b/sys/boot/efi/libefi/Makefile +@@ -17,7 +17,4 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand + CFLAGS+= -I${.CURDIR}/../../common + + +-# Suppress warning from clang for FreeBSD %b and %D formats +-CFLAGS+= -fformat-extensions +- + .include <bsd.lib.mk> +diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile +index d714c74..a5cfa3c 100644 +--- a/sys/boot/i386/libi386/Makefile ++++ b/sys/boot/i386/libi386/Makefile +@@ -52,9 +52,6 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../common \ + # the location of libstand + CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ + +-# Suppress warning from clang for FreeBSD %b and %D formats +-CFLAGS+= -fformat-extensions +- + .if ${MACHINE_CPUARCH} == "amd64" + CLEANFILES+= machine + machine: diff --git a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch new file mode 100644 index 000000000000..9b31e7c0d1ba --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch @@ -0,0 +1,67 @@ +diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc +index 472b275..0c9409d 100644 +--- a/sys/boot/i386/Makefile.inc ++++ b/sys/boot/i386/Makefile.inc +@@ -13,8 +13,6 @@ LDFLAGS+= -nostdlib + .if ${MACHINE_CPUARCH} == "amd64" + CFLAGS+= -m32 + ACFLAGS+= -m32 +-# LD_FLAGS is passed directly to ${LD}, not via ${CC}: +-LD_FLAGS+= -m elf_i386_fbsd + AFLAGS+= --32 + .endif + +diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile +index 428950e..6a15450 100644 +--- a/sys/boot/i386/boot2/Makefile ++++ b/sys/boot/i386/boot2/Makefile +@@ -113,3 +113,10 @@ machine: + # XXX: clang integrated-as doesn't grok .codeNN directives yet + CFLAGS.boot1.S= ${CLANG_NO_IAS} + CFLAGS+= ${CFLAGS.${.IMPSRC:T}} ++ ++# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. ++CFLAGS+= -fno-asynchronous-unwind-tables ++ ++.if ${MACHINE_CPUARCH} == "amd64" ++LD_FLAGS+= -m elf_i386_fbsd ++.endif +diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile +index a90e712..d60ae00 100644 +--- a/sys/boot/i386/gptboot/Makefile ++++ b/sys/boot/i386/gptboot/Makefile +@@ -81,3 +81,8 @@ machine: + # XXX: clang integrated-as doesn't grok .codeNN directives yet + CFLAGS.gptldr.S= ${CLANG_NO_IAS} + CFLAGS+= ${CFLAGS.${.IMPSRC:T}} ++ ++.if ${MACHINE_CPUARCH} == "amd64" ++LD_FLAGS+= -m elf_i386_fbsd ++.endif ++ +diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile +index 5eb2383..c10a917 100644 +--- a/sys/boot/i386/gptzfsboot/Makefile ++++ b/sys/boot/i386/gptzfsboot/Makefile +@@ -78,3 +78,8 @@ machine: + # XXX: clang integrated-as doesn't grok .codeNN directives yet + CFLAGS.gptldr.S= ${CLANG_NO_IAS} + CFLAGS+= ${CFLAGS.${.IMPSRC:T}} ++ ++.if ${MACHINE_CPUARCH} == "amd64" ++LD_FLAGS+= -m elf_i386_fbsd ++.endif ++ +diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile +index 149f43a..be1e46a 100644 +--- a/sys/boot/i386/zfsboot/Makefile ++++ b/sys/boot/i386/zfsboot/Makefile +@@ -91,3 +91,8 @@ machine: + # XXX: clang integrated-as doesn't grok .codeNN directives yet + CFLAGS.zfsldr.S= ${CLANG_NO_IAS} + CFLAGS+= ${CFLAGS.${.IMPSRC:T}} ++ ++.if ${MACHINE_CPUARCH} == "amd64" ++LD_FLAGS+= -m elf_i386_fbsd ++.endif ++ 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 000000000000..a3a33d5d7c5b --- /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 diff --git a/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch new file mode 100644 index 000000000000..ffd9f4351d1f --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-9.2-gcc46.patch @@ -0,0 +1,66 @@ +diff --git a/sys/boot/i386/Makefile.inc b/sys/boot/i386/Makefile.inc +index f5faec7..a9cf593 100644 +--- a/sys/boot/i386/Makefile.inc ++++ b/sys/boot/i386/Makefile.inc +@@ -12,7 +12,6 @@ LDFLAGS+= -nostdlib + .if ${MACHINE_CPUARCH} == "amd64" + CFLAGS+= -m32 + ACFLAGS+= -m32 +-LDFLAGS+= -m elf_i386_fbsd + AFLAGS+= --32 + .endif + +diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile +index 65815a5..61840dd 100644 +--- a/sys/boot/i386/boot2/Makefile ++++ b/sys/boot/i386/boot2/Makefile +@@ -109,3 +109,10 @@ machine: + # XXX: clang integrated-as doesn't grok .codeNN directives yet + CFLAGS.boot1.S= ${CLANG_NO_IAS} + CFLAGS+= ${CFLAGS.${.IMPSRC:T}} ++ ++# gcc 4.6 or later version, -fno-asynchronous-unwind-tables is required to build. ++CFLAGS+= -fno-asynchronous-unwind-tables ++ ++.if ${MACHINE_CPUARCH} == "amd64" ++LDFLAGS+= -m elf_i386_fbsd ++.endif +diff --git a/sys/boot/i386/gptboot/Makefile b/sys/boot/i386/gptboot/Makefile +index e1a640a..29886cc 100644 +--- a/sys/boot/i386/gptboot/Makefile ++++ b/sys/boot/i386/gptboot/Makefile +@@ -78,3 +78,8 @@ machine: + # XXX: clang integrated-as doesn't grok .codeNN directives yet + CFLAGS.gptldr.S= ${CLANG_NO_IAS} + CFLAGS+= ${CFLAGS.${.IMPSRC:T}} ++ ++.if ${MACHINE_CPUARCH} == "amd64" ++LDFLAGS+= -m elf_i386_fbsd ++.endif ++ +diff --git a/sys/boot/i386/gptzfsboot/Makefile b/sys/boot/i386/gptzfsboot/Makefile +index a2b8fcc..107f531 100644 +--- a/sys/boot/i386/gptzfsboot/Makefile ++++ b/sys/boot/i386/gptzfsboot/Makefile +@@ -76,3 +76,8 @@ machine: + # XXX: clang integrated-as doesn't grok .codeNN directives yet + CFLAGS.gptldr.S= ${CLANG_NO_IAS} + CFLAGS+= ${CFLAGS.${.IMPSRC:T}} ++ ++.if ${MACHINE_CPUARCH} == "amd64" ++LDFLAGS+= -m elf_i386_fbsd ++.endif ++ +diff --git a/sys/boot/i386/zfsboot/Makefile b/sys/boot/i386/zfsboot/Makefile +index b2db778..252dc62 100644 +--- a/sys/boot/i386/zfsboot/Makefile ++++ b/sys/boot/i386/zfsboot/Makefile +@@ -89,3 +89,8 @@ machine: + # XXX: clang integrated-as doesn't grok .codeNN directives yet + CFLAGS.zfsldr.S= ${CLANG_NO_IAS} + CFLAGS+= ${CFLAGS.${.IMPSRC:T}} ++ ++.if ${MACHINE_CPUARCH} == "amd64" ++LDFLAGS+= -m elf_i386_fbsd ++.endif ++ diff --git a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch new file mode 100644 index 000000000000..abc6a57bf4b0 --- /dev/null +++ b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch @@ -0,0 +1,11 @@ +https://bugs.gentoo.org/show_bug.cgi?id=511698 + +diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc +index e0039b9..533dea0 100644 +--- a/sys/boot/Makefile.inc ++++ b/sys/boot/Makefile.inc +@@ -1,3 +1,3 @@ + # $FreeBSD: release/10.0.0/sys/boot/Makefile.inc 188895 2009-02-21 15:04:31Z ru $ + +-SSP_CFLAGS= ++SSP_CFLAGS= -fno-stack-protector diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml new file mode 100644 index 000000000000..42e7fdce24f9 --- /dev/null +++ b/sys-freebsd/boot0/metadata.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> +<herd>bsd</herd> + <use> + <flag name='tftp'>Enable PXE/TFTP boot support.</flag> + <flag name='zfs'>Enable booting on ZFS filesystems.</flag> + </use> +</pkgmetadata> |