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: Mon, 22 Nov 2021 10:46:27
Message-Id: 1637577590.26bb1dbf1b35ace9a282f49aaa5c36bcc9472541.mgorny@gentoo
1 commit: 26bb1dbf1b35ace9a282f49aaa5c36bcc9472541
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 22 07:07:34 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 22 10:39:50 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bb1dbf
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.161
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.161.ebuild | 91 ++++++++++++++++++++++
14 2 files changed, 93 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 178f6894c1d1..dd4073689601 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -18,6 +18,8 @@ DIST genpatches-5.4-162.base.tar.xz 4091668 BLAKE2B d264f2a3cf61b8ed2a297bd8a3fb
21 DIST genpatches-5.4-162.extras.tar.xz 1784 BLAKE2B af5b67735eaa30c4edc7cd8681846e892b8455890b5677b5cb8b3849383af43614738c80a6a71d15420ab55b156895bb718952508510cc7e3566aef7d025ebe8 SHA512 4083da3dee1d4e243739322393fb6160d6c148f8b8101c518ceb24971c0dca5ef0886e2ea641d3c04be47495d0112b217dd9b7e33bfc1f16e8dae04c87699314
22 DIST genpatches-5.4-164.base.tar.xz 4167868 BLAKE2B 62abbdb5c0284dbfcb1d6342b81fb1a5e5ee99dca0be41b046a751e28ea64ab76697d44870ae175b6a64ac9fbce592a32755374b1671631f31ca5ff199338b39 SHA512 e9bb5a5fc61f7f72a299bfb5f8ac5949dddf7bbde9fc347f2e64930678cb2bc48074a89a965b0eae61879d297a16fcf027deecc836ed377387f197ec1b1053b5
23 DIST genpatches-5.4-164.extras.tar.xz 1788 BLAKE2B a1c49d863d28e352a89a8ef344e2b9fa7d634147190ef2886e1725ffa0a0acac0a8a1a8eca633dae7213e39f6030951c7af7828449b810d32b987ee8645edfea SHA512 841638c80395371d41aa45fc3cf5af0a4225e312495346514e078fe7d5e0d7dfc758e62402816ababb8f0df020206469920ec6b53fc71d3fbb6fe15cd8cb34ce
24 +DIST genpatches-5.4-165.base.tar.xz 4172064 BLAKE2B 5533ca691df2b2eae12f1ddfbdd4a38625569bafbe2a90d8b7c8020013587f873f03eb0b177191a2fa4a060cb4146ad98c5a36555d5efc99a952cd5016ae127d SHA512 377e4298bf5aa6e3537969adddfb6028937035cd1ea39bc49108dc11196bddff4771ea01fea17eb06be88126da8284c8846c33ac800eb55eaa2527de15612cf6
25 +DIST genpatches-5.4-165.extras.tar.xz 1788 BLAKE2B b724b539ecc76ffb7ed1186b71ae33ed066ddc823647c6da87e6afc3c0348bef83ce7cbade88f80579e00de1d2c32af76e5756f71d617c70714656ee60f2b295 SHA512 428c5204967d8bcef77c80c3146294fafe676501e72187c8a5c6a6882cde732635bd422ae690cbf365bdf033891a0f54605e953daf542251692af92a873f06b1
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.161.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.161.ebuild
31 new file mode 100644
32 index 000000000000..d08e589ffcc8
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.161.ebuild
35 @@ -0,0 +1,91 @@
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+="
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.config
60 + -> kernel-x86_64.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
64 + -> kernel-aarch64.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
68 + -> kernel-ppc64le.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
72 + -> kernel-i686.config.${CONFIG_VER}
73 + )"
74 +S=${WORKDIR}/${MY_P}
75 +
76 +LICENSE="GPL-2"
77 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
78 +IUSE="debug"
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 +src_prepare() {
88 + local PATCHES=(
89 + # meh, genpatches have no directory
90 + "${WORKDIR}"/*.patch
91 + )
92 + default
93 +
94 + # prepare the default config
95 + case ${ARCH} in
96 + amd64)
97 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
98 + ;;
99 + arm64)
100 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
101 + ;;
102 + ppc64)
103 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
104 + ;;
105 + x86)
106 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
107 + ;;
108 + *)
109 + die "Unsupported arch ${ARCH}"
110 + ;;
111 + esac
112 +
113 + echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
114 + local merge_configs=(
115 + "${T}"/version.config
116 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
117 + )
118 + use debug || merge_configs+=(
119 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
120 + )
121 + [[ ${ARCH} == x86 ]] && merge_configs+=(
122 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
123 + )
124 +
125 + kernel-build_merge_configs "${merge_configs[@]}"
126 +}