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: Tue, 02 Nov 2021 22:59:22
Message-Id: 1635893939.f60711d3e18697f63bb1ff1e530533391cb548c9.mgorny@gentoo
1 commit: f60711d3e18697f63bb1ff1e530533391cb548c9
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Nov 2 20:40:07 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Nov 2 22:58:59 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f60711d3
7
8 sys-kernel/gentoo-kernel: Bump to 5.14.16
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.16.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 5af0343a6eb..fc16fc8af90 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -10,6 +10,8 @@ DIST genpatches-5.14-15.base.tar.xz 544344 BLAKE2B 5315b7c850517e559fda958cb73d9
21 DIST genpatches-5.14-15.extras.tar.xz 3840 BLAKE2B 824c2a15749f6e83b03669df117a0838ef955430c4781f5b1423d6a5eb4d3b594c99bda3220ceff3875b00601bf2564eb211ee470a04a7e221f5300d0552adf0 SHA512 197bbcb69a9e79f7938342a7ec2d8b6baa55b48f121ff5bef6d8a3969e41a646fa357cf394e9fb3e8ac6c43338749e8be8b50319020564eff5c30b49786978f1
22 DIST genpatches-5.14-16.base.tar.xz 591456 BLAKE2B 5c2faa9bbbc7c35b2c81d2cc3f11e61f3e69964187abfc70301c33fa58bd4762beceab0c298c0b16468def49482d4a0b32c93add83f94bde6e930284f7fc2922 SHA512 860f2cea8a95cfdc0e1524baa5baf168dcd06309a44319503ca0768b611118cc9a654eafc6ac22c2fe5d1a33954a27e7c53a55480e64310442a9a8e279f3e2ba
23 DIST genpatches-5.14-16.extras.tar.xz 3840 BLAKE2B c36321060c45651af5fe20fd7bffb8cc2c2cede11a9880997381acd9ab74a2ce99b89632c1061aa1542a6451a87ec4d7ad2536725bf429c243418e6c551d342c SHA512 bf77ba8560347ffd328b97e234d07bd1a8a22378e0209807b21b9cd78d458d4c3bb7a721583d5fffe919ff72fd3c74936dc5a97c911de1ffb35e8db696ff0b5b
24 +DIST genpatches-5.14-17.base.tar.xz 622212 BLAKE2B a0c5bcabe08e292287b57cdbdd573c8b61cedfc0560a63958ccafe2c1cd671b057b3faf6c4a577e9063b6eae46a1c6d7fb7e25ee92406e4a597ec0e74bb241d3 SHA512 3042091a962cd540b504570ab5ec11b3dda25b84c03529e78a01db232b4a0a716b9ee7b60352b7ad5afca7534af6ccdf14bcad9140ebd78ed56f292e47bf103f
25 +DIST genpatches-5.14-17.extras.tar.xz 3844 BLAKE2B f50d2d3e47b0e0387c68eff502be6163a167436f6e99a59a56420c1f4215cee35a892b95bcfb2b2f73261db57b52675f080e90a3f69512ba00163bef95cd8e94 SHA512 eaed5b496a124c94093d85cc23d73b345b9bc6b946656fa9e8f3d7eeff719303841f199d9d1312b4d8b69e7f55883a3c8961d3cd568c5ac48390850511c936ad
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 genpatches-5.4-159.base.tar.xz 4064516 BLAKE2B c2c8350597d7cbe7652cea4b5a3fa92376259f1f4f15c3387f80f24b31d571cbb1094a27f52b099f0c61ce0187c3f498ccd4898cbb63f03c7367df39fdc475b0 SHA512 31116496b8d570d596a91e3408db055cbc602af2608ce579f5ce5ff41c084f629edde49c1efdf6220289451286f8a0b68d2937b916886f51b9a7d0529f130d2c
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16.ebuild
31 new file mode 100644
32 index 00000000000..e3f5ae1d9d4
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.14.16.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.14
47 +CONFIG_HASH=072218102fd9274725c08fe0686fa387ddf02371
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 +}