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, 31 Dec 2022 20:23:04
Message-Id: 1672518172.747f29eeeb234f2b3db08651dd4557e81a6eb178.mgorny@gentoo
1 commit: 747f29eeeb234f2b3db08651dd4557e81a6eb178
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Dec 31 16:40:59 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Dec 31 20:22:52 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=747f29ee
7
8 sys-kernel/vanilla-kernel: Bump to 5.15.86
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.86.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 87bec7965037..d5b434c1733c 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -28,6 +28,8 @@ DIST linux-5.10.161.tar.sign 993 BLAKE2B 9237c5037a39e92c2eca9b2c16de865ca5ad115
21 DIST linux-5.10.161.tar.xz 120516432 BLAKE2B b35e08b3ed843fe0d0ea2a08728f192ab795b61438a60c148097c8bc00c1bdc9b6bca925bf4e3cd124ac3c5d50920f2bf1a481c24a97b8787c012e3df993d8bb SHA512 aad3c70cc6eef39623ba038e74fc5435764ab81cf8782d44ab07c50f50c66f303d1cd49b439aee46193caaa43f4c322924691ea5e3ac2b01142420efe11700d5
22 DIST linux-5.15.85.tar.sign 991 BLAKE2B dc06c346781a947993743eeb08784d35091b64c2f6d617f05e6b8eb6143887362d34a8f5e819be24cb423ee0d4e92dc040246d6f979d9ddecbf79fea439b0bf7 SHA512 c2d734b5bf0f4b5b568d5c9217bddbff319c727d3489afb8eba64f67b225d34ce8de079e2e8c4210c4096097c28cac255c9187b0267dac9b842806ce71a47220
23 DIST linux-5.15.85.tar.xz 126501228 BLAKE2B 481cea334dee4146d72704ecb88f654bd38ca62a5a28540f365a57f5cd522551c4b7f854c09380ec614098a9efa5dff4cef70c9cafe6277a410d3d2099eca1cc SHA512 8cc19124c82f14e09b5ff8d2e343cd41cdfced74e5c0c501abd258555d9dbaa79e79cb23256a474cd59311ae8626b0457c2117263bd64a206151c09b54f3ff46
24 +DIST linux-5.15.86.tar.sign 991 BLAKE2B 18dd86da143bb3e3afa28e9de2778ed384d44988857968ff6e7eca13029cfdcdddc9f707d7df1f37751b321be216b94b91fbab985ad09d2f487698f83e1f4107 SHA512 e3f6e14db0edbc41d3d9cd4e2c296eb8cf7e678daf71567aa7a814bf9541f610a1f91996b93104e7d9c35d1b079b9f9b1e14be2e30b5fbaaf587c5ef69555911
25 +DIST linux-5.15.86.tar.xz 126498884 BLAKE2B 6d088a5abcc1a8c56c2fdf05932f757ad5bbca48f5e60f5a302b2513186b7519af44daeebcb2ac96bd30967c58967426a3b33f492b22b5db7d75d3bd81411eb4 SHA512 5acbf5e7ff56484b8a4eda3f7e1662029eb2bc7621082386887ba893bef172da49512f1a6e05c590c32e591c3d8b1a41c6a11fc1befe5196f28e60c9f0a7b22f
26 DIST linux-5.4.228.tar.sign 991 BLAKE2B 4edd63de96c2cceeedf8b20ab4696fb4c8b8e45916d95ea9279de4911874e4537aa8f8acc4014545746d4546bce66843a3e56d56c90592e730e4ae1165c1486d SHA512 72be75fbf5704706d6d772a50646550e3d54458044e5fe5a49afa7dd98360f30b0a4e345744e691b09d8951712d1d766d050846fa7ce13bbf4f1e9dd26063d4d
27 DIST linux-5.4.228.tar.xz 112978736 BLAKE2B ade9b21e3f434435230e31d67d39ea07d15d92cdf932b3b181fc532669f10ebd2f0eb7d5fb20ae9eae93c782f10db5ab3454bb13c01694f674f83146bcae8187 SHA512 f3fa33da1df3dd10ba9536d30b8aebf92796abe84872c402776c94b35bf3efb4256a6c3f0267bd97741db9853352d1b22bcb42d7d03f167960804bb9f7407601
28 DIST linux-6.0.15.tar.sign 989 BLAKE2B 214ba7092718635f5dd39f2374615854c276e450ee81b8811b2e5a9dcff300eb38c4acbda4ebc1dcc0d7a2866e4a6bea8c2e5280309428164df8294bc616f8b3 SHA512 f39bebbb1d60ab7457e861ac7005a5cb975cb53519d777ff66119d2ca087f9a654cf1f11ecb4f7b58af6da574c698dccc69c9daa99ded277da178593c5fdaf76
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.86.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.86.ebuild
31 new file mode 100644
32 index 000000000000..e9d460c7094d
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.86.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 +}