Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: profiles/, sys-freebsd/boot0/, sys-freebsd/boot0/files/
Date: Fri, 11 Oct 2019 15:17:00
Message-Id: 1570807004.785cfa5ce80982fcb0d0d5b3ed097b2efaf0d9a9.mgorny@gentoo
1 commit: 785cfa5ce80982fcb0d0d5b3ed097b2efaf0d9a9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 11 15:15:58 2019 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 11 15:16:44 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=785cfa5c
7
8 sys-freebsd/boot0: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/683284
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 profiles/package.mask | 17 -----
14 sys-freebsd/boot0/Manifest | 1 -
15 sys-freebsd/boot0/boot0-11.1.ebuild | 86 ----------------------
16 sys-freebsd/boot0/files/boot0-11.0-gcc46.patch | 14 ----
17 .../boot0/files/boot0-add-nossp-cflags.patch | 11 ---
18 sys-freebsd/boot0/metadata.xml | 12 ---
19 6 files changed, 141 deletions(-)
20
21 diff --git a/profiles/package.mask b/profiles/package.mask
22 index 086f537028d..568436850f2 100644
23 --- a/profiles/package.mask
24 +++ b/profiles/package.mask
25 @@ -733,23 +733,6 @@ dev-libs/cgicc
26 # Removal in 30 days. Bug #691264.
27 dev-libs/actor-framework
28
29 -# Michał Górny <mgorny@g.o> (2019-09-11)
30 -# Gentoo/FreeBSD project is effectively dead. The core packages are
31 -# outdated and vulnerable. We do not have a fully working install,
32 -# and I have not been able to find anyone knowing how to create one.
33 -# Leaf packages are failing to build more and more frequently, some
34 -# simply because of our outdated base system. The profiles were marked
35 -# exp two months ago not to stall other developers, core packages are
36 -# masked for at least two months, and nowadays they have unsatisfied
37 -# dependencies already.
38 -#
39 -# If anyone wishes to take the effort over, please consider it urgent.
40 -# If not, I will slowly start removing remaining parts of FreeBSD
41 -# after this batch, and checking which packages can be salvaged.
42 -#
43 -# Removal in 30 days. Bug #683284.
44 -sys-freebsd/boot0
45 -
46 # Lars Wendler <polynomial-c@g.o> (2019-09-04)
47 # Unofficial build. Superseded by official 2.49.5 release.
48 # Masked for removal.
49
50 diff --git a/sys-freebsd/boot0/Manifest b/sys-freebsd/boot0/Manifest
51 deleted file mode 100644
52 index f3dcd89d595..00000000000
53 --- a/sys-freebsd/boot0/Manifest
54 +++ /dev/null
55 @@ -1 +0,0 @@
56 -DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca
57
58 diff --git a/sys-freebsd/boot0/boot0-11.1.ebuild b/sys-freebsd/boot0/boot0-11.1.ebuild
59 deleted file mode 100644
60 index 6b33a6891f7..00000000000
61 --- a/sys-freebsd/boot0/boot0-11.1.ebuild
62 +++ /dev/null
63 @@ -1,86 +0,0 @@
64 -# Copyright 1999-2018 Gentoo Foundation
65 -# Distributed under the terms of the GNU General Public License v2
66 -
67 -EAPI=5
68 -
69 -inherit bsdmk freebsd flag-o-matic toolchain-funcs
70 -
71 -DESCRIPTION="FreeBSD's bootloader"
72 -SLOT="0"
73 -
74 -IUSE="bzip2 ieee1394 tftp zfs"
75 -
76 -# Security Advisory and Errata patches.
77 -# UPSTREAM_PATCHES=()
78 -
79 -if [[ ${PV} != *9999* ]]; then
80 - KEYWORDS="~amd64-fbsd ~x86-fbsd"
81 - SRC_URI="${SRC_URI}
82 - $(freebsd_upstream_patches)"
83 -fi
84 -
85 -EXTRACTONLY="
86 - sys/
87 - lib/
88 - contrib/bzip2/
89 - contrib/zlib/
90 -"
91 -
92 -RDEPEND=""
93 -DEPEND="=sys-freebsd/freebsd-mk-defs-${RV}*
94 - =sys-freebsd/freebsd-lib-${RV}*"
95 -
96 -S="${WORKDIR}/sys/boot"
97 -
98 -PATCHES=( "${FILESDIR}/${PN}-11.0-gcc46.patch"
99 - "${FILESDIR}/${PN}-add-nossp-cflags.patch" )
100 -
101 -boot0_use_enable() {
102 - use ${1} && mymakeopts="${mymakeopts} LOADER_${2}_SUPPORT=\"yes\""
103 - use ${1} || mymakeopts="${mymakeopts} WITHOUT_${2}= "
104 -}
105 -
106 -pkg_setup() {
107 - boot0_use_enable ieee1394 FIREWIRE
108 - boot0_use_enable zfs ZFS
109 - boot0_use_enable tftp TFTP
110 - boot0_use_enable bzip2 BZIP2
111 -}
112 -
113 -src_prepare() {
114 - sed -e '/-mno-align-long-strings/d' \
115 - -i "${S}"/i386/boot2/Makefile \
116 - -i "${S}"/i386/gptboot/Makefile \
117 - -i "${S}"/i386/gptzfsboot/Makefile \
118 - -i "${S}"/i386/zfsboot/Makefile || die
119 -
120 - mymakeopts="${mymakeopts} LOADER_NO_GELI_SUPPORT=yes"
121 - export MAKEOBJDIRPREFIX="${WORKDIR}/build"
122 -}
123 -
124 -src_compile() {
125 - strip-flags
126 - append-flags "-fno-strict-aliasing"
127 -
128 - cd "${WORKDIR}/lib/libstand" || die
129 - freebsd_src_compile
130 -
131 - CFLAGS="${CFLAGS} -I${WORKDIR}/lib/libstand"
132 - LDFLAGS="${LDFLAGS} -L${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand"
133 - export LIBSTAND="${MAKEOBJDIRPREFIX}/${WORKDIR}/lib/libstand/libstand.a"
134 -
135 - cd "${S}" || die
136 - NOFLAGSTRIP="yes" freebsd_src_compile
137 -}
138 -
139 -src_install() {
140 - dodir /boot/defaults
141 - freebsd_src_install FILESDIR=/boot
142 -
143 - cd "${WORKDIR}/sys/$(tc-arch-kernel)/conf" || die
144 - insinto /boot
145 - newins GENERIC.hints device.hints
146 -
147 - echo 'CONFIG_PROTECT="/boot/device.hints"' > "${T}"/50boot0
148 - doenvd "${T}"/50boot0
149 -}
150
151 diff --git a/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch b/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch
152 deleted file mode 100644
153 index ec17d92b579..00000000000
154 --- a/sys-freebsd/boot0/files/boot0-11.0-gcc46.patch
155 +++ /dev/null
156 @@ -1,14 +0,0 @@
157 -diff --git a/sys/boot/i386/boot2/Makefile b/sys/boot/i386/boot2/Makefile
158 -index ead9ad1..af5e021 100644
159 ---- a/sys/boot/i386/boot2/Makefile
160 -+++ b/sys/boot/i386/boot2/Makefile
161 -@@ -45,6 +45,9 @@ CFLAGS.gcc+= -Os \
162 - .if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} <= 40201
163 - CFLAGS.gcc+= -mno-align-long-strings
164 - .endif
165 -+.if ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} >= 40600
166 -+CFLAGS.gcc+= -fno-asynchronous-unwind-tables
167 -+.endif
168 -
169 - CFLAGS.clang+= -Oz ${CLANG_OPT_SMALL}
170 -
171
172 diff --git a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch b/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch
173 deleted file mode 100644
174 index abc6a57bf4b..00000000000
175 --- a/sys-freebsd/boot0/files/boot0-add-nossp-cflags.patch
176 +++ /dev/null
177 @@ -1,11 +0,0 @@
178 -https://bugs.gentoo.org/show_bug.cgi?id=511698
179 -
180 -diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc
181 -index e0039b9..533dea0 100644
182 ---- a/sys/boot/Makefile.inc
183 -+++ b/sys/boot/Makefile.inc
184 -@@ -1,3 +1,3 @@
185 - # $FreeBSD: release/10.0.0/sys/boot/Makefile.inc 188895 2009-02-21 15:04:31Z ru $
186 -
187 --SSP_CFLAGS=
188 -+SSP_CFLAGS= -fno-stack-protector
189
190 diff --git a/sys-freebsd/boot0/metadata.xml b/sys-freebsd/boot0/metadata.xml
191 deleted file mode 100644
192 index d9f0c832419..00000000000
193 --- a/sys-freebsd/boot0/metadata.xml
194 +++ /dev/null
195 @@ -1,12 +0,0 @@
196 -<?xml version="1.0" encoding="UTF-8"?>
197 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
198 -<pkgmetadata>
199 -<maintainer type="project">
200 - <email>bsd@g.o</email>
201 - <name>BSD Project</name>
202 - </maintainer>
203 - <use>
204 - <flag name="tftp">Enable PXE/TFTP boot support.</flag>
205 - <flag name="zfs">Enable booting on ZFS filesystems.</flag>
206 - </use>
207 -</pkgmetadata>