1 |
commit: fd13ad2739c8f56223857ad0a19f10ab6e4d00ec |
2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Nov 3 16:32:38 2022 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Nov 4 05:40:48 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd13ad27 |
7 |
|
8 |
sys-kernel/vanilla-kernel: Bump to 6.0.7 |
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.0.7.ebuild | 134 +++++++++++++++++++++ |
14 |
2 files changed, 136 insertions(+) |
15 |
|
16 |
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest |
17 |
index d3add21c5121..1f9c91356592 100644 |
18 |
--- a/sys-kernel/vanilla-kernel/Manifest |
19 |
+++ b/sys-kernel/vanilla-kernel/Manifest |
20 |
@@ -46,3 +46,5 @@ DIST linux-6.0.5.tar.sign 987 BLAKE2B d8c7ceab01ab36ade7322ff141fab940fc95b4126d |
21 |
DIST linux-6.0.5.tar.xz 133898040 BLAKE2B 71afe2e227bbab9b40ccbd3dda4aacbe1ba7f45b85c863c57a759a91d18d215cdc16c8bfd28e2d2bcd2a510c49b7fc84531d21695ad81895172ca6997ffe0f5a SHA512 90c0610be2bbca8841ff757b09d71c5d1efdcbc3cf0840d3f1d7a1b9a4854aa1eca36cfec0926dc191d35c5cbf71fea214097d831af2a34036c9a598f0ac55ad |
22 |
DIST linux-6.0.6.tar.sign 987 BLAKE2B 5501a11c6d3d9edac1b96a6fc17df93de7469473d1bb041c8a15e52aed2e3b748b596fe05d60efc4e594ec84d0feb10882f4f8f169707bdee16dda517174a8a9 SHA512 cc76cbcdf8e62393b207bb62bdc760b27486e2ed3b2178f1d1b5e8868aa62a0bd9a99211e28c51515f713ac161d5fe4c5eafcc762e835278f2bd29928faf323f |
23 |
DIST linux-6.0.6.tar.xz 133904196 BLAKE2B af53568340db3d63e3bbe8c5f27fff1e285b332845b9af960ee230c116e0555cc50857b6617d1b54f56e8de6717a940ff443cae9bf7dd8cc81326fe15ec6da5f SHA512 4589558159bf75d5df7b91517523d5f1415315e95da36df6fc9060aff71d235c4a63f9189d5a04a0ca91cf1dd94dac1d137c6f722b79bcdabba87aac9aa7a221 |
24 |
+DIST linux-6.0.7.tar.sign 987 BLAKE2B c5c8d081bab21ea3639f10621ec3a998eb955edaa370db3c24c77b9c2f616ef850b520f33d9cef764d7c635f859c9ae81be0f5eaa98922dc9bcb46542cc6a1fd SHA512 a4c25f637929e4209dd51513537391e22d7e09fe0bdc885309659856f5f9428b3e432838e1a3c3e875cd012560b8796dca2f9ccb40f2f305c727e599890f832e |
25 |
+DIST linux-6.0.7.tar.xz 133884956 BLAKE2B 3d40325979982cf55c507646a34405287a87de8272a7cbd43906f7f06ec75621642cba3a42cb3192d395422db9e2a4079adaa191589646d9d72157a3a410cdfe SHA512 a03e67781a3b5593e1f663907079fe4618c0259634d5f8dfed620884c2c154f45e4d371b70353f8dbc88f71148b8a31c8863b26756e81bf82699a2b72be9df8e |
26 |
|
27 |
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.7.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.7.ebuild |
28 |
new file mode 100644 |
29 |
index 000000000000..a77bd2fb0699 |
30 |
--- /dev/null |
31 |
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.7.ebuild |
32 |
@@ -0,0 +1,134 @@ |
33 |
+# Copyright 2020-2022 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.0.3-gentoo |
44 |
+GENTOO_CONFIG_VER=g3 |
45 |
+ |
46 |
+DESCRIPTION="Linux kernel built from vanilla upstream sources" |
47 |
+HOMEPAGE="https://www.kernel.org/" |
48 |
+SRC_URI+=" |
49 |
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz |
50 |
+ https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz |
51 |
+ -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz |
52 |
+ verify-sig? ( |
53 |
+ https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign |
54 |
+ ) |
55 |
+ amd64? ( |
56 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config |
57 |
+ -> kernel-x86_64-fedora.config.${CONFIG_VER} |
58 |
+ ) |
59 |
+ arm64? ( |
60 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config |
61 |
+ -> kernel-aarch64-fedora.config.${CONFIG_VER} |
62 |
+ ) |
63 |
+ ppc64? ( |
64 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config |
65 |
+ -> kernel-ppc64le-fedora.config.${CONFIG_VER} |
66 |
+ ) |
67 |
+ x86? ( |
68 |
+ https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config |
69 |
+ -> kernel-i686-fedora.config.${CONFIG_VER} |
70 |
+ ) |
71 |
+" |
72 |
+S=${WORKDIR}/${MY_P} |
73 |
+ |
74 |
+LICENSE="GPL-2" |
75 |
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86" |
76 |
+IUSE="debug hardened" |
77 |
+REQUIRED_USE="arm? ( savedconfig )" |
78 |
+ |
79 |
+BDEPEND=" |
80 |
+ debug? ( dev-util/pahole ) |
81 |
+ verify-sig? ( sec-keys/openpgp-keys-kernel ) |
82 |
+" |
83 |
+PDEPEND=" |
84 |
+ >=virtual/dist-kernel-${PV} |
85 |
+" |
86 |
+ |
87 |
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc |
88 |
+ |
89 |
+src_unpack() { |
90 |
+ if use verify-sig; then |
91 |
+ einfo "Unpacking linux-${PV}.tar.xz ..." |
92 |
+ verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ |
93 |
+ < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) |
94 |
+ assert "Unpack failed" |
95 |
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" |
96 |
+ else |
97 |
+ default |
98 |
+ fi |
99 |
+} |
100 |
+ |
101 |
+src_prepare() { |
102 |
+ default |
103 |
+ |
104 |
+ local biendian=false |
105 |
+ |
106 |
+ # prepare the default config |
107 |
+ case ${ARCH} in |
108 |
+ amd64) |
109 |
+ cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die |
110 |
+ ;; |
111 |
+ arm) |
112 |
+ return |
113 |
+ ;; |
114 |
+ arm64) |
115 |
+ cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die |
116 |
+ biendian=true |
117 |
+ ;; |
118 |
+ hppa) |
119 |
+ return |
120 |
+ ;; |
121 |
+ ppc) |
122 |
+ # assume powermac/powerbook defconfig |
123 |
+ # we still package.use.force savedconfig |
124 |
+ cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die |
125 |
+ ;; |
126 |
+ ppc64) |
127 |
+ cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die |
128 |
+ biendian=true |
129 |
+ ;; |
130 |
+ x86) |
131 |
+ cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die |
132 |
+ ;; |
133 |
+ *) |
134 |
+ die "Unsupported arch ${ARCH}" |
135 |
+ ;; |
136 |
+ esac |
137 |
+ |
138 |
+ local myversion="-dist" |
139 |
+ use hardened && myversion+="-hardened" |
140 |
+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die |
141 |
+ local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}" |
142 |
+ |
143 |
+ local merge_configs=( |
144 |
+ "${T}"/version.config |
145 |
+ "${dist_conf_path}"/base.config |
146 |
+ ) |
147 |
+ use debug || merge_configs+=( |
148 |
+ "${dist_conf_path}"/no-debug.config |
149 |
+ ) |
150 |
+ if use hardened; then |
151 |
+ merge_configs+=( "${dist_conf_path}"/hardened-base.config ) |
152 |
+ |
153 |
+ tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config ) |
154 |
+ |
155 |
+ if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then |
156 |
+ merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" ) |
157 |
+ fi |
158 |
+ fi |
159 |
+ |
160 |
+ # this covers ppc64 and aarch64_be only for now |
161 |
+ if [[ ${biendian} == true && $(tc-endian) == big ]]; then |
162 |
+ merge_configs+=( "${dist_conf_path}/big-endian.config" ) |
163 |
+ fi |
164 |
+ |
165 |
+ kernel-build_merge_configs "${merge_configs[@]}" |
166 |
+} |