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:28
Message-Id: 1664375349.baa46a4450e89c9da4a43debb4e9c14cf1f208b0.mgorny@gentoo
1 commit: baa46a4450e89c9da4a43debb4e9c14cf1f208b0
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 28 10:13:58 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 28 14:29:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa46a44
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.146
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.10.146.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 845e5f018378..84054b60c96b 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -22,6 +22,8 @@ DIST linux-5.10.144.tar.sign 993 BLAKE2B ce08aff313d51882830b63cab9758752a4dfe6c
21 DIST linux-5.10.144.tar.xz 120471208 BLAKE2B 4965029be62c90fe9eb9ae3ca5a4c904455c36963c108ace3bc21f12638899420b1c6c60fcca3f6876e6e947c5228b3996440e511fcc2f460cf27100e762e12e SHA512 dd4fc03c4fe65d1d3529bc428adfbb025afa8c913c482a0730650f6f05488f17a8e97677a8e238d725952c39b05ff156460d9679e7bc6e810eb450cf2d0b3a7f
22 DIST linux-5.10.145.tar.sign 993 BLAKE2B 43d8eb782689cede573c80b2ca97888861f571e7e92a1f66f118aa48691746b5164bfa5cdf7ee3c7ac9c6d0b897dbd0b4f94f6477f4cd28ef2e6d7fc53473740 SHA512 91cda141875daa17d2cd3a5b1db462e68159146f4cad0adc3b7cfbecf5690375336fe9e659c465057adfa5332eccead175e6af0591a0f126a2870f7b0f810cc3
23 DIST linux-5.10.145.tar.xz 120488988 BLAKE2B 31710012212beeaa212d50130291ce28851a6344f1e55b6a6d6efd7bad07f3041662b48d64e3928835c618e730a705be7cad7f58993b65901fff604fbbc4cbcf SHA512 579495a91d0b6c9904f1836e30a3e34c384b241dfc62a2840f3ded99099ce2a4ddc823fd6b43c85c75b2a4883658143f94fd3c12d285c7e7aa9b6dc95dd4a243
24 +DIST linux-5.10.146.tar.sign 993 BLAKE2B 7514e96fe2f3467e20b56552bc1371ca6f500908cc56fa0390ae1f09ad6ac83697749e6bbb3e2fbaa988bf28f74a84a745eb6b745ab499774933d8b723a7dead SHA512 5213a12c84771fffc2933b1981fcefba93d5ef65af40e29ec503c6b94f72b37a359a339b6e0f569ff68c1a3fdce826695f6ff99dc0884511c7a883e8f5a9d0fd
25 +DIST linux-5.10.146.tar.xz 120482760 BLAKE2B 74f2e859bf702d24250b5d468a51fbf1837ee21d367dc0dba666ec8a75b3bdd2715eac29dd0a2659181097ef9630c7ef79addfcbb8690f270dd3fac169702012 SHA512 6bcca84c006025e56c66b468f1ab77e6678c16f31bf945afb3a69fbaad40e08dfb6813db2cf48be87f29910035e10ba385d79480908638320f8ce9d1b0b75c91
26 DIST linux-5.15.68.tar.sign 991 BLAKE2B 04b977efcfbf7af3440ab18308a3ff849f4294b5d4d12695be08cc60cfdd4fe9f48fbd4d1218bbdb2ced9d539bf15b9f9050c92f258669967aad733d67a69c3a SHA512 c4928e896e59ce19d63ffe395b77f85507b329592e79b2d6f285cd48e7a57726d3234e529f29dcbf277acc7864aa63ea604a2fab08c7c3e74c1f0d3c046f196f
27 DIST linux-5.15.68.tar.xz 126445616 BLAKE2B b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4fcedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1 SHA512 fa62e3061a84c7fe79eb69e7c4fd4bf77aebb11ace53fe2bc5a63629a99115d9c406992166ae84526d8854af57cd9cfd173191877ea6639a5fc3c2a60ab22931
28 DIST linux-5.15.69.tar.sign 991 BLAKE2B 437ace51d1e348103c3003148fa75033f23e5ed4d37ed9a75771a066a2dfa56bc2ad455872f1736e3ff9bc7398807ffffe8fc4d15bfa585b7e4a0c0eec92c213 SHA512 34c46133123ccb339c4318e442f63bcb508f0c2696c5bcdd4999a2b0a7be47116736dff6605278d549f3b227c943b3d5844fcd42e9bd632f6053aea7784f2f5f
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.146.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.146.ebuild
31 new file mode 100644
32 index 000000000000..beb11365e70a
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.146.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.10.12
46 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
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 +}