1 |
commit: 0119324233524d3b3489eb85996c0a362f3b8c5c |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 11 15:13:23 2019 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 11 15:16:35 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01193242 |
7 |
|
8 |
sys-freebsd/freebsd-sources: 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 | 1 - |
14 |
sys-freebsd/freebsd-sources/Manifest | 15 -- |
15 |
sys-freebsd/freebsd-sources/files/config-GENTOO | 4 - |
16 |
.../files/freebsd-sources-10.1-gcc48.patch | 18 -- |
17 |
.../files/freebsd-sources-11.0-gentoo-gcc.patch | 13 -- |
18 |
.../files/freebsd-sources-11.0-gentoo.patch | 22 --- |
19 |
.../files/freebsd-sources-6.0-flex-2.5.31.patch | 22 --- |
20 |
.../files/freebsd-sources-7.1-includes.patch | 13 -- |
21 |
.../freebsd-sources-8.0-subnet-route-pr40133.patch | 21 --- |
22 |
.../freebsd-sources-9.0-disable-optimization.patch | 32 ---- |
23 |
.../files/freebsd-sources-9.0-sysctluint.patch | 13 -- |
24 |
.../freebsd-sources/freebsd-sources-11.1_p2.ebuild | 159 ----------------- |
25 |
.../freebsd-sources/freebsd-sources-11.1_p3.ebuild | 188 --------------------- |
26 |
sys-freebsd/freebsd-sources/metadata.xml | 13 -- |
27 |
14 files changed, 534 deletions(-) |
28 |
|
29 |
diff --git a/profiles/package.mask b/profiles/package.mask |
30 |
index 3648096336d..2fbdf5f1658 100644 |
31 |
--- a/profiles/package.mask |
32 |
+++ b/profiles/package.mask |
33 |
@@ -757,7 +757,6 @@ sys-freebsd/freebsd-pam-modules |
34 |
sys-freebsd/freebsd-pf |
35 |
sys-freebsd/freebsd-rescue |
36 |
sys-freebsd/freebsd-share |
37 |
-sys-freebsd/freebsd-sources |
38 |
|
39 |
# Lars Wendler <polynomial-c@g.o> (2019-09-04) |
40 |
# Unofficial build. Superseded by official 2.49.5 release. |
41 |
|
42 |
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest |
43 |
deleted file mode 100644 |
44 |
index 6a22e2a51a3..00000000000 |
45 |
--- a/sys-freebsd/freebsd-sources/Manifest |
46 |
+++ /dev/null |
47 |
@@ -1,15 +0,0 @@ |
48 |
-DIST freebsd-sources-11.1_p3-patchset.tar.xz 36348 BLAKE2B b88f8a0f0bfde97a0416967c76ffb1d8fcb3f9050d69caa83941ab38e289622a9a5d25887e895d364f333980f7ab21af454d6fbe48157119279b4a0b600856ff SHA512 c981eee806ad93ebc720434789da1ae38f21a131ec8f92c3e55dab4e5fbc61e225c615132bb971e2b9bf4bc6922b2c7bdd9117644e8ba6547c20857deea0bbc1 |
49 |
-DIST freebsd-sources-EN-1707-vnet.patch 356 BLAKE2B 6e586e8cc767c0f177b6f1175512c4d5bd4fdf9abb94b644348dbe8b681d4838bdba8c83496ae351fb075329fed4e270bdd8768ce63e8c99fc69ba36d3040d8c SHA512 2fdb58388acb98811588beeabaf8a533926f96ac3f594f53dd80dcdb38ede4fe0dd66f0dd7bb32b40a27f756e2b03fed91c4416cbdcd4c16dd8143f5438885d7 |
50 |
-DIST freebsd-sources-EN-1708-pf.patch 706 BLAKE2B 7b812c1d696f2a1ab6e648228fe4fce8b8e32f57ed8dc713b24db5dacca70e693ee24001f0db168d79c528e2c20c6011ac423629a807949757e9f468969c3127 SHA512 e9dc61ff10aafb9b92721c599577ce995458b8a1a93b31fc6cc39b910db2b8f965ff0354a45bf82d2d57abba7aa0bf6d2f002044d242e19121d5ee4cd7a1dc15 |
51 |
-DIST freebsd-sources-EN-1804-mem.11.patch 2932 BLAKE2B 41eb2445cbc9a339f21b64ae0aa64b477c6691540236b8b3c378475fa3f451b35f3e9793eae240f15364b39b0a9fda0971c92f4dadb0933c103a933db154a718 SHA512 feb22d2cc614c0fc80eea5410894a9f0c091ec77e01810fe1476a8702624331e3a45d44e1de15945586dfa0a334a12442f46e61ad148fa555e4900d486f79185 |
52 |
-DIST freebsd-sources-EN-1805-mem.11.1.patch 4106 BLAKE2B 598b12547f66e1cb3b915878bb37f73c6a028655f78cb50f8fb113af4c0a31f6ba82f884de4b79151b6512bc67aa8a2cc404c5bce6ffcf07dada37426eb5082c SHA512 ec80584da7ba7f6d0b6039b9a4acb151b18fcf5671a805c52911a97fc53cc5bcc5cfe427d37f91fcb130f437a134eed7d746b652131591fc28986d18d5b3a48c |
53 |
-DIST freebsd-sources-EN-1807-pmap.patch 1639 BLAKE2B 437379a0471f1c36dcebfcce471d1e65426773c96a18ad4f4272c3617cecedce45b6a09a518a45947b36d1e1d47aa485839f24fa24d4b8dea14fd9f7fb5b480f SHA512 f3a482fc573ccee1ed779a3fc4bbd5c54a0a93395ca83e4e5b36293ce3b298545b4f9e1bb91c557d00d89890a2ef3c425e966077de4fccdb670059519bb75b44 |
54 |
-DIST freebsd-sources-SA-1708-ptrace.patch 696 BLAKE2B d040de29c3aca8fbc5d837c574e5ee81196ba41f1a90720579e854ba4e9786e23545547892d4e6d90c850161a53aaef7de014cbb918c45a261aea56b02cd2d7b SHA512 973bfe4e594fe34340ae723b3451a1b84a9877b51e1e14e8cd0a9944bec5bc4efec6ff39ba61998c1da1f2c2df0fe17272b3dad2e2cc3880cfa0ff6017d2730e |
55 |
-DIST freebsd-sources-SA-1710-kldstat.patch 2155 BLAKE2B e2c47d72a4a497283d7def916cdf0991b5ec791f545736474db18301866362b3c96f0a4ac5e7c1c2a91535961ac048e5e1c1e7ad10d10ced3dba954453a04ef5 SHA512 a5cc0acfcac8401fb4066fd5bfbaa1c5718a38f05877b8fb1c5a9cce1df9af4a82bd1c263c80c2b58ad058349753dcec9c4aa13bdb178f3b80493785badc65a4 |
56 |
-DIST freebsd-sources-SA-1801-ipsec-11.patch 1153 BLAKE2B bc7b0fb85a5d03873cf8dc61c2478b450167f8d0d5f9094c14cf9a3647a9d1ecdee8245ba45e70270aa95e21f112a0c10978a57b41ecbafa0a5392c101bef4b0 SHA512 034777a8f5bacd73ae989747bdb1669747d7af0e1655cb033e95068a2318063301b05a2ddbb3debbfd32f938c77bef1614535b6a667a511bf3f0287fb6e1667c |
57 |
-DIST freebsd-sources-SA-1804-vt.patch 640 BLAKE2B 2cf3dcecfac7b33136c47c5fad23840c98c19ae7690fdd6520eacb4779d3101a615a1416c5337a0fe740cc56d7ea19ed4de9481ccced73a5322610950637fecb SHA512 461ca668363f1b334b626b7256830d1abe249d8c76417e524a366a2643676c8681127cd8c326dfe7cd1b1ee3ad67fb4819f08fd2a2db9b5b7a108171e8777a5b |
58 |
-DIST freebsd-sources-SA-1805-ipsec.patch 3182 BLAKE2B 43c7e5b80a4b552c167efcca392fc1ec5d6aed3c425d081a63b9e221aed92f891674fc6f9b17805e449c806422d4b8624e773e4b463d50b51ec629197a014004 SHA512 116d9a6d67452863e5dc12124ad3bad4a29c472755235e65f97f474e048ba7f9a4711d0f73d1301072aa31281d3f444fded4b6e429e4f28367c713708402d33a |
59 |
-DIST freebsd-sources-SA-1806-debugreg.11.1.patch 10505 BLAKE2B 1071869efe163bcba8b118cde3eb85a5a3cf31f589f270735b63d9f670a12d17fcf4bca297d266c5d8a89e73ee20abaf0ef0193a1d9d5cbce934e34946cee827 SHA512 06386a69b386f05ecb115d8dd511ca2afa6b8fe18290eab92357b111e62277b7180ea116620ce854a12ae6f42f997a0d57db8c7fdeb42584f8711c23ab50db44 |
60 |
-DIST freebsd-sources-SA-1807-lazyfpu-11.patch 10024 BLAKE2B 0dfa6e0a86d6227230a686963f80dbc4c512486471c02577d769110899e74e8064f3cdab45afb29a8283bf9423bd521c085d70174560361529b21fddea1787a6 SHA512 932cead50235a77b8bb0a41b600e7bb1722dd5b5d95601d30041a953b0c1a6a421d794138f1b6adfcb71e5e1904f09288e8ec3a8ce7f9c879ad8d9c77ffdb162 |
61 |
-DIST freebsd-sources-SA-1809-l1tf-11.1.patch 5357 BLAKE2B f7b93d61a63827908afc66fd5f28b15c4e951a7f50038eba92f7d3b824c771fb22fc6ea4e55316c0565ac73e2f27af0f39a189a7ee3f8914ed4d87819208959d SHA512 9920f43f5cf26bc72b7cb704276073a1f44a57dec340cdd369d119465d3f4a6585fa760d164c246c101f629af30d74c249b2892e5b25f17534a1d7caff98263c |
62 |
-DIST freebsd-src-11.1.tar.xz 147661560 BLAKE2B a9e6ba9d0e12c8b56ac58575d5f02931edbb6a3545d9dccae78810d2d0470a29b29dd7f724b03b8afafbca23717a71346e4cfbd3530e0f40118a23609c3f414e SHA512 b97707ec7a601ca6bcb682c45f6d94a38484301ac24630d7285eff6f88b027ce6900c93fc62f8ce36e0cf32c91f73a9d1c999db397b7f8782fd74a8551a03aca |
63 |
|
64 |
diff --git a/sys-freebsd/freebsd-sources/files/config-GENTOO b/sys-freebsd/freebsd-sources/files/config-GENTOO |
65 |
deleted file mode 100644 |
66 |
index 7c7eb26cccc..00000000000 |
67 |
--- a/sys-freebsd/freebsd-sources/files/config-GENTOO |
68 |
+++ /dev/null |
69 |
@@ -1,4 +0,0 @@ |
70 |
-# Kernel configuration for Gentoo/FreeBSD. |
71 |
-include GENERIC |
72 |
-ident GENTOO |
73 |
- |
74 |
|
75 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch |
76 |
deleted file mode 100644 |
77 |
index 5cb4cf809b1..00000000000 |
78 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-10.1-gcc48.patch |
79 |
+++ /dev/null |
80 |
@@ -1,18 +0,0 @@ |
81 |
-https://svnweb.freebsd.org/base?view=revision&revision=281606 |
82 |
- |
83 |
-diff --git a/sys/crypto/aesni/aesencdec.h b/sys/crypto/aesni/aesencdec.h |
84 |
-index d4ed8b3..79847ee 100644 |
85 |
---- a/sys/crypto/aesni/aesencdec.h |
86 |
-+++ b/sys/crypto/aesni/aesencdec.h |
87 |
-@@ -27,6 +27,11 @@ |
88 |
- * |
89 |
- */ |
90 |
- |
91 |
-+#if defined(__GNUC__) && defined(_KERNEL) |
92 |
-+/* Suppress inclusion of gcc's mm_malloc.h header */ |
93 |
-+#define _MM_MALLOC_H_INCLUDED 1 |
94 |
-+#endif |
95 |
-+ |
96 |
- #include <wmmintrin.h> |
97 |
- |
98 |
- static inline void |
99 |
|
100 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch |
101 |
deleted file mode 100644 |
102 |
index 1d3c8d68a2e..00000000000 |
103 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo-gcc.patch |
104 |
+++ /dev/null |
105 |
@@ -1,13 +0,0 @@ |
106 |
-diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh |
107 |
-index e4b2ad4..411bedf 100644 |
108 |
---- a/sys/conf/newvers.sh |
109 |
-+++ b/sys/conf/newvers.sh |
110 |
-@@ -110,7 +110,7 @@ else |
111 |
- t=`date` |
112 |
- fi |
113 |
- i=`${MAKE:-make} -V KERN_IDENT` |
114 |
--compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep -w 'version') |
115 |
-+compiler_v=$($(${MAKE:-make} -V CC) -v 2>&1 | grep 'version' | tail -n 1) |
116 |
- |
117 |
- for dir in /usr/bin /usr/local/bin; do |
118 |
- if [ ! -z "${svnversion}" ] ; then |
119 |
|
120 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch |
121 |
deleted file mode 100644 |
122 |
index 6acd6aab360..00000000000 |
123 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-11.0-gentoo.patch |
124 |
+++ /dev/null |
125 |
@@ -1,22 +0,0 @@ |
126 |
-diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk |
127 |
-index e27ea93..615dbac 100644 |
128 |
---- a/sys/conf/kern.mk |
129 |
-+++ b/sys/conf/kern.mk |
130 |
-@@ -5,7 +5,7 @@ |
131 |
- # |
132 |
- CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ |
133 |
- -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ |
134 |
-- -Wundef -Wno-pointer-sign ${FORMAT_EXTENSIONS} \ |
135 |
-+ -Wundef -Wno-pointer-sign \ |
136 |
- -Wmissing-include-dirs -fdiagnostics-show-option \ |
137 |
- -Wno-unknown-pragmas \ |
138 |
- ${CWARNEXTRA} |
139 |
-@@ -86,7 +86,7 @@ FORMAT_EXTENSIONS= -fformat-extensions |
140 |
- # Setting -mno-sse implies -mno-sse2, -mno-sse3, -mno-ssse3, -mno-sse41 and -mno-sse42 |
141 |
- # |
142 |
- .if ${MACHINE_CPUARCH} == "i386" |
143 |
--CFLAGS.gcc+= -mno-align-long-strings -mpreferred-stack-boundary=2 |
144 |
-+CFLAGS.gcc+= -mpreferred-stack-boundary=2 |
145 |
- CFLAGS.clang+= -mno-aes -mno-avx |
146 |
- CFLAGS+= -mno-mmx -mno-sse -msoft-float |
147 |
- INLINE_LIMIT?= 8000 |
148 |
|
149 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch |
150 |
deleted file mode 100644 |
151 |
index 88710cf69dd..00000000000 |
152 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-6.0-flex-2.5.31.patch |
153 |
+++ /dev/null |
154 |
@@ -1,22 +0,0 @@ |
155 |
-Index: fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l |
156 |
-=================================================================== |
157 |
---- fbsd-6.orig/sys/dev/aic7xxx/aicasm/aicasm_scan.l |
158 |
-+++ fbsd-6/sys/dev/aic7xxx/aicasm/aicasm_scan.l |
159 |
-@@ -528,7 +528,7 @@ expand_macro(struct symbol *macro_symbol |
160 |
- |
161 |
- /* Put back everything up until the replacement. */ |
162 |
- while (body_pos > next_match) |
163 |
-- unput(*--body_pos); |
164 |
-+ yyunput(*--body_pos, body_head); |
165 |
- |
166 |
- /* Perform the replacement. */ |
167 |
- if (match_marg != NULL) { |
168 |
-@@ -537,7 +537,7 @@ expand_macro(struct symbol *macro_symbol |
169 |
- next_match = match_marg->replacement_text; |
170 |
- strp = next_match + strlen(next_match); |
171 |
- while (strp > next_match) |
172 |
-- unput(*--strp); |
173 |
-+ yyunput(*--strp, next_match); |
174 |
- |
175 |
- /* Skip past the unexpanded macro arg. */ |
176 |
- body_pos -= match.rm_eo - match.rm_so; |
177 |
|
178 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch |
179 |
deleted file mode 100644 |
180 |
index 3db46fa1d7e..00000000000 |
181 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-7.1-includes.patch |
182 |
+++ /dev/null |
183 |
@@ -1,13 +0,0 @@ |
184 |
-Make headers usable alone, include the headers they need. |
185 |
-There are probably much more missing. |
186 |
- |
187 |
---- sys/net/if.h.old 2009-05-15 10:51:50 +0000 |
188 |
-+++ sys/net/if.h 2009-05-15 10:52:05 +0000 |
189 |
-@@ -34,6 +34,7 @@ |
190 |
- #define _NET_IF_H_ |
191 |
- |
192 |
- #include <sys/cdefs.h> |
193 |
-+#include <sys/socket.h> |
194 |
- |
195 |
- #ifdef _KERNEL |
196 |
- #include <sys/queue.h> |
197 |
|
198 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch |
199 |
deleted file mode 100644 |
200 |
index a7335f6d427..00000000000 |
201 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-8.0-subnet-route-pr40133.patch |
202 |
+++ /dev/null |
203 |
@@ -1,21 +0,0 @@ |
204 |
-Fixes changing the default subnet route after removing an ip address. |
205 |
- |
206 |
-See: http://www.netbsd.org/cgi-bin/query-pr-single.pl?number=40133 |
207 |
-and http://mail-index.netbsd.org/tech-net/2008/12/03/msg000896.html |
208 |
- |
209 |
-Thanks to Roy Marples. |
210 |
---- sys/netinet/in.c.orig |
211 |
-+++ sys/netinet/in.c |
212 |
-@@ -858,6 +858,12 @@ |
213 |
- error = rtinit(&target->ia_ifa, (int)RTM_ADD, flags); |
214 |
- if (!error) |
215 |
- target->ia_flags |= IFA_ROUTE; |
216 |
-+ else if (error == EEXIST) { |
217 |
-+ /* |
218 |
-+ * the fact that the route already exists is not an error. |
219 |
-+ */ |
220 |
-+ error = 0; |
221 |
-+ } |
222 |
- return (error); |
223 |
- } |
224 |
- |
225 |
|
226 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch |
227 |
deleted file mode 100644 |
228 |
index 4824ff6e1a0..00000000000 |
229 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-disable-optimization.patch |
230 |
+++ /dev/null |
231 |
@@ -1,32 +0,0 @@ |
232 |
-Taken from debian GNU/kFreeBSD. |
233 |
- |
234 |
-Regretably, with GCC 4.4 or later this is the only flag combination |
235 |
-I could find that doesn't cause kernel panics CPU triple-faults or |
236 |
-other kind of severe breakage. This is Gentoo Bug #410945. |
237 |
- |
238 |
-Clang can use -O2, so we do not force -O1 on it |
239 |
- |
240 |
---- a/sys/conf/kern.pre.mk |
241 |
-+++ b/sys/conf/kern.pre.mk |
242 |
-@@ -41,6 +41,9 @@ |
243 |
- .if !empty(COPTFLAGS:M-O[23s]) && empty(COPTFLAGS:M-fno-strict-aliasing) |
244 |
- COPTFLAGS+= -fno-strict-aliasing |
245 |
- .endif |
246 |
-+.if ${CC:T:Mclang} != "clang" && !empty(COPTFLAGS:M-O[23s]) |
247 |
-+COPTFLAGS+= -O1 |
248 |
-+.endif |
249 |
- .if !defined(NO_CPU_COPTFLAGS) |
250 |
- COPTFLAGS+= ${_CPUCFLAGS} |
251 |
- .endif |
252 |
---- a/sys/conf/kmod.mk |
253 |
-+++ b/sys/conf/kmod.mk |
254 |
-@@ -91,6 +91,9 @@ |
255 |
- .if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) |
256 |
- CFLAGS+= -fno-strict-aliasing |
257 |
- .endif |
258 |
-+.if ${CC:T:Mclang} != "clang" && !empty(CFLAGS:M-O[23s]) |
259 |
-+CFLAGS+= -O1 |
260 |
-+.endif |
261 |
- WERROR?= -Werror |
262 |
- CFLAGS+= ${WERROR} |
263 |
- CFLAGS+= -D_KERNEL |
264 |
|
265 |
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch |
266 |
deleted file mode 100644 |
267 |
index 751a77c843b..00000000000 |
268 |
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.0-sysctluint.patch |
269 |
+++ /dev/null |
270 |
@@ -1,13 +0,0 @@ |
271 |
-u_int is defined in sys/types.h |
272 |
-makes header usable alone. |
273 |
- |
274 |
---- sys/sys/sysctl.h.old 2012-05-25 11:08:53.000000000 -0400 |
275 |
-+++ sys/sys/sysctl.h 2012-05-25 11:09:16.000000000 -0400 |
276 |
-@@ -788,6 +788,7 @@ |
277 |
- struct sysctl_req *); |
278 |
- #else /* !_KERNEL */ |
279 |
- #include <sys/cdefs.h> |
280 |
-+#include <sys/types.h> /* for u_int */ |
281 |
- |
282 |
- __BEGIN_DECLS |
283 |
- int sysctl(const int *, u_int, void *, size_t *, const void *, size_t); |
284 |
|
285 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild |
286 |
deleted file mode 100644 |
287 |
index 32b3d46dc93..00000000000 |
288 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p2.ebuild |
289 |
+++ /dev/null |
290 |
@@ -1,159 +0,0 @@ |
291 |
-# Copyright 1999-2018 Gentoo Foundation |
292 |
-# Distributed under the terms of the GNU General Public License v2 |
293 |
- |
294 |
-EAPI=5 |
295 |
- |
296 |
-inherit bsdmk freebsd flag-o-matic toolchain-funcs |
297 |
- |
298 |
-DESCRIPTION="FreeBSD kernel sources" |
299 |
-SLOT="0" |
300 |
-LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )" |
301 |
- |
302 |
-IUSE="+build-kernel debug dtrace zfs" |
303 |
- |
304 |
-# Security Advisory and Errata patches. |
305 |
-UPSTREAM_PATCHES=( "SA-17:08/ptrace.patch" |
306 |
- "SA-17:10/kldstat.patch" |
307 |
- "EN-17:07/vnet.patch" |
308 |
- "EN-17:08/pf.patch" ) |
309 |
- |
310 |
-if [[ ${PV} != *9999* ]]; then |
311 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
312 |
- SRC_URI="${SRC_URI} |
313 |
- $(freebsd_upstream_patches)" |
314 |
-fi |
315 |
- |
316 |
-EXTRACTONLY="sys/" |
317 |
- |
318 |
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
319 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
320 |
- !sys-freebsd/virtio-kmod |
321 |
- !sys-fs/fuse4bsd |
322 |
- !<sys-freebsd/freebsd-sources-9.2_beta1" |
323 |
-DEPEND="build-kernel? ( |
324 |
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
325 |
- >=sys-freebsd/freebsd-usbin-9.1 |
326 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
327 |
- )" |
328 |
- |
329 |
-RESTRICT="strip binchecks" |
330 |
- |
331 |
-S="${WORKDIR}/sys" |
332 |
- |
333 |
-KERN_BUILD=GENTOO |
334 |
- |
335 |
-PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch" |
336 |
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" |
337 |
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" |
338 |
- "${FILESDIR}/${PN}-7.1-includes.patch" |
339 |
- "${FILESDIR}/${PN}-9.0-sysctluint.patch" |
340 |
- "${FILESDIR}/${PN}-11.0-gentoo.patch" |
341 |
- "${FILESDIR}/${PN}-11.0-gentoo-gcc.patch" |
342 |
- "${FILESDIR}/${PN}-10.1-gcc48.patch" ) |
343 |
- |
344 |
-pkg_setup() { |
345 |
- # Add the required source files. |
346 |
- use dtrace && EXTRACTONLY+="cddl/ " |
347 |
- |
348 |
- # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 |
349 |
- [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" |
350 |
- use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL=" |
351 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS=" |
352 |
-} |
353 |
- |
354 |
-src_prepare() { |
355 |
- local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" |
356 |
- |
357 |
- # This replaces the gentoover patch, it doesn't need reapply every time. |
358 |
- sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ |
359 |
- -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ |
360 |
- -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ |
361 |
- "${S}/conf/newvers.sh" |
362 |
- |
363 |
- # __FreeBSD_cc_version comes from FreeBSD's gcc. |
364 |
- # on 11.0-RELEASE it's 1100001. |
365 |
- # FYI, we can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h. |
366 |
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1100001:g" \ |
367 |
- -i "${S}/conf/kern.pre.mk" \ |
368 |
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" |
369 |
- |
370 |
- # Remove -Werror |
371 |
- sed -e "s:-Werror:-Wno-error:g" \ |
372 |
- -i "${S}/conf/kern.pre.mk" \ |
373 |
- -i "${S}/conf/kmod.mk" || die |
374 |
- |
375 |
- # Set the kernel configuration using USE flags. |
376 |
- cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die |
377 |
- use debug || echo 'nomakeoptions DEBUG' >> "${conf}" |
378 |
- use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" |
379 |
- |
380 |
- # hyperv fails to compile on x86-fbsd. |
381 |
- if use x86-fbsd && [[ $(tc-getCC) == *gcc* ]] ; then |
382 |
- echo 'nodevice hyperv' >> "${conf}" |
383 |
- dummy_mk modules/hyperv |
384 |
- fi |
385 |
- |
386 |
- # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. |
387 |
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL |
388 |
-} |
389 |
- |
390 |
-src_configure() { |
391 |
- if use build-kernel ; then |
392 |
- tc-export CC |
393 |
- cd "${S}/$(tc-arch-kernel)/conf" || die |
394 |
- config ${KERN_BUILD} || die |
395 |
- fi |
396 |
-} |
397 |
- |
398 |
-src_compile() { |
399 |
- if use build-kernel ; then |
400 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
401 |
- freebsd_src_compile depend |
402 |
- freebsd_src_compile |
403 |
- else |
404 |
- einfo "Nothing to compile.." |
405 |
- fi |
406 |
-} |
407 |
- |
408 |
-src_install() { |
409 |
- if use build-kernel ; then |
410 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
411 |
- freebsd_src_install |
412 |
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" |
413 |
- cd "${S}" |
414 |
- fi |
415 |
- |
416 |
- insinto "/usr/src/sys" |
417 |
- doins -r "${S}/". |
418 |
- if use dtrace ; then |
419 |
- insinto "/usr/src/cddl" |
420 |
- doins -r "${WORKDIR}/cddl/". |
421 |
- fi |
422 |
-} |
423 |
- |
424 |
-pkg_preinst() { |
425 |
- if [[ -L "${ROOT}/usr/src/sys" ]]; then |
426 |
- einfo "/usr/src/sys is a symlink, removing it..." |
427 |
- rm -f "${ROOT}/usr/src/sys" |
428 |
- fi |
429 |
- |
430 |
-# if use sparc-fbsd ; then |
431 |
-# ewarn "WARNING: kldload currently causes kernel panics" |
432 |
-# ewarn "on sparc64. This is probably a gcc-4.1 issue, but" |
433 |
-# ewarn "we need gcc-4.1 to compile the kernel correctly :/" |
434 |
-# ewarn "Please compile all modules you need into the kernel" |
435 |
-# fi |
436 |
- |
437 |
- ewarn "If you want to manually compile (not recommended), please don't forget the following steps." |
438 |
-# if ! use sparc-fbsd ; then |
439 |
-# ewarn "export CC=clang" |
440 |
-# ewarn "export CXX=clang++" |
441 |
-# fi |
442 |
- if ! use zfs ; then |
443 |
- ewarn "export WITHOUT_CDDL=" |
444 |
- ewarn "Note, Please set USE=zfs if you want to enable modules under the CDDL." |
445 |
- fi |
446 |
- if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then |
447 |
- ewarn "The GENERIC config requires sys-freebsd/freebsd-cddl. Please emerge it." |
448 |
- fi |
449 |
-} |
450 |
|
451 |
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p3.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p3.ebuild |
452 |
deleted file mode 100644 |
453 |
index 2fb9e00362f..00000000000 |
454 |
--- a/sys-freebsd/freebsd-sources/freebsd-sources-11.1_p3.ebuild |
455 |
+++ /dev/null |
456 |
@@ -1,188 +0,0 @@ |
457 |
-# Copyright 1999-2018 Gentoo Foundation |
458 |
-# Distributed under the terms of the GNU General Public License v2 |
459 |
- |
460 |
-EAPI=5 |
461 |
- |
462 |
-inherit bsdmk freebsd flag-o-matic toolchain-funcs |
463 |
- |
464 |
-DESCRIPTION="FreeBSD kernel sources" |
465 |
-SRC_URI+=" |
466 |
- https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.xz" |
467 |
- |
468 |
-SLOT="0" |
469 |
-LICENSE="BSD dtrace? ( CDDL ) zfs? ( CDDL )" |
470 |
- |
471 |
-IUSE="+build-kernel debug dtrace zfs" |
472 |
- |
473 |
-# Security Advisory and Errata patches. |
474 |
-# (commented out patches go via FILESDIR/PATCHES) |
475 |
-UPSTREAM_PATCHES=( |
476 |
- "SA-17:08/ptrace.patch" |
477 |
- "SA-17:10/kldstat.patch" |
478 |
- "EN-17:07/vnet.patch" |
479 |
- "EN-17:08/pf.patch" |
480 |
- "SA-18:01/ipsec-11.patch" |
481 |
-# "SA-18:03/speculative_execution-amd64-11.patch" |
482 |
- "SA-18:04/vt.patch" |
483 |
- "SA-18:05/ipsec.patch" |
484 |
- "EN-18:04/mem.11.patch" |
485 |
- "EN-18:05/mem.11.1.patch" |
486 |
- "SA-18:06/debugreg.11.1.patch" |
487 |
- "SA-18:07/lazyfpu-11.patch" |
488 |
- "EN-18:07/pmap.patch" |
489 |
-# "SA-18:08/tcp-11.patch" |
490 |
- "SA-18:09/l1tf-11.1.patch" |
491 |
-# "SA-18:10/ip.patch" |
492 |
-) |
493 |
- |
494 |
-if [[ ${PV} != *9999* ]]; then |
495 |
- KEYWORDS="~amd64-fbsd ~x86-fbsd" |
496 |
- SRC_URI="${SRC_URI} |
497 |
- $(freebsd_upstream_patches)" |
498 |
-fi |
499 |
- |
500 |
-EXTRACTONLY="sys/" |
501 |
- |
502 |
-RDEPEND="dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
503 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
504 |
- !sys-freebsd/virtio-kmod |
505 |
- !sys-fs/fuse4bsd |
506 |
- !<sys-freebsd/freebsd-sources-9.2_beta1" |
507 |
-DEPEND="build-kernel? ( |
508 |
- dtrace? ( >=sys-freebsd/freebsd-cddl-9.2_rc1 ) |
509 |
- >=sys-freebsd/freebsd-usbin-9.1 |
510 |
- =sys-freebsd/freebsd-mk-defs-${RV}* |
511 |
- )" |
512 |
- |
513 |
-RESTRICT="strip binchecks" |
514 |
- |
515 |
-S="${WORKDIR}/sys" |
516 |
- |
517 |
-KERN_BUILD=GENTOO |
518 |
- |
519 |
-PATCHES=( |
520 |
- "${FILESDIR}/${PN}-9.0-disable-optimization.patch" |
521 |
- "${FILESDIR}/${PN}-6.0-flex-2.5.31.patch" |
522 |
- "${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch" |
523 |
- "${FILESDIR}/${PN}-7.1-includes.patch" |
524 |
- "${FILESDIR}/${PN}-9.0-sysctluint.patch" |
525 |
- "${FILESDIR}/${PN}-11.0-gentoo.patch" |
526 |
- "${FILESDIR}/${PN}-11.0-gentoo-gcc.patch" |
527 |
- "${FILESDIR}/${PN}-10.1-gcc48.patch" |
528 |
- |
529 |
- "${WORKDIR}/${P}-patchset/${PN}-SA-1803-speculative_execution-amd64-11.patch" |
530 |
- "${WORKDIR}/${P}-patchset/${PN}-SA-1808-tcp-11.patch" |
531 |
- "${WORKDIR}/${P}-patchset/${PN}-SA-1810-ip.patch" |
532 |
-) |
533 |
- |
534 |
-pkg_setup() { |
535 |
- # Add the required source files. |
536 |
- use dtrace && EXTRACTONLY+="cddl/ " |
537 |
- |
538 |
- # WITHOUT_SSP= is required to boot kernel that compiled with newer gcc, bug #477914 |
539 |
- [[ $(tc-getCC) == *gcc* ]] && mymakeopts="${mymakeopts} WITHOUT_SSP= WITHOUT_FORMAT_EXTENSIONS=" |
540 |
- use dtrace || mymakeopts="${mymakeopts} WITHOUT_CDDL=" |
541 |
- use zfs || mymakeopts="${mymakeopts} WITHOUT_ZFS=" |
542 |
-} |
543 |
- |
544 |
-src_unpack() { |
545 |
- unpack "${P}-patchset.tar.xz" |
546 |
- freebsd_src_unpack |
547 |
-} |
548 |
- |
549 |
-src_prepare() { |
550 |
- local conf="${S}/$(tc-arch-kernel)/conf/${KERN_BUILD}" |
551 |
- |
552 |
- # This replaces the gentoover patch, it doesn't need reapply every time. |
553 |
- sed -i -e 's:^REVISION=.*:REVISION="'${PVR}'":' \ |
554 |
- -e 's:^BRANCH=.*:BRANCH="Gentoo":' \ |
555 |
- -e 's:^VERSION=.*:VERSION="${TYPE} ${BRANCH} ${REVISION}":' \ |
556 |
- "${S}/conf/newvers.sh" |
557 |
- |
558 |
- # __FreeBSD_cc_version comes from FreeBSD's gcc. |
559 |
- # on 11.0-RELEASE it's 1100001. |
560 |
- # FYI, we can get it from gnu/usr.bin/cc/cc_tools/freebsd-native.h. |
561 |
- sed -e "s:-D_KERNEL:-D_KERNEL -D__FreeBSD_cc_version=1100001:g" \ |
562 |
- -i "${S}/conf/kern.pre.mk" \ |
563 |
- -i "${S}/conf/kmod.mk" || die "Couldn't set __FreeBSD_cc_version" |
564 |
- |
565 |
- # Remove -Werror |
566 |
- sed -e "s:-Werror:-Wno-error:g" \ |
567 |
- -i "${S}/conf/kern.pre.mk" \ |
568 |
- -i "${S}/conf/kmod.mk" || die |
569 |
- |
570 |
- # Set the kernel configuration using USE flags. |
571 |
- cp -f "${FILESDIR}/config-GENTOO" "${conf}" || die |
572 |
- use debug || echo 'nomakeoptions DEBUG' >> "${conf}" |
573 |
- use dtrace || echo 'nomakeoptions WITH_CTF' >> "${conf}" |
574 |
- |
575 |
- # hyperv fails to compile on x86-fbsd. |
576 |
- if use x86-fbsd && [[ $(tc-getCC) == *gcc* ]] ; then |
577 |
- echo 'nodevice hyperv' >> "${conf}" |
578 |
- dummy_mk modules/hyperv |
579 |
- fi |
580 |
- |
581 |
- # Only used with USE=build-kernel, let the kernel build with its own flags, its safer. |
582 |
- unset LDFLAGS CFLAGS CXXFLAGS ASFLAGS KERNEL |
583 |
-} |
584 |
- |
585 |
-src_configure() { |
586 |
- if use build-kernel ; then |
587 |
- tc-export CC |
588 |
- cd "${S}/$(tc-arch-kernel)/conf" || die |
589 |
- config ${KERN_BUILD} || die |
590 |
- fi |
591 |
-} |
592 |
- |
593 |
-src_compile() { |
594 |
- if use build-kernel ; then |
595 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
596 |
- freebsd_src_compile depend |
597 |
- freebsd_src_compile |
598 |
- else |
599 |
- einfo "Nothing to compile.." |
600 |
- fi |
601 |
-} |
602 |
- |
603 |
-src_install() { |
604 |
- if use build-kernel ; then |
605 |
- cd "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" || die |
606 |
- freebsd_src_install |
607 |
- rm -rf "${S}/$(tc-arch-kernel)/compile/${KERN_BUILD}" |
608 |
- cd "${S}" |
609 |
- fi |
610 |
- |
611 |
- insinto "/usr/src/sys" |
612 |
- doins -r "${S}/". |
613 |
- if use dtrace ; then |
614 |
- insinto "/usr/src/cddl" |
615 |
- doins -r "${WORKDIR}/cddl/". |
616 |
- fi |
617 |
-} |
618 |
- |
619 |
-pkg_preinst() { |
620 |
- if [[ -L "${ROOT}/usr/src/sys" ]]; then |
621 |
- einfo "/usr/src/sys is a symlink, removing it..." |
622 |
- rm -f "${ROOT}/usr/src/sys" |
623 |
- fi |
624 |
- |
625 |
-# if use sparc-fbsd ; then |
626 |
-# ewarn "WARNING: kldload currently causes kernel panics" |
627 |
-# ewarn "on sparc64. This is probably a gcc-4.1 issue, but" |
628 |
-# ewarn "we need gcc-4.1 to compile the kernel correctly :/" |
629 |
-# ewarn "Please compile all modules you need into the kernel" |
630 |
-# fi |
631 |
- |
632 |
- ewarn "If you want to manually compile (not recommended), please don't forget the following steps." |
633 |
-# if ! use sparc-fbsd ; then |
634 |
-# ewarn "export CC=clang" |
635 |
-# ewarn "export CXX=clang++" |
636 |
-# fi |
637 |
- if ! use zfs ; then |
638 |
- ewarn "export WITHOUT_CDDL=" |
639 |
- ewarn "Note, Please set USE=zfs if you want to enable modules under the CDDL." |
640 |
- fi |
641 |
- if ! use dtrace && ! has_version '>=sys-freebsd/freebsd-cddl-9.2_beta1' ; then |
642 |
- ewarn "The GENERIC config requires sys-freebsd/freebsd-cddl. Please emerge it." |
643 |
- fi |
644 |
-} |
645 |
|
646 |
diff --git a/sys-freebsd/freebsd-sources/metadata.xml b/sys-freebsd/freebsd-sources/metadata.xml |
647 |
deleted file mode 100644 |
648 |
index 3860e8098ad..00000000000 |
649 |
--- a/sys-freebsd/freebsd-sources/metadata.xml |
650 |
+++ /dev/null |
651 |
@@ -1,13 +0,0 @@ |
652 |
-<?xml version="1.0" encoding="UTF-8"?> |
653 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
654 |
-<pkgmetadata> |
655 |
-<maintainer type="project"> |
656 |
- <email>bsd@g.o</email> |
657 |
- <name>BSD Project</name> |
658 |
- </maintainer> |
659 |
- <use> |
660 |
- <flag name="build-kernel">Build and install a kernel (recommended).</flag> |
661 |
- <flag name="dtrace">Enable DTrace support.</flag> |
662 |
- <flag name="zfs">Enable ZFS support.</flag> |
663 |
- </use> |
664 |
-</pkgmetadata> |