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, 28 Sep 2022 14:29:30
Message-Id: 1664375352.308954f6a5e3ef3f9eb443afa6c8d87b820e62c8.mgorny@gentoo
1 commit: 308954f6a5e3ef3f9eb443afa6c8d87b820e62c8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 28 10:14:44 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 28 14:29:12 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=308954f6
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.71
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.71.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 84054b60c96b..0088872445c2 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -30,6 +30,8 @@ DIST linux-5.15.69.tar.sign 991 BLAKE2B 437ace51d1e348103c3003148fa75033f23e5ed4
21 DIST linux-5.15.69.tar.xz 126457768 BLAKE2B 0551e6c4fd2f6e528bd56a9e728ccf50ed3cb8609db9dc5fd785e2e89d6267cf3df390a0f68db8c1c48edc12364cccaee3b5d397cdf3994b61fb8d5e32687e50 SHA512 580fb75d44a2ef9b7a24d381540c21fc68208ee1e683683311c64e3d47ba7bfe5e7a29a563c8cd631f09d425de13d51605ae41b40523b0388ae1ecaa6d1578ea
22 DIST linux-5.15.70.tar.sign 991 BLAKE2B d576f7fca0bad50d261e4e7b66227d0700bd90ab53ab750387f75a9a8f634be93c168c1dbda3a53618a4fe00e342293691831f0d537e266e0bf4649b7623f4fc SHA512 dd87615c19285bd8d190abd3239dfc3f8500f3139bfd03023d4591ff266dfd1aee62cebd31c65cc544b5d5139e1ee78743894683b9edc92fbb371d8e16d8fcbf
23 DIST linux-5.15.70.tar.xz 126434784 BLAKE2B 1ece12fb0cd1ec1a8951c5c30b6f6fb973caed6871ba86879103924e78065f15fbfd718a239cd58b4c97c2fe6ff90c26dd63c583d7ea83b63883c6bcc6d4cb38 SHA512 5885d889d5db5f1e3818160c0b7d43fc66dbe4758dceeaf4ce6eaae775e998863a3068d6cca500b4affcf6592f714c3b58b436b8f104789be2dd37551c5d0ef1
24 +DIST linux-5.15.71.tar.sign 991 BLAKE2B c68c1e6ccdeaa6b7c655ff850b50c69cb2c72fd832557d3e7919379daa7b48c2cbef9910b69c8c46aa5817c4f7e2bc70888628f9268349bb036b35b8fa962f46 SHA512 e7416065d4b565ad69ebab70e4c25af76fb405251e00363b445025f0b543af800a696098f0393efb3f69dccd7db4f82dd7b24ca24e94e9102a1f09a7455d87ac
25 +DIST linux-5.15.71.tar.xz 126446412 BLAKE2B 77da2393a31b6c6fed7cdfef61a112ae49fcdfce96968daf8c7a690a6e65025c7238c1fe084d0bfda403dc56db877b6db99def12803e840cacf318da40327d7b SHA512 7d20387a1f82d7ec63ff06ed05885a2758b39ece0fe95ad559d79216210e342f0df4dfab9f54c1e4016c331516034aa1b6783d63dd7e415d0cb20947301f95ab
26 DIST linux-5.19.10.tar.sign 991 BLAKE2B 4d9c1de396214aaf5f0f661628cc0fe805dfce6ea0e256517553276bb1ac07a989fdcdec7656a5adc91f35016a8989308736a1ad09e41b603bd95b3518212eba SHA512 56f6d1e6036ecc762d2abfc278a40d9bd4e6162ba3ff5382a6f247b2b73408fe43289927575c88a27372baf04edcadc4d928c79c3a106eabba2dca37487619e4
27 DIST linux-5.19.10.tar.xz 131654840 BLAKE2B d2da85f8c863f01d13df0411a519cd739abaf6b49d98ff44eb07962f45af9fa8296a293e6df5d6fd3661112fb4f4ad0de7ab279c2a5765f8c3781e25df056288 SHA512 3377a2a8de0efcfba78982024d450d5de423e84ee5ec317a25673b8176e3968a9891ef6a0465c3be674b3d9cdf06184150d79e7292754b8be8070e4654e79146
28 DIST linux-5.19.11.tar.sign 991 BLAKE2B ff6bc783585a5e629b888e7b1b9560014a00e4334a3a78a899c2e9fe19ca1441e4cb8d67a7b264c49c8e08442be44c9330133e1c63c40ffa82bc23107067d09e SHA512 de201e60cd167debb6ce029f06bd758ff85d2826ac5c6fde0fd2c9b6d9bc9146ce8b7b77d0d4b19d63690ecf880f85fa087fcfccb490bd95b10994acbe8e771f
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.71.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.71.ebuild
31 new file mode 100644
32 index 000000000000..e9d460c7094d
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.71.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=8
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 +}