summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuta Satoh <nigoro.dev@gmail.com>2018-01-02 21:53:21 +0900
committerMichał Górny <mgorny@gentoo.org>2018-01-02 17:51:12 +0100
commitf7a1b8befe4d9e75e09387616a9d2aea57164727 (patch)
treec99816da346349faca6869bcf2d76cc4b00ba31d /sys-freebsd/boot0
parentvirtualbox packages: Removed old. (diff)
downloadgentoo-f7a1b8befe4d9e75e09387616a9d2aea57164727.tar.gz
gentoo-f7a1b8befe4d9e75e09387616a9d2aea57164727.tar.bz2
gentoo-f7a1b8befe4d9e75e09387616a9d2aea57164727.zip
sys-freebsd: remove 10.3 and 11.0.
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'sys-freebsd/boot0')
-rw-r--r--sys-freebsd/boot0/Manifest3
-rw-r--r--sys-freebsd/boot0/boot0-10.3.ebuild82
-rw-r--r--sys-freebsd/boot0/boot0-11.0-r1.ebuild86
-rw-r--r--sys-freebsd/boot0/files/boot0-10.1-gcc46.patch67
-rw-r--r--sys-freebsd/boot0/files/boot0-10.3-clang.patch30
-rw-r--r--sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch28
-rw-r--r--sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch33
-rw-r--r--sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch21
8 files changed, 0 insertions, 350 deletions
diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
index 51688a4ced89..a7da7dded3a7 100644
--- a/sys-freebsd/boot0/Manifest
+++ b/sys-freebsd/boot0/Manifest
@@ -1,8 +1,5 @@
-DIST boot0-EN-1618-loader.patch 1092 BLAKE2B f96401394ca0b8a9ab364b5e4dbffeef49f75d86c0936067f4bcdf0e74598dad043d99b2dbf09dc5dd00e2f06cc338b7259d454aa56e1a501b66b176763fb74d SHA512 c2d28dc48289683c009a783db59ce62008a8d9231d4ea5b1ebe6dac2d6d0d86a285524195be9a806c23fbc2ceb6e159fcd7a7e8d01fe973b6ea6d154bfca298c
DIST freebsd-contrib-9.1.tar.bz2 54751432 BLAKE2B 8a30e78021e6388d679637d2dbe0ed3f4896d3902064baaafa79de9c328171cbcb895b0ffd3d0d0cd3ca25c93a73584ed4900b45bd672a73b15b75721de59de5 SHA512 71be13049258c6e6b5e4f63cc16da5d349a89d68f04d87446e4ad33ae8bf2a93ea67d9c256b7bec60b61e65db0487268070cfb77a484c3ac0f8ba368b48c2438
DIST freebsd-lib-9.1.tar.bz2 3206685 BLAKE2B 67f93b7951fc03e877ee525d53b81ba49c8c1a70041c30aac97665d5dab7b3f2817fdb3bbb1475be66c33a7f996309e9020f1a3d1154fab8e2f6789f5ae0bb18 SHA512 40d0c36b6b889c404fa0e0afa38ba4e84a55bc88ffa2f98a70afbd7a32c4f32c158617ba770567d082a986d62c09b3ec8db3dc5ab853ee1c9bbe0b90bb82396e
-DIST freebsd-src-10.3.tar.xz 126900216 BLAKE2B d238527895bde90905f25538e69f430135a41a9d68681d9acdacd1410fb88983e21400f6d5ee937bb05bd23f7ac93675c94937363218f8bd158da0970185efa6 SHA512 a0c95fc4bbc5ad7599d0a83651a497e85cd85a5c433e5e175c57480b466c9eb5aa0390804d6336da8301c75ad499484399d39b8f7efbcfda8cafb09b1aa12d8f
-DIST freebsd-src-11.0.tar.xz 140252356 BLAKE2B 78c9e446111034f2d334597b261deeab489af1841f411e8ee8b7d39ebff6965698dfbefca3f41034cb03760f55cbc36e9e134bc935e925b2109005c21e4a4c86 SHA512 ee1271bb38ee46fbab3d49b33f5b5afd76f9402b2e792581d63f02272df8e2a4011fac97ad550434f0c2fc5fe241940276629bde55e75f8638896a81339870cd
DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
DIST freebsd-sys-8.2.tar.bz2 25835329 BLAKE2B f7300d820037909984b4ab4c7400425877385070ed7955e9be367dbbaa31f1f868d1c11c8aec1fd5911cd9a82849e1776bb1da63f87dfe339bcef9069da017cb SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3
DIST freebsd-sys-9.1.tar.bz2 32588103 BLAKE2B 7f94a4735c6a17b39a86fa0fda0682924b18e4b466dc6319a5df889522aaeaffaa87e1b76582c48ae034df8c20169c8cea93bbd3d6e7abd0526716686f88dfe8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d
diff --git a/sys-freebsd/boot0/boot0-10.3.ebuild b/sys-freebsd/boot0/boot0-10.3.ebuild
deleted file mode 100644
index d33328cf5f42..000000000000
--- a/sys-freebsd/boot0/boot0-10.3.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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.3-clang.patch"
- "${FILESDIR}/${PN}-10.3-drop-unsupport-cflags.patch"
- "${FILESDIR}/${PN}-10.3-uefi-support.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
-
- export MAKEOBJDIRPREFIX="${WORKDIR}/build"
-}
-
-src_compile() {
- strip-flags
- append-flags "-fno-strict-aliasing"
-
- cd "${WORKDIR}/lib/libstand" || die
- freebsd_src_compile
-
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
- LDFLAGS="${LDFLAGS} -L${WORKDIR}/lib/libstand"
- export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a"
-
- cd "${S}" || die
- 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-11.0-r1.ebuild b/sys-freebsd/boot0/boot0-11.0-r1.ebuild
deleted file mode 100644
index 1b56c9159994..000000000000
--- a/sys-freebsd/boot0/boot0-11.0-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bsdmk freebsd flag-o-matic toolchain-funcs
-
-DESCRIPTION="FreeBSD's bootloader"
-SLOT="0"
-
-IUSE="bzip2 ieee1394 tftp zfs"
-
-# Security Advisory and Errata patches.
-UPSTREAM_PATCHES=( "EN-16:18/loader.patch" )
-
-if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
- SRC_URI="${SRC_URI}
- $(freebsd_upstream_patches)"
-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}-11.0-gcc46.patch"
- "${FILESDIR}/${PN}-11.0-uefi-support.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
-
- mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes"
- export MAKEOBJDIRPREFIX="${WORKDIR}/build"
-}
-
-src_compile() {
- strip-flags
- append-flags "-fno-strict-aliasing"
-
- cd "${WORKDIR}/lib/libstand" || die
- freebsd_src_compile
-
- CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
- LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand"
- export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a"
-
- cd "${S}" || die
- NOFLAGSTRIP="yes" freebsd_src_compile
-}
-
-src_install() {
- dodir /boot/defaults
- freebsd_src_install FILESDIR=/boot
-
- 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/files/boot0-10.1-gcc46.patch b/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch
deleted file mode 100644
index 9b31e7c0d1ba..000000000000
--- a/sys-freebsd/boot0/files/boot0-10.1-gcc46.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-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-10.3-clang.patch b/sys-freebsd/boot0/files/boot0-10.3-clang.patch
deleted file mode 100644
index 4245e21a96e1..000000000000
--- a/sys-freebsd/boot0/files/boot0-10.3-clang.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=542676
-
-https://svnweb.freebsd.org/base/head/sys/boot/i386/boot2/Makefile?r1=272249&r2=276479
-
-diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
-index 8a6e771..c030853 100644
---- a/sys/boot/i386/boot2/Makefile
-+++ b/sys/boot/i386/boot2/Makefile
-@@ -22,8 +22,7 @@ BOOT2_UFS?= UFS1_AND_UFS2
- #BOOT2_UFS?= UFS2_ONLY
- #BOOT2_UFS?= UFS1_ONLY
-
--CFLAGS= -Os \
-- -fomit-frame-pointer \
-+CFLAGS= -fomit-frame-pointer \
- -mrtd \
- -mregparm=3 \
- -DUSE_XREAD \
-@@ -40,7 +39,10 @@ CFLAGS= -Os \
- -Winline \
- ${CLANG_OPT_SMALL}
-
--CFLAGS.gcc+= -fno-guess-branch-probability \
-+CFLAGS.clang+= -Oz
-+
-+CFLAGS.gcc+= -Os \
-+ -fno-guess-branch-probability \
- -fno-unit-at-a-time \
- --param max-inline-insns-single=100
- .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201
diff --git a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch b/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch
deleted file mode 100644
index af1d3512e7da..000000000000
--- a/sys-freebsd/boot0/files/boot0-10.3-drop-unsupport-cflags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/sys/boot/efi/libefi/Makefile b/sys/boot/efi/libefi/Makefile
-index fc66e01..470453d 100644
---- a/sys/boot/efi/libefi/Makefile
-+++ b/sys/boot/efi/libefi/Makefile
-@@ -17,9 +17,6 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand
- # Pick up the bootstrap header for some interface items
- CFLAGS+= -I${.CURDIR}/../../common
-
--
--# Suppress warning from clang for FreeBSD %b and %D formats
--CFLAGS+= -fformat-extensions
- CFLAGS+= -DTERM_EMU
-
- .include <bsd.lib.mk>
-diff --git a/sys/boot/i386/libi386/Makefile b/sys/boot/i386/libi386/Makefile
-index 24cc4c1..e5d2bae 100644
---- a/sys/boot/i386/libi386/Makefile
-+++ b/sys/boot/i386/libi386/Makefile
-@@ -55,9 +55,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.3-uefi-support.patch b/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch
deleted file mode 100644
index fdafe74252bc..000000000000
--- a/sys-freebsd/boot0/files/boot0-10.3-uefi-support.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/efi/Makefile b/efi/Makefile
-index 30024e3..a33efb2 100644
---- a/efi/Makefile
-+++ b/efi/Makefile
-@@ -2,15 +2,10 @@
-
- .include <bsd.own.mk>
-
--# In-tree GCC does not support __attribute__((ms_abi)).
--.if ${COMPILER_TYPE} != "gcc"
--
- .if ${MACHINE_CPUARCH} == "amd64"
- SUBDIR+= libefi loader boot1
- .endif
-
--.endif # ${COMPILER_TYPE} != "gcc"
--
- .if ${MACHINE_CPUARCH} == "ia64"
- SUBDIR+= libefi
- .endif
-diff --git a/efi/boot1/Makefile b/efi/boot1/Makefile
-index 4ffdfda..8ec0e00 100644
---- a/efi/boot1/Makefile
-+++ b/efi/boot1/Makefile
-@@ -64,7 +64,7 @@ LDFLAGS+= -Wl,-znocombreloc
- # Add libstand for required string and memory functions for all platforms.
- #
- DPADD+= ${LIBSTAND}
--LDADD+= -lstand
-+LDADD+= ${LIBSTAND}
-
- DPADD+= ${LDSCRIPT}
-
diff --git a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch b/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch
deleted file mode 100644
index c7a69d62aa8b..000000000000
--- a/sys-freebsd/boot0/files/boot0-11.0-uefi-support.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/sys/boot/efi/Makefile b/sys/boot/efi/Makefile
-index 79ee9a9..f7789f1 100644
---- a/sys/boot/efi/Makefile
-+++ b/sys/boot/efi/Makefile
-@@ -4,7 +4,7 @@
-
- # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
- # than 4.5 supports it.
--.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500
-+.if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
-
- .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm"
- .if ${MK_FDT} != "no"
-@@ -18,6 +18,6 @@ SUBDIR+= fdt
- SUBDIR+= libefi loader boot1
- .endif
-
--.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 404500
-+.endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
-
- .include <bsd.subdir.mk>