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, 01 Feb 2023 15:01:09
Message-Id: 1675263220.316001acfca653e818525c07562b5f8d4885e99c.mgorny@gentoo
1 commit: 316001acfca653e818525c07562b5f8d4885e99c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 1 11:17:11 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 1 14:53:40 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=316001ac
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.166
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.166.ebuild | 137 +++++++++++++++++++++
14 2 files changed, 139 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index a8ca576aac96..1db00f0776d2 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -32,6 +32,8 @@ DIST linux-5.10.164.tar.sign 993 BLAKE2B cfce5733bed718ddff6fa41091db7a00f3a4b08
21 DIST linux-5.10.164.tar.xz 120570784 BLAKE2B ada524ee102ce8f6fcf75f58bd288a50927f523f3e483a6cd3c1f3d0bbf5bb27853a1c851fd5ec0e2f210b8a6f7192d163bbc9731671a3f2c71438356cb7e17a SHA512 f3f2df99b5a7d32da240ceeb0da77f4f3b3514c16e8553ee93b05b99234ce059bd67ef43c8b02718b906de98f02b1bb3866f132647bcf2ab3fc4a19ddfea49dc
22 DIST linux-5.10.165.tar.sign 993 BLAKE2B 0c878a82b5044ea113c83c820f0dce146808968743df354b2d8fbbc99deed37e3c8bfe3976409e46f92bdbf65860c11d3c1165913078c794504d1bc226d6b69e SHA512 9c2da3d5e0f5f1d5a4c269719635e81d45b5b70b706dd3c7810c008666c1255162bd657ff1136dba73d7a32b32c304c7cfe152b4b945259cb184aa8da70e5495
23 DIST linux-5.10.165.tar.xz 120555856 BLAKE2B 455bed20bb26c7edde2d2fabfa9b21b39d447e4e74fe3ce73c26c69c760b1ab97808fc5d7e58db6028d76ed1a858438fd50e7e8a6909c7bf225e86b430789abb SHA512 2c3431a36d4be44b83f70025110ac4b4799e284481d11690f620813d5b4b48cfd1c03f0e93103339ae7d017a61c46d5b8b9b1031f3be444d491ead74a1cb0386
24 +DIST linux-5.10.166.tar.sign 993 BLAKE2B 354afaef10f11a81aeca2e6acc132c961ef3d14685e86f8bea7d8b07e8f9cf4ba318e808cbee6363665476ff0f5969d5b17509c55fd05bd916e59f842be6f60d SHA512 357c06dc33ce7f8559fb9e525fab2d3e217d1bbcf13f6a4cd45cb9cbba376abd282ef333c3ab4c44f942f174c82962ed6e9fe3eaf7855c722cb03f3ff18282d4
25 +DIST linux-5.10.166.tar.xz 120550760 BLAKE2B 87cd994ce1b3d4d573299aae680d4488797ddc82a3010ef1965b7890bbb7043f84e95f96e88f9988c64b4774bf64989d13cb8dd4e0882e21ea81481dd22da067 SHA512 a6c185acb7b24e38e3a8331bed97dd5e03e885b5e3d5ea7fc3c1113ec64c16567dbd3ee6daa6311634dc3bfbbfdcd280571975f636457f87ef2a1e19b226b4cb
26 DIST linux-5.15.88.tar.sign 991 BLAKE2B 928ea938758c904971cde08ea5d390ee483eda4ad5c7ced83d606e219d823966bd6ea745c64b2c954e81d444369507d57cfa3b54e18e433d9733325007fca93e SHA512 b9f1744190bdcb220d8a17b295784aa34ca0ab7035d4fc832dab0605ce665dcc9ac356ceefdf47a2996dfd33b05b0ec8a2dcd66c785146c756cca74ad10ad0a2
27 DIST linux-5.15.88.tar.xz 126523892 BLAKE2B 26ec7427e3370c417a048ca76f394cd9aeb25f6cf8b6bbceb074707a85c75f668c8d70c9f1b19cd05ce33212f259736ac1b554793ead30a007d1745d4329879c SHA512 2ecb84f7800a6fe22577f890c403e2bad383a1638b6a176c20cd8d1311ea433c016e08ef00d1441099c1dba974d82c4211acc190c8d59aaa9feb12588af1b348
28 DIST linux-5.15.89.tar.sign 991 BLAKE2B 79d90af0bc18768e9a09ebf159713d59e708ec23ddb99662b67ca7edec6871dec70ec624a98db404b59f0daf9bd5559e5488f8280c2e1fe83218a6e99f6bd450 SHA512 77846c9c18aedd5f8dea54208cc65067cb85a88532f812c19bf510d34e03d0f4599c4d1182d799c982ec63d235ca0af474b2817ef8d45e2e4bc51aa8092329b8
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.166.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.166.ebuild
31 new file mode 100644
32 index 000000000000..9f817374f36e
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.166.ebuild
35 @@ -0,0 +1,137 @@
36 +# Copyright 2020-2023 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=g6
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
50 +HOMEPAGE="
51 + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
52 + https://www.kernel.org/
53 +"
54 +SRC_URI+="
55 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
56 + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
57 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
58 + verify-sig? (
59 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
60 + )
61 + amd64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
63 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
64 + )
65 + arm64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
67 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
68 + )
69 + ppc64? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
71 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
72 + )
73 + x86? (
74 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
75 + -> kernel-i686-fedora.config.${CONFIG_VER}
76 + )
77 +"
78 +S=${WORKDIR}/${MY_P}
79 +
80 +LICENSE="GPL-2"
81 +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
82 +IUSE="debug hardened"
83 +REQUIRED_USE="arm? ( savedconfig )"
84 +
85 +BDEPEND="
86 + debug? ( dev-util/pahole )
87 + verify-sig? ( sec-keys/openpgp-keys-kernel )
88 +"
89 +PDEPEND="
90 + >=virtual/dist-kernel-${PV}
91 +"
92 +
93 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
94 +
95 +src_unpack() {
96 + if use verify-sig; then
97 + einfo "Unpacking linux-${PV}.tar.xz ..."
98 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
99 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
100 + assert "Unpack failed"
101 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
102 + else
103 + default
104 + fi
105 +}
106 +
107 +src_prepare() {
108 + default
109 +
110 + local biendian=false
111 +
112 + # prepare the default config
113 + case ${ARCH} in
114 + amd64)
115 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
116 + ;;
117 + arm)
118 + return
119 + ;;
120 + arm64)
121 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
122 + biendian=true
123 + ;;
124 + hppa)
125 + return
126 + ;;
127 + ppc)
128 + # assume powermac/powerbook defconfig
129 + # we still package.use.force savedconfig
130 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
131 + ;;
132 + ppc64)
133 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
134 + biendian=true
135 + ;;
136 + x86)
137 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
138 + ;;
139 + *)
140 + die "Unsupported arch ${ARCH}"
141 + ;;
142 + esac
143 +
144 + local myversion="-dist"
145 + use hardened && myversion+="-hardened"
146 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
147 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
148 +
149 + local merge_configs=(
150 + "${T}"/version.config
151 + "${dist_conf_path}"/base.config
152 + )
153 + use debug || merge_configs+=(
154 + "${dist_conf_path}"/no-debug.config
155 + )
156 + if use hardened; then
157 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
158 +
159 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
160 +
161 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
162 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
163 + fi
164 + fi
165 +
166 + # this covers ppc64 and aarch64_be only for now
167 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
168 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
169 + fi
170 +
171 + kernel-build_merge_configs "${merge_configs[@]}"
172 +}