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: Tue, 26 Apr 2022 16:04:46
Message-Id: 1650989070.956fdb23f49551b8ad6438f5279aaae1393173b3.mgorny@gentoo
1 commit: 956fdb23f49551b8ad6438f5279aaae1393173b3
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 26 12:53:59 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 26 16:04:30 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=956fdb23
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.112-r1
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.10.112-r1.ebuild | 131 +++++++++++++++++++++
14 2 files changed, 133 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 9b0102b221af..a32b6397b47e 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-5.10-119.base.tar.xz 3340768 BLAKE2B 52f04f06622bf08385fbf25264a
21 DIST genpatches-5.10-119.extras.tar.xz 3872 BLAKE2B d952b7d246de7586bc50734c64f664c27d0677fa30e6d40dfdbed24394eaebc55328a446da8112f8d723b30d73c716fb817f34533259b35e873736c4bfaa9443 SHA512 7bc4595c81e2723e66af28851b458b2cc2df5349ac4cbee2f866bfa3e2fcd0223d40afc4466e8ccebde6e90dba99b891ee313510d70d059684757dc0de531b4f
22 DIST genpatches-5.10-120.base.tar.xz 3365700 BLAKE2B 6672f4b80ebd90ca24903c7f842b69bace79b790b9669a4f37d0be516e743da5b70e2916c10a6b006e6b50e74f50985c0df490bcca865fdf737ca8fb810fe77c SHA512 73275eafde83a8814c0643c01acc193223d3cacc3c9f25455370e8395237e98e08c097749f550bc6cf77665241f2235682c6636e70e700594623ceac03e93d1b
23 DIST genpatches-5.10-120.extras.tar.xz 3868 BLAKE2B b052197fd349775bfb579a89c27f152944573a81583c38dc323b21932c1453600016f986971170819a4f640cf7e7db87ffe43e484a0461d6e5bb8363af54a0b9 SHA512 b0d15b0c0456cfbf58826f58e4929011bdcbf3c6764735f7b2b9bcbc5f037ba7fa1d343cc34992eee8f1044e2a89909f6f826f8a0cdc5d82f55e44923a4fe006
24 +DIST genpatches-5.10-121.base.tar.xz 3366696 BLAKE2B 121f7445e184846460c5501e9d2cacf0349da8bb47c60d3528cc526385121f97b60b11706502d696e783b9649795d3921082076788325189087ead4c1cc48be9 SHA512 aa75a7c32373a0356488ab21c1b090c2ce6a63e706f5e61824212397d56aa474126bd21f8b28e10f3dff1445ecfc3bbe6d3e7ca249e1eb161fa80e79e47db796
25 +DIST genpatches-5.10-121.extras.tar.xz 3868 BLAKE2B 8ac8a382c1d7bbd47dc8761e26ae63ccb501decdbf43e4cde641441c1e08a711a9734320cb9a28e46c3d22a0dbfe5f0d2b3360f299878e5ed46c7cba2fd7b64a SHA512 f050bd3cf40e8d4d37a8652ab2af932fecc38a834c6baceab1c79cc6aba47f3a19e59aadce250c5b5302830e440001bd7a4c9a380d8ec35e12527ece903a69fa
26 DIST genpatches-5.15-35.base.tar.xz 1306764 BLAKE2B 5ea5655e825b9196663a7bb830ef34d74da7c9f922f7a71b46f7bc8755adacddd3b55f57e85b29532d6936ca481699ffae36642401e34293b4c6a445abb92db7 SHA512 50030f2dafba3e7fd16df7a6dd275fdbede772273009d1f1055dc904dc7afe947e92e9a32274c337938edd35073adc2e101d18a6ccd39529461d703af3e20566
27 DIST genpatches-5.15-35.extras.tar.xz 3876 BLAKE2B 5b14c88d66ede25e8417bdebc3c822d2f3755a13f21cef8a95088c97bba42a44357c98d13ce5a40e3aeb128ec0716540e893b108bf1f73256cb45250cd7ef43c SHA512 bdd8c5a700e9902cb7db17094fcc220eaca4774639d73e8496ac061fbba9fb80f6aa136aa9e87331a636af6146737fdec3c21249da7a18b5fec4d82de559e24f
28 DIST genpatches-5.15-36.base.tar.xz 1545664 BLAKE2B 367785e90aeba2a5498c5a17443429bd6650ab40390db6feb349eb54431e36ddecdfb031785f74355e5cdd7105636bffc8c0a86821ea36ee257d40cc0fc54d31 SHA512 63191671b4b41fb4a45d0535782bf638976e520e227ac6e924ce7e783e67ed02c8f127574f263d9373cb5d79591f1de209d09ceb47ba6ce34acb57c6a991857a
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.112-r1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.112-r1.ebuild
31 new file mode 100644
32 index 000000000000..161f70398d65
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.112-r1.ebuild
35 @@ -0,0 +1,131 @@
36 +# Copyright 2020-2022 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##*.} + 9 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.10.12
47 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
48 +GENTOO_CONFIG_VER=g1
49 +
50 +DESCRIPTION="Linux kernel built with Gentoo patches"
51 +HOMEPAGE="https://www.kernel.org/"
52 +SRC_URI+="
53 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
54 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
55 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
56 + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
57 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
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 +RDEPEND="
83 + !sys-kernel/gentoo-kernel-bin:${SLOT}
84 +"
85 +BDEPEND="
86 + debug? ( dev-util/pahole )
87 +"
88 +PDEPEND="
89 + >=virtual/dist-kernel-${PV}
90 +"
91 +
92 +QA_FLAGS_IGNORED="
93 + usr/src/linux-.*/scripts/gcc-plugins/.*.so
94 + usr/src/linux-.*/vmlinux
95 +"
96 +
97 +src_prepare() {
98 + local PATCHES=(
99 + # meh, genpatches have no directory
100 + "${WORKDIR}"/*.patch
101 + )
102 + default
103 +
104 + local biendian=false
105 +
106 + # prepare the default config
107 + case ${ARCH} in
108 + amd64)
109 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
110 + ;;
111 + arm)
112 + return
113 + ;;
114 + arm64)
115 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
116 + biendian=true
117 + ;;
118 + hppa)
119 + return
120 + ;;
121 + ppc)
122 + # assume powermac/powerbook defconfig
123 + # we still package.use.force savedconfig
124 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
125 + ;;
126 + ppc64)
127 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
128 + biendian=true
129 + ;;
130 + x86)
131 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
132 + ;;
133 + *)
134 + die "Unsupported arch ${ARCH}"
135 + ;;
136 + esac
137 +
138 + local myversion="-gentoo-dist"
139 + use hardened && myversion+="-hardened"
140 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
141 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
142 +
143 + local merge_configs=(
144 + "${T}"/version.config
145 + "${dist_conf_path}"/base.config
146 + )
147 + use debug || merge_configs+=(
148 + "${dist_conf_path}"/no-debug.config
149 + )
150 + if use hardened; then
151 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
152 +
153 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
154 +
155 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
156 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
157 + fi
158 + fi
159 +
160 + # this covers ppc64 and aarch64_be only for now
161 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
162 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
163 + fi
164 +
165 + kernel-build_merge_configs "${merge_configs[@]}"
166 +}