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: Wed, 29 Dec 2021 18:57:03
Message-Id: 1640804207.44bea8c1ff8e7074d3dacf2202bfbcf6d1dd8c04.mgorny@gentoo
1 commit: 44bea8c1ff8e7074d3dacf2202bfbcf6d1dd8c04
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 29 14:27:31 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 18:56:47 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44bea8c1
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.12
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.12.ebuild | 129 +++++++++++++++++++++
14 2 files changed, 131 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 717b7f75cc08..2335300a033b 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -23,5 +23,7 @@ DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e7
21 DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87
22 DIST linux-5.15.11.tar.sign 991 BLAKE2B 42bed55a97098e8af2c9f33852b94806710e2df15a9fa8fa2199a1f3be133b89b9505e79f3e9c9663fcc5482249334f34a1c7a9315fc40741ff7302a60c4c823 SHA512 5ff3d7d368dd4481e003b00ed926f601520f53de020a507c5f9af506679e57958db0967752a600ee80cadbb0b19d33368007fb1d3c298045b30faed964da4714
23 DIST linux-5.15.11.tar.xz 121955784 BLAKE2B 37a264e50069e5b195b99a355944893e42c6fc05eb5fef7907855de4d31c693421e6fc578575ed141534b52ab9105dfd7697bdfec238cfa88e16a6c41f138ebd SHA512 5abe52981a9f493174afb908bc1c1a4901bc522c38c2da7ba15d5b907f06f9c4a684a47436697d79df8f598e166064d46add5661632a48275e0268411563f6b2
24 +DIST linux-5.15.12.tar.sign 991 BLAKE2B 2eabe426cd804a5515a2fb2d65c763322d313ba81432ea2dc931172d592073735dac74615828dbf2b07d5fa66a562606cbe03f697578444c95c5b78cddca1910 SHA512 267a8f1b5813dc9c0c24b534de9890e398656bb4cf96294f3934c88297eaa36a773d9d89ef41c19ac411ef86aad9ebe463de0f9fef1c1b5df8b372852b64c526
25 +DIST linux-5.15.12.tar.xz 121949156 BLAKE2B 6e201ffe5832a998b9bc8f63e9fcbf7f0384d4e4abb1a68c2299b8362b51ddcfbc35639bfc836a84202bec3705f5bca1616396c16daa05d778659d286f63b6a8 SHA512 8b79f30c26a865578d771b0c1a8273ecbf19135e4844210cb31c81784311601b8f7adfe1b3a9bc75c6bed99dcad9a5ff5e1976494b64f0de45be3a6570336890
26 DIST linux-5.4.168.tar.sign 991 BLAKE2B a581b74de0296ef69cd10686381571aa3c2e73b59dd495e78a7ba168dff85f7af3a3b7719419b767fe0b8380a904248d624bd1e17712327d2ebd62335943f8dd SHA512 bdd0a88b6199d57b3c86521e58a356a35273007fb421e5d3b80d40e4b9337c30fa1b982dba61673fda0ddc9e3107b8da5cbe4916364fbbe035ab5026befe1c74
27 DIST linux-5.4.168.tar.xz 109188452 BLAKE2B 72e7da0a2a2d2ecef4b73b268db09a7cdb7a0e76cbbbfd7111ec727593f8eb60026ecd8102bedf9b13b393cfc9fdd4b5297ed4c48869152c09581d763e156552 SHA512 119856b47f2fb2d3560fedb60fc3dd432e5b150261c9d959e5e9426f7f6e03630fcade800b8e97fe6fc6edc717bc6a0a296c875c0dc771045b65d20b9df8a510
28
29 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.12.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.12.ebuild
30 new file mode 100644
31 index 000000000000..f7731de3f3a6
32 --- /dev/null
33 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.12.ebuild
34 @@ -0,0 +1,129 @@
35 +# Copyright 2020-2021 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +inherit kernel-build toolchain-funcs verify-sig
41 +
42 +MY_P=linux-${PV}
43 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
44 +CONFIG_VER=5.15.10
45 +CONFIG_HASH=4882b85cc85fb2b7df396c4d671cc6432596eca0
46 +GENTOO_CONFIG_VER=5.15.5
47 +
48 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
49 +HOMEPAGE="https://www.kernel.org/"
50 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
51 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
52 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
53 + verify-sig? (
54 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
55 + )
56 + amd64? (
57 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
58 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
59 + )
60 + arm64? (
61 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
62 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
63 + )
64 + ppc64? (
65 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
66 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
67 + )
68 + x86? (
69 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
70 + -> kernel-i686-fedora.config.${CONFIG_VER}
71 + )"
72 +S=${WORKDIR}/${MY_P}
73 +
74 +LICENSE="GPL-2"
75 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
76 +IUSE="debug hardened"
77 +REQUIRED_USE="arm? ( savedconfig )"
78 +
79 +RDEPEND="
80 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
81 +BDEPEND="
82 + debug? ( dev-util/pahole )
83 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}"
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 + ppc)
119 + # assume powermac/powerbook defconfig
120 + # we still package.use.force savedconfig
121 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
122 + ;;
123 + ppc64)
124 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
125 + biendian=true
126 + ;;
127 + x86)
128 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
129 + ;;
130 + *)
131 + die "Unsupported arch ${ARCH}"
132 + ;;
133 + esac
134 +
135 + local myversion="-dist"
136 + use hardened && myversion+="-hardened"
137 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
138 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
139 +
140 + local merge_configs=(
141 + "${T}"/version.config
142 + "${dist_conf_path}"/base.config
143 + )
144 + use debug || merge_configs+=(
145 + "${dist_conf_path}"/no-debug.config
146 + )
147 + if use hardened; then
148 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
149 +
150 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
151 +
152 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
153 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
154 + fi
155 + fi
156 +
157 + # this covers ppc64 and aarch64_be only for now
158 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
159 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
160 + fi
161 +
162 + kernel-build_merge_configs "${merge_configs[@]}"
163 +}