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, 30 Sep 2021 16:45:53
Message-Id: 1633020339.f683af572a6f7249a53fa3c2c370bb8d5503952d.mgorny@gentoo
1 commit: f683af572a6f7249a53fa3c2c370bb8d5503952d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 30 13:04:54 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 30 16:45:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f683af57
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.70
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.70.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 e275ae671af..e1d17a20bd6 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -2,6 +2,8 @@ DIST genpatches-5.10-74.base.tar.xz 2293400 BLAKE2B 2650a20ec34fb977583e069168b3
21 DIST genpatches-5.10-74.extras.tar.xz 3852 BLAKE2B a8410d8b87601e2f3531d42ba797e68d85e325763309657f7e701e8cf0ef9f1f25554efe9b02423ae6019b97167693f05c3a532178871b195e2a19efb3bb37a8 SHA512 5891aaaa160f0d1eabf6ff12b356492fa5fced698271ffd8c60416738a16e382467ec61d964a8f7a755a6ac6fae6670072429d8cc6833e01847889fe3fb3cc97
22 DIST genpatches-5.10-75.base.tar.xz 2308144 BLAKE2B d2544579afcdce0849fc64b283d00b6bf4b1674a2084cb1b79fef20b9e5c6c8f4e2409e505861637221b30f29d6197edcd5f1f73a6929b709adc404b8bb64cad SHA512 4e1c48d5f5eb5ef20ab2a228df6cc499110de1e901c288fa23c2c4619a13038f8ca6b8d25a15813ab001de48270e8d09dfdcbc9746e594fc9070cf529528ea95
23 DIST genpatches-5.10-75.extras.tar.xz 3848 BLAKE2B d8e5de1d9129e5afe1544ef2b28b6cb13f3e0706acc569716373c1dabce68004ea602aaf54b1263041cda810d66792e26f4770d0dbcf5884e0d32e27cf09b234 SHA512 8bdb699a90ff43dc5d9359e2d3792a497253c7b163d3e047557079e5620f22defcf4b1586b40c4f37b38ee5912ab54d89e3b583845d363f186291cdfdd5aa4f9
24 +DIST genpatches-5.10-76.base.tar.xz 2336392 BLAKE2B 72b937a112169e68f5ae72fa7c0cfbbfb76e800b67e40d8c16b77203af22e245c7ae1eb89265e0248924d31a0b035617e559121fc798921cc5d715156fdbfbed SHA512 cb46fddfed81f89bc78f4d85f28af5400641a9c8884f9502a01cba591fa2b3f428e1d9bad2e16c11c2ed7eb3db4b0e6e840f9f6e03639d4aafe2f7ec3b4d3af1
25 +DIST genpatches-5.10-76.extras.tar.xz 3848 BLAKE2B 89eba39e2c72ca1fed282a32b5de3dd027797940823619edb5c2a0daf341c8ba7c512d204de6991a8a85c348f47459209d3d24ce917370b4b4f7d330b31da4cc SHA512 98163a299c371b3f8fda9268e8994e16de6cfb90f8c5a6ccf6e6cb85d5ff05ec721021bcdc8ec34bf6620a7ccd8055712f7d0b879b5638a376eaa458457f079b
26 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
27 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
28 DIST genpatches-5.14-10.base.tar.xz 395372 BLAKE2B a645dc7c97a08fbd4f58b9696a58f5e61859858cec6214593e75c8394ec11464bf469ad4f17d75dc978878beb4cc7e9a37a91f0d879ddefe5e50cb80f38a85ce SHA512 add638c70c9d1e95aed125db0d3cbfd1b9c7b4fc2ab5c5548d38dd1bff7cce57e459a8175d9e4e719a4c2bb95e3ee10ee697b5288ff9ef26a9cb50287eee1d86
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.70.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.70.ebuild
31 new file mode 100644
32 index 00000000000..8a97f9b5278
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.70.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##*.} + 6 ))
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 +}