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: Wed, 29 Dec 2021 18:57:04
Message-Id: 1640804210.d8e62a40bc6b070576f9c9a04b4378fde1d2af1b.mgorny@gentoo
1 commit: d8e62a40bc6b070576f9c9a04b4378fde1d2af1b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 29 14:29:21 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 29 18:56:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8e62a40
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.89
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.89.ebuild | 124 +++++++++++++++++++++
14 2 files changed, 126 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index eb3de1d70e2d..ef0914090df7 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-95.base.tar.xz 2769920 BLAKE2B 5de95da15985c9188801c6dfc413faa7fae2c534ccbc17ca3e8e3f70ff1422e00819b177cc4e1828eb6234ec110930af6e747089482e8efca010c1dd7fffa098 SHA512 4f6d6196406af59c3f9b7d9d069cf0d2186e45f10bccdaac0c1473520ed67606fd363d97b64eb53cb76c08c4d8e4198d67744af34a60e78419cc7c6ffe28a26f
22 DIST genpatches-5.10-95.extras.tar.xz 3852 BLAKE2B 1deb0958934dfe7b0092ffe9254269fc8ca900cb526f4805e38d7c69e8d4d587b50a169b1a54d32ed83fdf481626f853ae56e007a21554d82a7befc598d571b2 SHA512 f3c5ca1aaa1f7ba0743fe0d0f3046e411547c09d3590766b76778dbdbe1221ffd3542f3231e6ac6a77773caf3327d28aaa7bcb767cdf132a4fac7cf8afd3e86c
23 +DIST genpatches-5.10-96.base.tar.xz 2787744 BLAKE2B 0d845fc9e5eb4cee41eb60756661d5220da31ea438a16a415431415a54503278b0fcd69cb8562e1c7c47ae794df4d0691a92ef034aa5650ece4b0ea29f56c73d SHA512 5424bb5c20f6b918abfa8b308ceae9dc321d1a8621e311ec1c492b9efd9bde41f695d12085b0c8eea16b8113832580b1ad831ff18a5354e5cac2e275d99bfdab
24 +DIST genpatches-5.10-96.extras.tar.xz 3852 BLAKE2B cd431b92e31f333d913f8607df5d3656dfb924c4dca63e86ac30e52b636773f82287481b4a51af57d51685bf55db2d0d5028bf3e5a3255de0481d277842681a7 SHA512 3612c26007ea77b2ef0657a1c11174f1468bbc1cce46cc189a829f66f1b242a54f29305ff405ed49356427f0283ffb23e5299ccefd7dc083492eb0143855bcd5
25 DIST genpatches-5.14-24.base.tar.xz 865892 BLAKE2B 5855b54e7ad2fe9fec353706d026b774c939f82967af5b57c41245762e0ea7fd18731faf1251b1b7aa814c2949d354ff24ce9f078dc68a5c8409490e5517462b SHA512 d83feb3e3c9a32df559fd25b598cb358987f076c107a233a8503390f85132fe6d2a62ee163482439308fa7a62d15aa83ebf9bebaabe0e631eb831fbbbfb700c8
26 DIST genpatches-5.14-24.extras.tar.xz 3844 BLAKE2B b11a8019a920d12c848fdc34514ed7352217e41f659bb7935c6211132897e8f948a8ebfd281b89e67e3993e3e5a03f2f32b0b4d3b73f5d1228e65812cf6cbeea SHA512 a2b757955740078aa3891a6a696bd50fa35606bfc6dac0e739abe2869d5322554417b4bfd6a989d23a2d31bea14c06294747578025ffac3d77e8a91ea16f4ee6
27 DIST genpatches-5.15-13.base.tar.xz 604984 BLAKE2B c674c2eefbc18f2a8d182fa95606714b9a74420d7a3ebb32138b714743f11a7c7b278d77d33747bd1fa1a46e8f8e8364a9238ce3acee6134f889fae267ab0239 SHA512 0741c183cf8def586fc17fcb2a44d81dd5494ac9430a5ca07d239079f41a7a24bb686406e0ecfccdeb8a38e33e99831d2b355d0e8e65e8dd2e30db5f4b0bbe4d
28
29 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89.ebuild
30 new file mode 100644
31 index 000000000000..c59cb90ecb8c
32 --- /dev/null
33 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.89.ebuild
34 @@ -0,0 +1,124 @@
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##*.} + 7 ))
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.10.12
46 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
47 +GENTOO_CONFIG_VER=5.15.5
48 +
49 +DESCRIPTION="Linux kernel built with Gentoo patches"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+="
52 + 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 ~ppc ~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="
88 + usr/src/linux-.*/scripts/gcc-plugins/.*.so
89 + usr/src/linux-.*/vmlinux
90 +"
91 +
92 +src_prepare() {
93 + local PATCHES=(
94 + # meh, genpatches have no directory
95 + "${WORKDIR}"/*.patch
96 + )
97 + default
98 +
99 + local biendian=false
100 +
101 + # prepare the default config
102 + case ${ARCH} in
103 + amd64)
104 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
105 + ;;
106 + arm)
107 + return
108 + ;;
109 + arm64)
110 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
111 + biendian=true
112 + ;;
113 + ppc)
114 + # assume powermac/powerbook defconfig
115 + # we still package.use.force savedconfig
116 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
117 + ;;
118 + ppc64)
119 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
120 + biendian=true
121 + ;;
122 + x86)
123 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
124 + ;;
125 + *)
126 + die "Unsupported arch ${ARCH}"
127 + ;;
128 + esac
129 +
130 + local myversion="-gentoo-dist"
131 + use hardened && myversion+="-hardened"
132 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
133 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
134 +
135 + local merge_configs=(
136 + "${T}"/version.config
137 + "${dist_conf_path}"/base.config
138 + )
139 + use debug || merge_configs+=(
140 + "${dist_conf_path}"/no-debug.config
141 + )
142 + if use hardened; then
143 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
144 +
145 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
146 +
147 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
148 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
149 + fi
150 + fi
151 +
152 + # this covers ppc64 and aarch64_be only for now
153 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
154 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
155 + fi
156 +
157 + kernel-build_merge_configs "${merge_configs[@]}"
158 +}