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, 10 Jun 2021 16:47:20
Message-Id: 1623343616.5a04329cfe58ce0fb6d3788c84c29d3067849bea.mgorny@gentoo
1 commit: 5a04329cfe58ce0fb6d3788c84c29d3067849bea
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 10 14:03:49 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 10 16:46:56 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a04329c
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.43
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.43.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 56dc731c209..4090bfbaebe 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -10,6 +10,8 @@ DIST genpatches-5.10-44.base.tar.xz 1463796 BLAKE2B b4e002718b2542c1806eb89cd552
21 DIST genpatches-5.10-44.extras.tar.xz 1768 BLAKE2B 287454aae7ff60ac375b570e5132c33f81471348af58b999ca1355d15e7fd1f0839c369e28e18496dd0f9a43d6bbaed03318a9358a5b9384c3f27c109f7447e5 SHA512 d69a0a32dbd79eafe4168bccf55c0b0765e5311bd2f81ef93ce4f709990b6a789eb057b2afac7364b18e5f811b9610e7d8e10efff07a6e396c8e897b76a50378
22 DIST genpatches-5.10-45.base.tar.xz 1520656 BLAKE2B b2dbe0274ff6a90e2e8b5edd99b1505654f4e7fa777e8944a0e7ccbc23c3c8f938e061d470adb678f4a177738b22d855812c38890592a55f6746ff1f52da4e93 SHA512 b997601f68c852ceed6307c2966ba7eb6f7f4e17f30be38153b6b6604d0bea18ab0f4f66a1bb79474b0b330e30288c441026df18bbb761acb071b0f8ab8f00c2
23 DIST genpatches-5.10-45.extras.tar.xz 1768 BLAKE2B c7a3221f2c330d1463f88ce23d0ac70692ec4f390b7a10cb6ce6be19e948f8595b2b7ad0fae90b4cf1c94bb8c1469be545cf3352b91e99b93cfedc7cfcc9d7ae SHA512 51e28cb3d536e4df5743c55e1f95803a44ffaca7da75ac73dbe575051ddf3198dff4c69a0bf32fd479962ce518f5ed57be8fc3c71f426edfafb814c350f16393
24 +DIST genpatches-5.10-47.base.tar.xz 1555884 BLAKE2B a4078ace7edfd91eb3ec2f63cb121571b2d5137837a33c96ed5e09201f34cf82fe3b7e88c6684f40a2125d88aeebe275e826ccb2d63b8bc96863edba5055643d SHA512 eea3cbb4b0a9c5979f4a7504eab5eb7e041601c78d3c1f4037c2eb91fe54e7e73c7bcbd88f6e69dc859f9eb7d029bc9f55b6ffa652bf6bc742013fa8d3b0c71a
25 +DIST genpatches-5.10-47.extras.tar.xz 3412 BLAKE2B 779b0a8bb908156bc902106a98e4308b3ebfe42ecfd5d651aab4dbb95c0ee890e353d26d51e1fdb7c7305419e8eda5103a01405be5b015ebeccde869798c68a4 SHA512 dadec8511140903f38e7d6657f3e8b750382cbb18271448d3d23a03962b0ceb4b70950d6dfdb643fc2223f53254b824a04d2eec540626a20a50b998a9ddfdc13
26 DIST genpatches-5.11-25.base.tar.xz 1030312 BLAKE2B c3e0f5840c32292d36be31a8606934bfa1ccb7e31f04cd214574009577907d00912bacce1f85dddeda77ba99f40f61fa5aa5259a693c74abd63a05be5a44f2aa SHA512 5adbe3770562b57d7180a44ccca8e665cc5b0d9ba5168c4b3555b348708edd7469464bd770124d9a8641095bdbe786d843ae3da64b845d577999c9e40360c970
27 DIST genpatches-5.11-25.extras.tar.xz 1772 BLAKE2B 0bd2afbd93cd7553c8e058f61c515ed9d47e9f328529e6cf36a7100b363dc8e4c3004afa06a0c0b95963bcf69a216ae6a7bf595062401725a4a25f942f44a3e8 SHA512 114094a87bad0dc4a265847fa18b88a2795daf151de8451bb4fbe4af70f3f4bcff8905d8d90522f85914bb7ba7227ebab7f69ab59112afb2187332b393450fec
28 DIST genpatches-5.12-10.base.tar.xz 564792 BLAKE2B 127e64196c8aa0b65dab7de4dad4b97052c53451f27a1948453d8910afd59b3a5c4ffc316a439bd053b433b057df127bb252d994f6447a82dc1434eb317e0d1f SHA512 e4c9eebb61de9af0fa4a53472c18f39f87196a804c63ff796eff992f75450719400e7bed5cd8ddce6b09db8330be443ddb2ce0241d8058aedcdb5e332a4178eb
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43.ebuild
31 new file mode 100644
32 index 00000000000..5151cab9b14
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.43.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
42 +
43 +MY_P=linux-${PV%.*}
44 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.10.12
47 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
48 +GENTOO_CONFIG_VER=5.10.42
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 +}