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: Sat, 06 Nov 2021 16:52:07
Message-Id: 1636217508.954e59c773868fb6d7bacd0a49b1c130ab92dc47.mgorny@gentoo
1 commit: 954e59c773868fb6d7bacd0a49b1c130ab92dc47
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 6 14:43:41 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 6 16:51:48 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=954e59c7
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.158
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.4.158.ebuild | 90 ++++++++++++++++++++++
14 2 files changed, 92 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 2ec2f0d466a..c2d7812727f 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -26,6 +26,8 @@ DIST genpatches-5.4-160.base.tar.xz 4078816 BLAKE2B 478bc44ce285e02c37b4452fae69
21 DIST genpatches-5.4-160.extras.tar.xz 1784 BLAKE2B 8184089c122bb794bc18181ed165b2d03b301f336730b3579c92780b8a551d75963051a0c3c2ce8015a8e7102fda224e7a069ddc5fb5ea90d313637879602270 SHA512 f304a0b349c1a2f42297595ef732a6e31a7babfc71031b56e7e81e14b030cbbcefc25b49429381b47bb60676f63a3ca86b24de333a4ca928825fb2fb59109839
22 DIST genpatches-5.4-161.base.tar.xz 4088312 BLAKE2B b9c445ae9e163ed0d918f2833db1ff0683144d8214f7bf806a4e99cefdb33ab0c5968f6c70b9f0e15c22234a6f438a97fe566a6b04bb9dfda7d177cad98b1e6c SHA512 8e077b14090bbfc0f9c9fa8b01d3159317819b2c5f4903613d3bb3dc942ec47135a9f381fe30c5046f2fc640e35bd9f1aab8879803eebb46b051ada5d958dd43
23 DIST genpatches-5.4-161.extras.tar.xz 1788 BLAKE2B 940f21b0dd0a57c70a42aac772114e16bdfe3a9ca4119c3b2ca24c7023eed73f646250bbb74f308ec33ec03ff7e0b8b73737e50436f4f0ee68344abf93e0bc2c SHA512 97ff320e68c7cc2b0467e0b4be63b5d95509ff784a98de7bca44f60db9baf31ebdb9d45cb122bd75ec87e9b9daea17b4388f552b520d96ead0e4b5975945a065
24 +DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fbbc3aa977a6651e42f8d9a8f8773dc9bb6466358fc5d20537b67f826a66a1f1e28912e8454b3cd04dc337e838f18ae28e32e6 SHA512 f90b1d2dd335e25cef4822dd9663d27eb1aa44d780412e703236ced0c0f50b1c4a614eec10134bc6a1a418d19af0abc231764d1fdf9b7f526cd59e10b8b46ef1
25 +DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
26 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
27 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
28 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158.ebuild
31 new file mode 100644
32 index 00000000000..ef8b4347c4d
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.158.ebuild
35 @@ -0,0 +1,90 @@
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
42 +
43 +MY_P=linux-${PV%.*}
44 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.4.21
47 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
48 +GENTOO_CONFIG_VER=5.4.114
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.config
59 + -> kernel-x86_64.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
63 + -> kernel-aarch64.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
67 + -> kernel-ppc64le.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
71 + -> kernel-i686.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
77 +IUSE="debug"
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 +src_prepare() {
87 + local PATCHES=(
88 + # meh, genpatches have no directory
89 + "${WORKDIR}"/*.patch
90 + )
91 + default
92 +
93 + # prepare the default config
94 + case ${ARCH} in
95 + amd64)
96 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
97 + ;;
98 + arm64)
99 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
100 + ;;
101 + ppc64)
102 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
103 + ;;
104 + x86)
105 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
106 + ;;
107 + *)
108 + die "Unsupported arch ${ARCH}"
109 + ;;
110 + esac
111 +
112 + echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
113 + local merge_configs=(
114 + "${T}"/version.config
115 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
116 + )
117 + use debug || merge_configs+=(
118 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
119 + )
120 + [[ ${ARCH} == x86 ]] && merge_configs+=(
121 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
122 + )
123 +
124 + kernel-build_merge_configs "${merge_configs[@]}"
125 +}