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/gentoo-kernel/
Date: Thu, 25 Nov 2021 19:24:50
Message-Id: 1637868282.caf90f3282a2678db3e49af20ef06401a28f5b0f.mgorny@gentoo
1 commit: caf90f3282a2678db3e49af20ef06401a28f5b0f
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 25 16:09:13 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 25 19:24:42 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf90f32
7
8 sys-kernel/gentoo-kernel: Bump to 5.15.5
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel/Manifest | 2 +
13 .../gentoo-kernel/gentoo-kernel-5.15.5.ebuild | 105 +++++++++++++++++++++
14 2 files changed, 107 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index dd4073689601..016efabccac0 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -14,6 +14,8 @@ DIST genpatches-5.15-5.base.tar.xz 294364 BLAKE2B 59f372c304cff219647a6bf84965e1
21 DIST genpatches-5.15-5.extras.tar.xz 3844 BLAKE2B 95d55709e177684475f4b580be19811636591f6aace5eed83e61ee2939325596b3e1896d9e573e4c85cbc991f846ed8a916c09aacb1aafdee7dc011f08034729 SHA512 ce42eba5f5fabc2ab20124b2486ed458ea503af43e18f31c2a9a87f8a3872354dcd589bad2ac3fea8bf6c11026b6c9165c8de9c5c71e7a03ba719cec5ab6ed60
22 DIST genpatches-5.15-6.base.tar.xz 300776 BLAKE2B 1a3abd9e88ee1bbadf68e0a711773706e3b338626a289ce25db0591e59aba3e71ccdf5c61ec339ac55fc5ef0673415228e4a14b1f473ddc12a280f8bac5edd8f SHA512 1bceff3515b4943093d6650c7455a6f18dd9850cd84a2cf53aa9ecea46ce47dd7b760579f968d02cf22390eb7556f9e319ca842328c0ec0050ff969e10f0cbdd
23 DIST genpatches-5.15-6.extras.tar.xz 3840 BLAKE2B 0c17070891e0184c34cf4f7c28648e7ffdc56992bd68113735b1f90bf0b46330d37239d4f4a8448de315e1cf2741e3c07a769eb8aad57f1ba9ef107dd8c30241 SHA512 aa484998b7789569896470d1fedd282445aa71a945b1f4d5024acfa80b6c16eb199505eaa089f7c0afd6c26eb3fc5692a890a3c0ffa912e9fa0e2ed5808d3452
24 +DIST genpatches-5.15-7.base.tar.xz 390456 BLAKE2B 57db165ca26013ab19c546231b6ebceccb056d66b5fb3686e21959455464dd1802e51fa5d7c6d179bcdcc6c4e08dff63112d7fe6ffe513bbf7519f51dacceb06 SHA512 aa1dd9e723a275bc73c3efae6b2402515444fa8b15f89b2cd940f50bf7e0603724c6e9f25b9573266a3e7165ac4b8c9fbb40101e08f2b76e80827d60db288455
25 +DIST genpatches-5.15-7.extras.tar.xz 3844 BLAKE2B 76fe168f8b4ef235c0aee9f1fad698e25e2f59a73bdddc04a9d0b1465aa033386052e9669ef7d0948accb8d86cac5c2ad0b6184ce757cd7171452f698ed5c3f3 SHA512 d36687bc6f48adaa584e0d856cf824cbe6284a63bd8475a42a32bd0236660b55a68b40ea25195948e8985376890c9becfc678c02228c111ab32d6d2b6df57f14
26 DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fbbc3aa977a6651e42f8d9a8f8773dc9bb6466358fc5d20537b67f826a66a1f1e28912e8454b3cd04dc337e838f18ae28e32e6 SHA512 f90b1d2dd335e25cef4822dd9663d27eb1aa44d780412e703236ced0c0f50b1c4a614eec10134bc6a1a418d19af0abc231764d1fdf9b7f526cd59e10b8b46ef1
27 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
28 DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.5.ebuild
31 new file mode 100644
32 index 000000000000..3b7488f75c84
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.5.ebuild
35 @@ -0,0 +1,105 @@
36 +# Copyright 2020-2021 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build toolchain-funcs
42 +
43 +MY_P=linux-${PV%.*}
44 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.15.3
47 +CONFIG_HASH=6950ef54b415886e52dcefe322ffd825c9dc15bc
48 +GENTOO_CONFIG_VER=5.13.4
49 +
50 +DESCRIPTION="Linux kernel built with Gentoo patches"
51 +HOMEPAGE="https://www.kernel.org/"
52 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
53 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
54 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
55 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
56 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
57 + amd64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
59 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
63 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
67 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
71 + -> kernel-i686-fedora.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
77 +IUSE="debug hardened"
78 +REQUIRED_USE="arm? ( savedconfig )"
79 +
80 +RDEPEND="
81 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
82 +BDEPEND="
83 + debug? ( dev-util/pahole )"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}"
86 +
87 +QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
88 +
89 +src_prepare() {
90 + local PATCHES=(
91 + # meh, genpatches have no directory
92 + "${WORKDIR}"/*.patch
93 + )
94 + default
95 +
96 + # prepare the default config
97 + case ${ARCH} in
98 + amd64)
99 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
100 + ;;
101 + arm)
102 + return
103 + ;;
104 + arm64)
105 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
106 + ;;
107 + ppc64)
108 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
109 + ;;
110 + x86)
111 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
112 + ;;
113 + *)
114 + die "Unsupported arch ${ARCH}"
115 + ;;
116 + esac
117 +
118 + local myversion="-gentoo-dist"
119 + use hardened && myversion+="-hardened"
120 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
121 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
122 +
123 + local merge_configs=(
124 + "${T}"/version.config
125 + "${dist_conf_path}"/base.config
126 + )
127 + use debug || merge_configs+=(
128 + "${dist_conf_path}"/no-debug.config
129 + )
130 + if use hardened; then
131 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
132 +
133 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
134 +
135 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
136 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
137 + fi
138 + fi
139 + kernel-build_merge_configs "${merge_configs[@]}"
140 +}