1 |
commit: 764fdb0c86a54be08f1acf3b3e70f017ee3b3b1f |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Mar 3 13:31:37 2023 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Mar 3 16:46:35 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=764fdb0c |
7 |
|
8 |
sys-kernel/vanilla-kernel: Bump to 6.2.2 |
9 |
|
10 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
11 |
|
12 |
sys-kernel/vanilla-kernel/Manifest | 2 + |
13 |
.../vanilla-kernel/vanilla-kernel-6.2.2.ebuild | 137 +++++++++++++++++++++ |
14 |
2 files changed, 139 insertions(+) |
15 |
|
16 |
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest |
17 |
index 635808326342..6a5c4ca67a23 100644 |
18 |
--- a/sys-kernel/vanilla-kernel/Manifest |
19 |
+++ b/sys-kernel/vanilla-kernel/Manifest |
20 |
@@ -54,3 +54,5 @@ DIST linux-6.1.14.tar.sign 989 BLAKE2B f42ab20b9e6f0c2bf0168af954d3a6a935b81964f |
21 |
DIST linux-6.1.14.tar.xz 134814408 BLAKE2B 9ad53bc025283b6ba1d426d7f24deff809c041ace336ce696266c81c832370da3590d99d8669c54aed509ae3fbdc8ffe97a8b4f2ab5fcc3dcaf44f0d32d33827 SHA512 55f57edf9cbb1076f887f061898639b6a977c1a5f80e0bee1d4d2aed22a7831609eb13cab3f5653802f1a97333976e409db18d0757b98979e3df632b576f991e |
22 |
DIST linux-6.2.1.tar.sign 987 BLAKE2B 37c7a969bbdf12b86b72c245e632e0990154e4ae57ab35da8c3efa5e092d42ba758a88739b5628775635eb0f9e8e7b007111bf63426adc0ee0ade2d1a2f984bf SHA512 70c4ee9c0a39127e0893fa639e65488d11f8f9f342de76259f28ab709842860165a200d8ba986de627628f4689bd10b1e0c95a17db9e2c909e4d4ad2aa99297c |
23 |
DIST linux-6.2.1.tar.xz 136445896 BLAKE2B 72c221e68c6bfb19b49c15c491c2ec35db045c730487e409186819620b65b605046a03df8e0c173141d1893ecf7408576b266fe1b33baa72cd44aa26458da562 SHA512 79d3465955dd557dc599fa1c18c7a68699f4febdd7264fe4e223c694e879ef5bb65fff9fad1ec5599f894ad6519bad292efbd5b9990dac3223d843f5c22c65f2 |
24 |
+DIST linux-6.2.2.tar.sign 987 BLAKE2B ee5dae47aab443841f6073b2da066ec7cb625059ed1f300c623a1d38df995055ca84a0ae4d4215826de467a3355bccc3ab9a26bc228aec4f7f0a4b2d9cc92171 SHA512 42b166f3e5a5a3d6507a1bf7c7a8801cc8f3d7f663e3580847014cb404b7043cbe395f29528a482d70514ebc55db69105303b369ca12dfd7add2fd3125ecd6e1 |
25 |
+DIST linux-6.2.2.tar.xz 136431916 BLAKE2B 7f0ace4eb3f3dbba6104adf1b64682ce3d76e96a33cd0500f9943c150b5aa17c9e25690615f9ab0bdabe33c3e13548d9cd9f1f3faecd0369554f2cb5982c44aa SHA512 749df066dee0c3e003db47f66be692f12fe57bfa06b90d68394685961764a98a299a08f20587a24cb254fe4881f4849415e47b391d824b35ded2fb67c14ed3e6 |
26 |
|
27 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.2.ebuild |
28 |
new file mode 100644 |
29 |
index 000000000000..750a7d7f1f80 |
30 |
--- /dev/null |
31 |
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.2.ebuild |
32 |
@@ -0,0 +1,137 @@ |
33 |
+# Copyright 2020-2023 Gentoo Authors |
34 |
+# Distributed under the terms of the GNU General Public License v2 |
35 |
+ |
36 |
+EAPI=8 |
37 |
+ |
38 |
+inherit kernel-build toolchain-funcs verify-sig |
39 |
+ |
40 |
+MY_P=linux-${PV} |
41 |
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 |
42 |
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo |
43 |
+CONFIG_VER=6.2.0-gentoo |
44 |
+GENTOO_CONFIG_VER=g7 |
45 |
+ |
46 |
+DESCRIPTION="Linux kernel built from vanilla upstream sources" |
47 |
+HOMEPAGE=" |
48 |
+ https://wiki.gentoo.org/wiki/Project:Distribution_Kernel |
49 |
+ https://www.kernel.org/ |
50 |
+" |
51 |
+SRC_URI+=" |
52 |
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz |
53 |
+ https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz |
54 |
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz |
55 |
+ verify-sig? ( |
56 |
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign |
57 |
+ ) |
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 ~x86" |
79 |
+IUSE="debug hardened" |
80 |
+REQUIRED_USE="arm? ( savedconfig )" |
81 |
+ |
82 |
+BDEPEND=" |
83 |
+ debug? ( dev-util/pahole ) |
84 |
+ verify-sig? ( sec-keys/openpgp-keys-kernel ) |
85 |
+" |
86 |
+PDEPEND=" |
87 |
+ >=virtual/dist-kernel-${PV} |
88 |
+" |
89 |
+ |
90 |
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc |
91 |
+ |
92 |
+src_unpack() { |
93 |
+ if use verify-sig; then |
94 |
+ einfo "Unpacking linux-${PV}.tar.xz ..." |
95 |
+ verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ |
96 |
+ < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) |
97 |
+ assert "Unpack failed" |
98 |
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" |
99 |
+ else |
100 |
+ default |
101 |
+ fi |
102 |
+} |
103 |
+ |
104 |
+src_prepare() { |
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 |
+ x86) |
134 |
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
135 |
+ ;; |
136 |
+ *) |
137 |
+ die "Unsupported arch ${ARCH}" |
138 |
+ ;; |
139 |
+ esac |
140 |
+ |
141 |
+ local myversion="-dist" |
142 |
+ use hardened && myversion+="-hardened" |
143 |
+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die |
144 |
+ local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" |
145 |
+ |
146 |
+ local merge_configs=( |
147 |
+ "${T}"/version.config |
148 |
+ "${dist_conf_path}"/base.config |
149 |
+ ) |
150 |
+ use debug || merge_configs+=( |
151 |
+ "${dist_conf_path}"/no-debug.config |
152 |
+ ) |
153 |
+ if use hardened; then |
154 |
+ merge_configs+=( "${dist_conf_path}"/hardened-base.config ) |
155 |
+ |
156 |
+ tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) |
157 |
+ |
158 |
+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then |
159 |
+ merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
160 |
+ fi |
161 |
+ fi |
162 |
+ |
163 |
+ # this covers ppc64 and aarch64_be only for now |
164 |
+ if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
165 |
+ merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
166 |
+ fi |
167 |
+ |
168 |
+ kernel-build_merge_configs "${merge_configs[@]}" |
169 |
+} |