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: Mon, 06 Jun 2022 17:14:25
Message-Id: 1654535552.ece45b1a35798383882cc3ce8353b9da2ed97f62.mgorny@gentoo
1 commit: ece45b1a35798383882cc3ce8353b9da2ed97f62
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 6 12:10:21 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 6 17:12:32 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ece45b1a
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.120
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.120.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 0417debecbf7..4374374e3470 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -4,6 +4,8 @@ DIST genpatches-5.10-127.base.tar.xz 3469464 BLAKE2B e14c637285530bec0187c71aedb
21 DIST genpatches-5.10-127.extras.tar.xz 3868 BLAKE2B 6a7c16cab44182ebb5262a7e419d68daa265a55ee51b3ad6a8d30ce20299090250e00bf295c30551d07bdd935acfad6753128cb0dd5f975b11fc3c31b1537689 SHA512 8bddbd6ac07595d76efce9ec9595b0da1ea1cf49735ab22ceac6d312d59a72304ea7557eca349896c6936dec060dcac3cf2a877e213e4d4d5964e330f37a05f1
22 DIST genpatches-5.10-128.base.tar.xz 3512860 BLAKE2B 2d01ea45d9fb1ca3fdb216cc7fb2807d351a5f96aa5174bd86acdd5c425dc2fe277443adb00c66dcaa7bbc89aef1be27b7bce2eb3f2d41d547aaeaf4b5f875b9 SHA512 32b4f989b9a0b6978c90f002c12b0da3ac376ffce93ac6a84c4fdcc5a2aa9484f1c5305cb74b59eaa4ed0311d000164cc7d9211d8eb3186c44e0214e745e303a
23 DIST genpatches-5.10-128.extras.tar.xz 3872 BLAKE2B b797d3b758b6472b55021e34f567122b0103fc60e9aca785a3ebf196deca22e13cf6423aed5126e9f441fea69db60f72934072b18a3821c61896a372562d9a52 SHA512 a021a9b67fafc0ec650a4bdf87ca72bb7ac39d705aeaef5bd650e115a46d4c2dafab4ff853e6585f14e18fda15dbca489adafd7e86843a73a656848b6bc416da
24 +DIST genpatches-5.10-129.base.tar.xz 3527080 BLAKE2B 91778a19b8905af40a0f80cc63434b378ab6c502d1fa01bdd81c258fd6c0010051d1cb4649a60050799c6654686cd37fbcc4aab2224029d274181cb404c3524d SHA512 94e12e0801a0dcd2645430074e03c446de75fa7106a5ecbc95be288b44ae387eb4a17c3237f66e6a0fc6651d973843cc32919c3ccfc807b1c1d36dbeca4137d1
25 +DIST genpatches-5.10-129.extras.tar.xz 3868 BLAKE2B 85f4030ed0bd5aaac7c1e0d5f64412557a2684d0d53b1243357b0c5d3c521cad0cc5d72af7cdfad1fe8304454a3b1fb8adffd797aa0985353729911c48e17342 SHA512 69db79779a285aa4127339bb11bd77de8e2d9500eb85fc582473bf487a36983edff85b475bcee41b55417895503bc6799ae17f8260e056efcac43f88ff9c64a0
26 DIST genpatches-5.15-45.base.tar.xz 1826632 BLAKE2B 77bb4d997b63723f677f82b91b33afd0f35367d9304051999a0daa84da26feb99fc76a61af77a5e477a5a8ded1a5c12316450563cd56b6c93a93e6df6421b107 SHA512 9435803d4dd65fa78d8e14e992681aeb016d3672b81d589b293d1cbacc024605e18429529803ba344ecae1610bb77150a7b2405cd43f00fc905e9c6babef04c1
27 DIST genpatches-5.15-45.extras.tar.xz 3932 BLAKE2B e2c4132995b7b39c9d135e17cd21315013cfa8b9de9b222206d9ff9a5780c4f35be294eb6d71130a9f4b9fbd9c2f31ded41c1c6dfecb2fdc4401118411a7485a SHA512 5b1cf3281df2fe24eac3827b0753c83305dd956b23351899be1dd37a89d00917c771475e3df3f9980f6b0fd210420b479c6196c7d1ea2ea9a0d711fab50cfb64
28 DIST genpatches-5.15-47.base.tar.xz 1869424 BLAKE2B 461735737047406f44d86088681cf3fbd591278c1878e7f1aebdfbdb726b5c8ccbffe43bf2c34e5baa57c04eb5fb08a723b9473b843639835383bbde464c1ade SHA512 e6ec4a4ab7abf3b91face2df9f8fa7089c054a7c5e44d8404742d05dac9bf7940e6c0f97f219519f8bce22f3cd3e40fd98c856da866b5cbd637094aee1bd884e
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.120.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.120.ebuild
31 new file mode 100644
32 index 000000000000..161f70398d65
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.120.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 +}