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: Sun, 26 Sep 2021 18:24:50
Message-Id: 1632680669.32fb24a4c1acf0840f4282a655a7cd4edf7c86db.mgorny@gentoo
1 commit: 32fb24a4c1acf0840f4282a655a7cd4edf7c86db
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 26 15:50:32 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 26 18:24:29 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32fb24a4
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.69
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.69.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 31030856310..53dac7a7428 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -1,5 +1,7 @@
21 DIST genpatches-5.10-74.base.tar.xz 2293400 BLAKE2B 2650a20ec34fb977583e069168b374477e16c9eb0da2d6f2118f259034fe2d02b3941cb0a36780bb0e123f60b2b62bff89dd058aec5aa050f7ab407361aaa68b SHA512 3b5584878622d899256a554687822279f13944346c3be25b2836c480b2b19c9a875f93400bf34896855f29c28b31aa8b624c1802b99db7ef3469f3508f3476c4
22 DIST genpatches-5.10-74.extras.tar.xz 3852 BLAKE2B a8410d8b87601e2f3531d42ba797e68d85e325763309657f7e701e8cf0ef9f1f25554efe9b02423ae6019b97167693f05c3a532178871b195e2a19efb3bb37a8 SHA512 5891aaaa160f0d1eabf6ff12b356492fa5fced698271ffd8c60416738a16e382467ec61d964a8f7a755a6ac6fae6670072429d8cc6833e01847889fe3fb3cc97
23 +DIST genpatches-5.10-75.base.tar.xz 2308144 BLAKE2B d2544579afcdce0849fc64b283d00b6bf4b1674a2084cb1b79fef20b9e5c6c8f4e2409e505861637221b30f29d6197edcd5f1f73a6929b709adc404b8bb64cad SHA512 4e1c48d5f5eb5ef20ab2a228df6cc499110de1e901c288fa23c2c4619a13038f8ca6b8d25a15813ab001de48270e8d09dfdcbc9746e594fc9070cf529528ea95
24 +DIST genpatches-5.10-75.extras.tar.xz 3848 BLAKE2B d8e5de1d9129e5afe1544ef2b28b6cb13f3e0706acc569716373c1dabce68004ea602aaf54b1263041cda810d66792e26f4770d0dbcf5884e0d32e27cf09b234 SHA512 8bdb699a90ff43dc5d9359e2d3792a497253c7b163d3e047557079e5620f22defcf4b1586b40c4f37b38ee5912ab54d89e3b583845d363f186291cdfdd5aa4f9
25 DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f90f92bf4737eee326a33297c03d9cefd5da3182262626caf4635a3c66329df5fd0f28d55a963b5fbba110f025e7874f00726 SHA512 55f21fa1711464d686dcac9886ed0420cf48d2ab4e1b98ec1d8ac52c8828d4d8c2d71c4e57df989d23df670d46a00ec2c7dcdd4dfb7f411e904e379f9fb702f1
26 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
27 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
28
29 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69.ebuild
30 new file mode 100644
31 index 00000000000..8a97f9b5278
32 --- /dev/null
33 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.69.ebuild
34 @@ -0,0 +1,105 @@
35 +# Copyright 2020-2021 Gentoo Authors
36 +# Distributed under the terms of the GNU General Public License v2
37 +
38 +EAPI=7
39 +
40 +inherit kernel-build toolchain-funcs
41 +
42 +MY_P=linux-${PV%.*}
43 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 ))
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.10.12
46 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
47 +GENTOO_CONFIG_VER=5.10.42
48 +
49 +DESCRIPTION="Linux kernel built with Gentoo patches"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
52 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
53 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
54 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
55 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
56 + amd64? (
57 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
58 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
59 + )
60 + arm64? (
61 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
62 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
63 + )
64 + ppc64? (
65 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
66 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
67 + )
68 + x86? (
69 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
70 + -> kernel-i686-fedora.config.${CONFIG_VER}
71 + )"
72 +S=${WORKDIR}/${MY_P}
73 +
74 +LICENSE="GPL-2"
75 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
76 +IUSE="debug hardened"
77 +REQUIRED_USE="arm? ( savedconfig )"
78 +
79 +RDEPEND="
80 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
81 +BDEPEND="
82 + debug? ( dev-util/pahole )"
83 +PDEPEND="
84 + >=virtual/dist-kernel-${PV}"
85 +
86 +QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
87 +
88 +src_prepare() {
89 + local PATCHES=(
90 + # meh, genpatches have no directory
91 + "${WORKDIR}"/*.patch
92 + )
93 + default
94 +
95 + # prepare the default config
96 + case ${ARCH} in
97 + amd64)
98 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
99 + ;;
100 + arm)
101 + return
102 + ;;
103 + arm64)
104 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
105 + ;;
106 + ppc64)
107 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
108 + ;;
109 + x86)
110 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
111 + ;;
112 + *)
113 + die "Unsupported arch ${ARCH}"
114 + ;;
115 + esac
116 +
117 + local myversion="-gentoo-dist"
118 + use hardened && myversion+="-hardened"
119 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
120 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
121 +
122 + local merge_configs=(
123 + "${T}"/version.config
124 + "${dist_conf_path}"/base.config
125 + )
126 + use debug || merge_configs+=(
127 + "${dist_conf_path}"/no-debug.config
128 + )
129 + if use hardened; then
130 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
131 +
132 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
133 +
134 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
135 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
136 + fi
137 + fi
138 + kernel-build_merge_configs "${merge_configs[@]}"
139 +}