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:49
Message-Id: 1632680664.20403a144c96961fe545c7a80bbfea54a0983860.mgorny@gentoo
1 commit: 20403a144c96961fe545c7a80bbfea54a0983860
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Sep 26 15:49:45 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Sep 26 18:24:24 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20403a14
7
8 sys-kernel/gentoo-kernel: Bump to 5.14.8
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.14.8.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 6366f830cdf..31030856310 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -4,6 +4,8 @@ DIST genpatches-5.13-21.base.tar.xz 951176 BLAKE2B ba681ca3732dd42d0242c2b4e95f9
21 DIST genpatches-5.13-21.extras.tar.xz 3852 BLAKE2B 5f1b6adf7944a5f8b8394ad651e08647284c685838309f4ae9c58e2fb6ad127ac48e8ba10b65f058793731ae39ea683c290e30425aeb306ee8e6baf7bc7f812a SHA512 397e625d456feb5aa3ee75c18348401c976556a38c401afdf7e242e036fb432c3fafaa6bc8b44d046ccd64be418407927fcd366d172386765832be4877a6d3b3
22 DIST genpatches-5.14-8.base.tar.xz 315608 BLAKE2B 1a19a4aa497580d5d1ceed952899f0f19b13fa36a585206c1ce9b3c348754f6c94aeb7a697fadeda88ecd9e2b35e7d9061601bfbbc720cce00030b3b0de5d26f SHA512 5d131854f01730a807eba05109270f80d40b5f9db4fc7a9f9041200eb0025e4ef436a6df51d2020ae4cb737ff2846e080a318c92975be1d54a17e99131d6771a
23 DIST genpatches-5.14-8.extras.tar.xz 3852 BLAKE2B 6ec8bdf43eca6d43f5e88f19e15c23e056d5f5144a5c746e3eb20170c445de82e465bdc5ef85f95a1c65582c458110437287d8f31022132fa092096147540c88 SHA512 d6a65dbe36ea6c5eb20f3df047493e3e3e31b27e4a812c9541e50deb4bfbe795de3f8eba4d901bf34a013d46ead22f849b77f3c2bd305f2b28cd039459f6c43f
24 +DIST genpatches-5.14-9.base.tar.xz 349596 BLAKE2B 801a5a1aec2e0cd1b52f1c21fd3349f91f8bbfd33c40892b28679ca89799f5589d333e5227674fed3326d0094f5932959427e31e5dc847aec261ebf164d2954d SHA512 a8463a1cda8084afd1e6613ba160c9a75b1a136331217627f9a6b7876f33e9bd4947cd6c059f481612962e430ef530fac246e8b48c38ca8f505b949296390590
25 +DIST genpatches-5.14-9.extras.tar.xz 3848 BLAKE2B be3a00343649275e63e4c2b91c442f4b9ee2724b803858c1d2e9b15464b3ee10bedf9f2afd879bcd41ab10f0d1b140e2a8714661fd4509614b57dbd42a1ee149 SHA512 cc3b55fe8442d573437203cc0f50184635a3f43afee5218794901c22e647e77e2cca985c3a824b71b734c895f744481a87bf500bde8723fb8910ef95a5310f48
26 DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432 SHA512 bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
27 DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92 SHA512 cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
28 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.8.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.8.ebuild
31 new file mode 100644
32 index 00000000000..b7a0d9f3417
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.8.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##*.} + 1 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.14.6
47 +CONFIG_HASH=416de8884575795f040923fb460e7fc5e5d67102
48 +GENTOO_CONFIG_VER=5.13.4
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 +}