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: sys-kernel/vanilla-kernel/
Date: Mon, 05 Sep 2022 17:43:46
Message-Id: 1662399806.a179645d80e820b206e3d4384fdc7af9a75a5513.mgorny@gentoo
1 commit: a179645d80e820b206e3d4384fdc7af9a75a5513
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 5 13:31:01 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 5 17:43:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a179645d
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.65
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-5.15.65.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 323605e48d39..7e86def4c7a4 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -26,6 +26,8 @@ DIST linux-5.15.63.tar.sign 991 BLAKE2B 855d118b3164e1ea14789647f173000eaaee7dfc
21 DIST linux-5.15.63.tar.xz 126441480 BLAKE2B 95264d45411bb0ba30b0eadc2847075d0763bdc22aa86b250861ea18066a1b16b88627c61d0829d7b0a21e9e478df064a54b343ecb2065b37a011bc0cad986c6 SHA512 a1b33476484b9ca7a105d07b70835ad7e7e670750e6beb428ce23fe1bd853d66cd8a1ffca9ee736a98a42b98191d290127e628d33118be971c661e2fc6faf8ca
22 DIST linux-5.15.64.tar.sign 991 BLAKE2B 0f6101a3f7d34da6f5bccc3178741089442625a7bc240468b4469510d5a769292928bb6f4d5c9141c81defaf097bedb67e8c110b0a966832b71f20a318e46eac SHA512 84c37bcb8a53f8d1f0e8fc3061efb7ab8e2ef476374bc2fc92985c51876bf5895a18fc67d9e35c32065ef35eca3d4bd120705c647e4f4c41e666a24c602dba30
23 DIST linux-5.15.64.tar.xz 126437284 BLAKE2B 05ffdbc86b13f9a892ac8d4969dad06f6da27981627a9591b6e0bc44b9460cc00aacbc573407ceff438448e02e2d14edd3eb920a0ded958bb6864bc4b7c988ed SHA512 3445baa4f53ab8108af576ca06596071cb12be7d67d93899c0819fa2feae4fff551e702a91357f798f920a0f7fd6cd38f2c1cb66cf60b6cc10142e503fe21b85
24 +DIST linux-5.15.65.tar.sign 991 BLAKE2B 23b3a75c1f23f76d57f9072ab0b0269c31628ac5bb83d34869abcdbdaf7ed7570d779caa885fe1637f5f5db62e4855c513f731172ed122aafdc4ac145c933fa4 SHA512 59f6e56475bad3f988c79c9a408479839a1d507a4fc38e9b09e5d3822dea4021465dadec6d2507fbcac36ed32651fc641ff554f7b1fb386a3a41cddaa61febd3
25 +DIST linux-5.15.65.tar.xz 126447020 BLAKE2B a5205f703e3c2722c3712c14317624e576faecebea10e8f75ef681aa53bc2138058cef4a18b92c758562b7fcb5545f3e78f9c8091e18f0bd55c791baedbe1699 SHA512 39a782a76ab4a840373bae2d7f4ef0cf1a63d60e3cd78b8515184da639badb34642abdb27677ffac0344efe187a161d2ae87ac11d78f401074c21945e0c8bbee
26 DIST linux-5.19.6.tar.sign 989 BLAKE2B af1848224de41fea363df3d6ef1a3d923d242c232e384f960cd813df1f733f4f59bebf61d932455f3742c8278170ba2ed7eb2fd3600cb9636082bb50f8408020 SHA512 29f22d3d55718a8aecac6bf7caf889f20e01cbcddb5d3c2047ae701d90505db045d6414857d61caef8e6a31cd8ce9bd5016e18405c6eefacbeefeeecc7ca22dd
27 DIST linux-5.19.6.tar.xz 131649076 BLAKE2B dd6fba4d56d26923310426589b28c83f699a62b676a76257e0ac49bc85d30ffb24f7a66a20108dfc5bdaa1454fb0ece3f28c483b246d3778cff220de527ec4aa SHA512 b39707864c7cdc4290fc6f4ea545da1b6029eeea54d2bec88affdac9b0187e28ebbf99badbb974d5cf4ad854fbbecb98d7385d5bb6efc74e52a7d8dca146e82b
28 DIST linux-5.4.211.tar.sign 991 BLAKE2B b8a72fc09b476ff8539eb9208b7164864822b501ca4b0478a7c32d3b6add1a37641905ff15e4043c897f734033eb8b3dfe1ee981c7f7e7664ca3b9f083083081 SHA512 50e50b7d028877b07fed0d39045d20da36017e5fb57fadd1b0554896e416446c20d5a30d0fcea25fe57f13869c8647029b0ae5b12bd1917eb6150c130069b55f
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.65.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.65.ebuild
31 new file mode 100644
32 index 000000000000..13b58c5c9839
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.65.ebuild
35 @@ -0,0 +1,134 @@
36 +# Copyright 2020-2022 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build toolchain-funcs verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.15.19
46 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
47 +GENTOO_CONFIG_VER=g1
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
50 +HOMEPAGE="https://www.kernel.org/"
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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
60 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
64 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
68 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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 +}