1 |
commit: e0e455fdbf3aa4da6c5c98c8e4aee8a74bf3338b |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Dec 31 16:38:54 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 31 20:22:48 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0e455fd |
7 |
|
8 |
sys-kernel/gentoo-kernel: Bump to 6.1.2 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-kernel/gentoo-kernel/Manifest | 2 + |
13 |
.../gentoo-kernel/gentoo-kernel-6.1.2.ebuild | 137 +++++++++++++++++++++ |
14 |
2 files changed, 139 insertions(+) |
15 |
|
16 |
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest |
17 |
index d7561fea9dbc..a947e3b2ec26 100644 |
18 |
--- a/sys-kernel/gentoo-kernel/Manifest |
19 |
+++ b/sys-kernel/gentoo-kernel/Manifest |
20 |
@@ -8,6 +8,8 @@ DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771 |
21 |
DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f |
22 |
DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05de48739400f66253fd277167144ae0c259579e539d43ce65d2ee206a2820ec2ef288d9296c68a4dbd674c43d378102b9 SHA512 e349b8b535e8ab9f70cd01c513480cf75bd10dd2f2d5ef15f97734ecc9e481f137dc1cfa4c50f8a1a2f3549bf0142f83f7224603f881e66af130cbe1f8023496 |
23 |
DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a |
24 |
+DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1 |
25 |
+DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2 |
26 |
DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e |
27 |
DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e |
28 |
DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52 |
29 |
|
30 |
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.ebuild |
31 |
new file mode 100644 |
32 |
index 000000000000..9b9df2d2f7d4 |
33 |
--- /dev/null |
34 |
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.ebuild |
35 |
@@ -0,0 +1,137 @@ |
36 |
+# Copyright 2020-2022 Gentoo Authors |
37 |
+# Distributed under the terms of the GNU General Public License v2 |
38 |
+ |
39 |
+EAPI=8 |
40 |
+ |
41 |
+inherit kernel-build toolchain-funcs |
42 |
+ |
43 |
+MY_P=linux-${PV%.*} |
44 |
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 )) |
45 |
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 |
46 |
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo |
47 |
+CONFIG_VER=6.1.0-gentoo |
48 |
+GENTOO_CONFIG_VER=g3 |
49 |
+ |
50 |
+DESCRIPTION="Linux kernel built with Gentoo patches" |
51 |
+HOMEPAGE="https://www.kernel.org/" |
52 |
+SRC_URI+=" |
53 |
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz |
54 |
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz |
55 |
+ https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz |
56 |
+ https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz |
57 |
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz |
58 |
+ amd64? ( |
59 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config |
60 |
+ -> kernel-x86_64-fedora.config.${CONFIG_VER} |
61 |
+ ) |
62 |
+ arm64? ( |
63 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config |
64 |
+ -> kernel-aarch64-fedora.config.${CONFIG_VER} |
65 |
+ ) |
66 |
+ ppc64? ( |
67 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config |
68 |
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER} |
69 |
+ ) |
70 |
+ x86? ( |
71 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config |
72 |
+ -> kernel-i686-fedora.config.${CONFIG_VER} |
73 |
+ ) |
74 |
+" |
75 |
+S=${WORKDIR}/${MY_P} |
76 |
+ |
77 |
+LICENSE="GPL-2" |
78 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86" |
79 |
+IUSE="debug hardened" |
80 |
+REQUIRED_USE="arm? ( savedconfig ) |
81 |
+ hppa? ( savedconfig ) |
82 |
+ riscv? ( savedconfig )" |
83 |
+ |
84 |
+RDEPEND=" |
85 |
+ !sys-kernel/gentoo-kernel-bin:${SLOT} |
86 |
+" |
87 |
+BDEPEND=" |
88 |
+ debug? ( dev-util/pahole ) |
89 |
+" |
90 |
+PDEPEND=" |
91 |
+ >=virtual/dist-kernel-${PV} |
92 |
+" |
93 |
+ |
94 |
+QA_FLAGS_IGNORED=" |
95 |
+ usr/src/linux-.*/scripts/gcc-plugins/.*.so |
96 |
+ usr/src/linux-.*/vmlinux |
97 |
+ usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg |
98 |
+" |
99 |
+ |
100 |
+src_prepare() { |
101 |
+ local PATCHES=( |
102 |
+ # meh, genpatches have no directory |
103 |
+ "${WORKDIR}"/*.patch |
104 |
+ ) |
105 |
+ default |
106 |
+ |
107 |
+ local biendian=false |
108 |
+ |
109 |
+ # prepare the default config |
110 |
+ case ${ARCH} in |
111 |
+ amd64) |
112 |
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die |
113 |
+ ;; |
114 |
+ arm) |
115 |
+ return |
116 |
+ ;; |
117 |
+ arm64) |
118 |
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die |
119 |
+ biendian=true |
120 |
+ ;; |
121 |
+ hppa) |
122 |
+ return |
123 |
+ ;; |
124 |
+ ppc) |
125 |
+ # assume powermac/powerbook defconfig |
126 |
+ # we still package.use.force savedconfig |
127 |
+ cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die |
128 |
+ ;; |
129 |
+ ppc64) |
130 |
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die |
131 |
+ biendian=true |
132 |
+ ;; |
133 |
+ riscv) |
134 |
+ return |
135 |
+ ;; |
136 |
+ x86) |
137 |
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
138 |
+ ;; |
139 |
+ *) |
140 |
+ die "Unsupported arch ${ARCH}" |
141 |
+ ;; |
142 |
+ esac |
143 |
+ |
144 |
+ local myversion="-gentoo-dist" |
145 |
+ use hardened && myversion+="-hardened" |
146 |
+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die |
147 |
+ local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" |
148 |
+ |
149 |
+ local merge_configs=( |
150 |
+ "${T}"/version.config |
151 |
+ "${dist_conf_path}"/base.config |
152 |
+ ) |
153 |
+ use debug || merge_configs+=( |
154 |
+ "${dist_conf_path}"/no-debug.config |
155 |
+ ) |
156 |
+ if use hardened; then |
157 |
+ merge_configs+=( "${dist_conf_path}"/hardened-base.config ) |
158 |
+ |
159 |
+ tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) |
160 |
+ |
161 |
+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then |
162 |
+ merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
163 |
+ fi |
164 |
+ fi |
165 |
+ |
166 |
+ # this covers ppc64 and aarch64_be only for now |
167 |
+ if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
168 |
+ merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
169 |
+ fi |
170 |
+ |
171 |
+ kernel-build_merge_configs "${merge_configs[@]}" |
172 |
+} |