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, 06 Jan 2022 00:13:01
Message-Id: 1641427965.3aa5b4b119b7ce622cedfe07d615cde21301f61a.mgorny@gentoo
1 commit: 3aa5b4b119b7ce622cedfe07d615cde21301f61a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 5 19:36:24 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 6 00:12:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aa5b4b1
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.90
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.90.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 3e13106bf1df..0bf51bd0725c 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -2,6 +2,8 @@ DIST genpatches-5.10-95.base.tar.xz 2769920 BLAKE2B 5de95da15985c9188801c6dfc413
21 DIST genpatches-5.10-95.extras.tar.xz 3852 BLAKE2B 1deb0958934dfe7b0092ffe9254269fc8ca900cb526f4805e38d7c69e8d4d587b50a169b1a54d32ed83fdf481626f853ae56e007a21554d82a7befc598d571b2 SHA512 f3c5ca1aaa1f7ba0743fe0d0f3046e411547c09d3590766b76778dbdbe1221ffd3542f3231e6ac6a77773caf3327d28aaa7bcb767cdf132a4fac7cf8afd3e86c
22 DIST genpatches-5.10-96.base.tar.xz 2787744 BLAKE2B 0d845fc9e5eb4cee41eb60756661d5220da31ea438a16a415431415a54503278b0fcd69cb8562e1c7c47ae794df4d0691a92ef034aa5650ece4b0ea29f56c73d SHA512 5424bb5c20f6b918abfa8b308ceae9dc321d1a8621e311ec1c492b9efd9bde41f695d12085b0c8eea16b8113832580b1ad831ff18a5354e5cac2e275d99bfdab
23 DIST genpatches-5.10-96.extras.tar.xz 3852 BLAKE2B cd431b92e31f333d913f8607df5d3656dfb924c4dca63e86ac30e52b636773f82287481b4a51af57d51685bf55db2d0d5028bf3e5a3255de0481d277842681a7 SHA512 3612c26007ea77b2ef0657a1c11174f1468bbc1cce46cc189a829f66f1b242a54f29305ff405ed49356427f0283ffb23e5299ccefd7dc083492eb0143855bcd5
24 +DIST genpatches-5.10-97.base.tar.xz 2802920 BLAKE2B 09d1dad0c97f969f645631ed73963c561e03caf32c777047352e838553c63802bddb45908c0fa72debbbc481838125e2e20eff9e022a75e7d5cfeb6b45cc871a SHA512 d53660b318b5b68ab57613360294b816bd5d041a6c10048a3942186be0500a43d3313dd8a8b2d0337dab914f6d3a16d48acd06dc6c095e63f75e87ad8d3fc8c8
25 +DIST genpatches-5.10-97.extras.tar.xz 3852 BLAKE2B 5a00cefa5655fd06944c70ead8e8dcad1759b98fd898a7c6dd40e1f6d3e7f25185b1b9a5d1ececc09a4896ce2cf47d2d58f23f1326f0ff626ed31b05386408dd SHA512 afa2e426035ed8cc88d93f40a19e4978973f29434e94cc44cb18f585b4c8a377ec2c3d1212b9f53e2ddcf6cb70b47daec7b7154cba5646f5c31189587819f9a6
26 DIST genpatches-5.14-24.base.tar.xz 865892 BLAKE2B 5855b54e7ad2fe9fec353706d026b774c939f82967af5b57c41245762e0ea7fd18731faf1251b1b7aa814c2949d354ff24ce9f078dc68a5c8409490e5517462b SHA512 d83feb3e3c9a32df559fd25b598cb358987f076c107a233a8503390f85132fe6d2a62ee163482439308fa7a62d15aa83ebf9bebaabe0e631eb831fbbbfb700c8
27 DIST genpatches-5.14-24.extras.tar.xz 3844 BLAKE2B b11a8019a920d12c848fdc34514ed7352217e41f659bb7935c6211132897e8f948a8ebfd281b89e67e3993e3e5a03f2f32b0b4d3b73f5d1228e65812cf6cbeea SHA512 a2b757955740078aa3891a6a696bd50fa35606bfc6dac0e739abe2869d5322554417b4bfd6a989d23a2d31bea14c06294747578025ffac3d77e8a91ea16f4ee6
28 DIST genpatches-5.15-13.base.tar.xz 604984 BLAKE2B c674c2eefbc18f2a8d182fa95606714b9a74420d7a3ebb32138b714743f11a7c7b278d77d33747bd1fa1a46e8f8e8364a9238ce3acee6134f889fae267ab0239 SHA512 0741c183cf8def586fc17fcb2a44d81dd5494ac9430a5ca07d239079f41a7a24bb686406e0ecfccdeb8a38e33e99831d2b355d0e8e65e8dd2e30db5f4b0bbe4d
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90.ebuild
31 new file mode 100644
32 index 000000000000..c59cb90ecb8c
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90.ebuild
35 @@ -0,0 +1,124 @@
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##*.} + 7 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.10.12
47 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
48 +GENTOO_CONFIG_VER=5.15.5
49 +
50 +DESCRIPTION="Linux kernel built with Gentoo patches"
51 +HOMEPAGE="https://www.kernel.org/"
52 +SRC_URI+="
53 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
54 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
55 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
56 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
57 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
58 + amd64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
60 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
64 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
68 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
72 + -> kernel-i686-fedora.config.${CONFIG_VER}
73 + )"
74 +S=${WORKDIR}/${MY_P}
75 +
76 +LICENSE="GPL-2"
77 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
78 +IUSE="debug hardened"
79 +REQUIRED_USE="arm? ( savedconfig )"
80 +
81 +RDEPEND="
82 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
83 +BDEPEND="
84 + debug? ( dev-util/pahole )"
85 +PDEPEND="
86 + >=virtual/dist-kernel-${PV}"
87 +
88 +QA_FLAGS_IGNORED="
89 + usr/src/linux-.*/scripts/gcc-plugins/.*.so
90 + usr/src/linux-.*/vmlinux
91 +"
92 +
93 +src_prepare() {
94 + local PATCHES=(
95 + # meh, genpatches have no directory
96 + "${WORKDIR}"/*.patch
97 + )
98 + default
99 +
100 + local biendian=false
101 +
102 + # prepare the default config
103 + case ${ARCH} in
104 + amd64)
105 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
106 + ;;
107 + arm)
108 + return
109 + ;;
110 + arm64)
111 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
112 + biendian=true
113 + ;;
114 + ppc)
115 + # assume powermac/powerbook defconfig
116 + # we still package.use.force savedconfig
117 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
118 + ;;
119 + ppc64)
120 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
121 + biendian=true
122 + ;;
123 + x86)
124 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
125 + ;;
126 + *)
127 + die "Unsupported arch ${ARCH}"
128 + ;;
129 + esac
130 +
131 + local myversion="-gentoo-dist"
132 + use hardened && myversion+="-hardened"
133 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
134 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
135 +
136 + local merge_configs=(
137 + "${T}"/version.config
138 + "${dist_conf_path}"/base.config
139 + )
140 + use debug || merge_configs+=(
141 + "${dist_conf_path}"/no-debug.config
142 + )
143 + if use hardened; then
144 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
145 +
146 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
147 +
148 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
149 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
150 + fi
151 + fi
152 +
153 + # this covers ppc64 and aarch64_be only for now
154 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
155 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
156 + fi
157 +
158 + kernel-build_merge_configs "${merge_configs[@]}"
159 +}