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: Fri, 04 Nov 2022 05:41:00
Message-Id: 1667540446.2fa7c5966d4ee83df86182d80d9e509f5b3700e7.mgorny@gentoo
1 commit: 2fa7c5966d4ee83df86182d80d9e509f5b3700e7
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 3 16:30:52 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 4 05:40:46 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fa7c596
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.77
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.77.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 1581849d8e13..d3add21c5121 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -32,6 +32,8 @@ DIST linux-5.15.75.tar.sign 991 BLAKE2B ca3ab657a1e6d98d2f8419c98c5f41beba2cba0b
21 DIST linux-5.15.75.tar.xz 126466096 BLAKE2B cc913d15da3ec8389f7eb2b0597281a96465dd92245b4ddb41eefd76208d6672e6c83b88bd8d56596b553ed2c07e602e604038ee44c3b44325b3943fccf10fe9 SHA512 6cf56319d2bfbd27a3c01197d9ea23cfb3acbf83e0496889c6fb500c52a399ec852f965b7e9f54f389b3229dcf3dce8b48b278e5063d077936c8b8337cf370a6
22 DIST linux-5.15.76.tar.sign 991 BLAKE2B 876831fa3e2838bcc1785ba8a8231a5a50dbebe587105ea892e16f82a513383b8c920cc8c1025728a3b17d430f861b1c9671c544c5597b47a0ae226d79f1466b SHA512 4a6f18f6ac9f3ee3668778bfa1b1288f78b865fb6e39d20efb65604707ec0260db5ea4cf90b1705672853e3997e1cc8b775439b86925b7c4e5cbcf343a4bee1a
23 DIST linux-5.15.76.tar.xz 126460932 BLAKE2B bb7f6872449889d928174f49ac23047e62fd6f2076b976abc6841f453a8eb14c0c2fc634e30ba921838e28c57ed0fd06e28a1192fe3855f82aaf4f2a8ec8ae99 SHA512 de8466371030827acbe44d8e62b0322f86cbcf13ea90f9540439798ad8bc730f2bd63f62b031eec2002401c81756d6e0a83070e079285e89d416a9360eb328b1
24 +DIST linux-5.15.77.tar.sign 991 BLAKE2B 9f4d4e7d3f21a02f95771d7931212f026ed2543c8e7e6c6e96fa83b87eca089c18f131a9242519e13b1c4ce01ae86503097e6ad1b79316c203184166d27d468e SHA512 eecda297590a14f010af600cd757cbede856665d6bd09fb9f95b88ea2650bf4ec18ba7366348d66e898237812311a757f1d640986815dca49bad7869027682af
25 +DIST linux-5.15.77.tar.xz 126468704 BLAKE2B dcb7d95f577be18735f14c1a75148579af40bc35e57228eb7d35453cc8ddf9b6f9f71a7a15608be22049557ba307eabf5df42504f95cd6f414711733ff6b0738 SHA512 3b557ad399606deb2e00077da7c57af534ff5bd395297db534a9c643ff6e95b29b315d15bcb453255875785264347949a7e52ef3a676b7dd12db10764a6a5646
26 DIST linux-5.19.17.tar.sign 991 BLAKE2B 5f2a7a6e4bdc66f4803b03ba3e9c0b88f5eee798e192db40be092b7da480f326ea3898afe0b461f68e69bfbeb7cd5547529db72cf338ceeab3d111bf1b36ad6f SHA512 30d3a3e76be9327658391912720275c2a63ba1bca193b03989535ce6af1d8fa958a52abbb5ca9b3b614fcec88d547a4a0fa209eb738ed5ee90605517d74bc458
27 DIST linux-5.19.17.tar.xz 131698200 BLAKE2B c672df8169c4b237b00759510fa5582089a92129bd60cb712faa94a14070c867a821aee088ccf75df136a728ff71a3fdaa3aaf4baebe9aa62ea8ad15ff5bc76d SHA512 aa1b471be303cbe470df7d8b681144f4352f677bed27b98056477f24c93684f8fc4e45bf91611b38f4798bacd3568b6e4bd3eb7641d618200815953ea05f441c
28 DIST linux-5.4.220.tar.sign 991 BLAKE2B 6296bf42826c849af68331ba32a8e84c892b54f299b9ee7b84ade2d52b5773a3488f189de1f4f7e2580a13bf8ac4af256b0d18fbecc9ed9a69bf1a1a94aa89ff SHA512 21c05e660eb0f55a2138eed952ccda9860ebffbdecfe81240c89ef32904f060aefd7c01846d614de6f1dd30986f0eab0ac85f2c31b0805f4bc578ba83ca82ab1
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.77.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.77.ebuild
31 new file mode 100644
32 index 000000000000..e9d460c7094d
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.77.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 +}