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: Sat, 29 Oct 2022 15:31:12
Message-Id: 1667057428.afdf576f1e36ff6c52d56d88161ae51729bfe0c5.mgorny@gentoo
1 commit: afdf576f1e36ff6c52d56d88161ae51729bfe0c5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 29 11:30:21 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 29 15:30:28 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afdf576f
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.151
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.151.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 a4e29373e79a..d68bd2d1ae07 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -22,6 +22,8 @@ DIST kernel-x86_64-fedora.config.6.0.3-gentoo 226517 BLAKE2B 6cdbdd1d285e07a5c88
21 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
22 DIST linux-5.10.150.tar.sign 993 BLAKE2B 0ae037ad070f0ffb6616a2975f6d4c2f3a1146d37041477e4bae099f81a1c37eb65e067ed43a269f33de28f9245630c24d43fb1e09ff60e9df2ca9e5b61bbdfd SHA512 1d20e28dec05e44586f8a7a4d112b13feb94dfac0b9d1f79091fd5653f79ad92dabbd80f8835ed0e0881d37617c4f1f1a31fdd265b883384d87cd98bed9ad025
23 DIST linux-5.10.150.tar.xz 120500048 BLAKE2B 159868086f4571b88445424dd08d2c691bd97e8842814b00ca32113c6306ede05be3ce90aa541b29e65f7df4cb3b13aebb9ec4d9a83abb490f163d8e79bdb2f6 SHA512 a671b19973977652dbcda078b1fd7d810b994c8096c0cfcdf9e5c4c4acf1ed6fa56dc64acefe96b2d7ea555480f0560e9fc80350aa4cf1afef98f9e7bbcbdccd
24 +DIST linux-5.10.151.tar.sign 993 BLAKE2B 5c17d3eaa8bff5da48325f4441baa22255169d3249c5521b55b5e46894f83ffc1afd2bd6a4479bc272a80dee88d0b2906dde5dae0abdb53c62649a18ef072753 SHA512 44ceff74b3bd5d209a0fb31811db1902098b07aa7b3d7845831413b4706acbb16a24b0f54f6cf074d4d8961da22a288bd61388cc4ba7e9e1468d81126b2fa04f
25 +DIST linux-5.10.151.tar.xz 120536380 BLAKE2B 5f331884867370d34a9be311f68c1e640733f6d672f08fc3148bba3861ea1b252be79ae287e9f8e79a4790ecf764baae469f921297a2da8ff78dc85b98bcb6c9 SHA512 c32923911ce5c17d1ef214e5996cabf590770a389f035555bd2579eac0ad60f44df18ca59f11b212bffac4d4e775d569f9cc6c4a795804c26fec21195c06dac1
26 DIST linux-5.15.75.tar.sign 991 BLAKE2B ca3ab657a1e6d98d2f8419c98c5f41beba2cba0bcbed937c4233bf8d3222b362bd973b435bb5fc987ce9e9714dbf6ddfc2265c7ede51196d66df0234d904fe7b SHA512 81b5b73b910babb8a7b3d060c3f826f3da687fdbb8cd83fb55848238f052e035677549ea59f41636bda7dbe1ee5949e043c70e0c3d501ba1b09e5ad4e27191a3
27 DIST linux-5.15.75.tar.xz 126466096 BLAKE2B cc913d15da3ec8389f7eb2b0597281a96465dd92245b4ddb41eefd76208d6672e6c83b88bd8d56596b553ed2c07e602e604038ee44c3b44325b3943fccf10fe9 SHA512 6cf56319d2bfbd27a3c01197d9ea23cfb3acbf83e0496889c6fb500c52a399ec852f965b7e9f54f389b3229dcf3dce8b48b278e5063d077936c8b8337cf370a6
28 DIST linux-5.19.17.tar.sign 991 BLAKE2B 5f2a7a6e4bdc66f4803b03ba3e9c0b88f5eee798e192db40be092b7da480f326ea3898afe0b461f68e69bfbeb7cd5547529db72cf338ceeab3d111bf1b36ad6f SHA512 30d3a3e76be9327658391912720275c2a63ba1bca193b03989535ce6af1d8fa958a52abbb5ca9b3b614fcec88d547a4a0fa209eb738ed5ee90605517d74bc458
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.151.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.151.ebuild
31 new file mode 100644
32 index 000000000000..beb11365e70a
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.151.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 +}