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:03
Message-Id: 1641427968.f7242565a0d2e73c15c9b6a46b76d4b2a094a2f1.mgorny@gentoo
1 commit: f7242565a0d2e73c15c9b6a46b76d4b2a094a2f1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 5 19:37:06 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 6 00:12:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f7242565
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.170
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 | 2 +-
14 .../gentoo-kernel/gentoo-kernel-5.15.13.ebuild | 2 +-
15 .../gentoo-kernel/gentoo-kernel-5.4.170.ebuild | 96 ++++++++++++++++++++++
16 4 files changed, 100 insertions(+), 2 deletions(-)
17
18 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
19 index 0bf51bd0725c..14ee4b6a7311 100644
20 --- a/sys-kernel/gentoo-kernel/Manifest
21 +++ b/sys-kernel/gentoo-kernel/Manifest
22 @@ -16,6 +16,8 @@ DIST genpatches-5.4-172.base.tar.xz 4281140 BLAKE2B 438ad10331e709a85f1ee2a8907a
23 DIST genpatches-5.4-172.extras.tar.xz 1784 BLAKE2B 9d185d1ff33c56417bf9cfbe33efc6ce4b743a0ab9bdf419dbee14cde34d7c2d6d17884ace56880f75cc28a16b7e18a5e7b87f110c64bc7c84ceb81c7df85831 SHA512 cee6e49804ebc200dd7e308d2a59bfa0e381428caf69678bb6d406357a86398327a354bc2900096f82a77b47beea7fca7e5709cb390fbc1e0b7575c01d062024
24 DIST genpatches-5.4-173.base.tar.xz 4294304 BLAKE2B 7622b34b82e901d2823f84ef4ccf282a9224dadf5a5248bbdc9b1328aaf476b50df5ea6d359af64507c30623d57a0a61f9205b5d48eb1137a404ef2ca4ec31c4 SHA512 34ce4139ccc9119546a88efb71f46b1172039f536e5072337270ab93b83429b2975a3c9cf4f112f280e62eaf506e62b48f775a4fb772a1a4de8681333be76a02
25 DIST genpatches-5.4-173.extras.tar.xz 1784 BLAKE2B f01c9772a351ca0db5a44f8f13c80e30b73c546151ae543635a9d33a132f771133c6b8e1349971ab25a972e859a46e79cd64a07c7b4e1335544d7509690530cd SHA512 6b26c1e2025aa4952d23330a8b3878a11aab77e8451c2af728f2d98ab2ef64e415c6293179ace1cf08d91b887309eca9341870416c0fe2e901a397d29f035212
26 +DIST genpatches-5.4-174.base.tar.xz 4301872 BLAKE2B 0fba459073a7132ce714ba48a9e96a7eed25a6e5ad9f6ed37ff20de503f8bbc8368684febe1d93989de1c2fc98c233d0a675eaeaeff714ab71722aa881e549b8 SHA512 a91b906d4bc21fe3a8ddac50c613b1d8ec7ec9861f3e5c0b581fcffa68057f5c515066d5d15cc042a5412a9f0fb9980c4159792f925f29beac7c02fb98190285
27 +DIST genpatches-5.4-174.extras.tar.xz 1788 BLAKE2B cef1df26cc9c64dd12eb4f034a6e860d37bb1bbd7e1fb7b4f5c0be86f0415d7f3613a33e159ae742174bf947896024a119055b5713211ddcbda3efd8bd902417 SHA512 87f287fce0d40450efa306f3b44c5fcf1257aa6825b6f9894c29bef23791326666af38f561dd197e0c5c0511ac28297b3a5c0e976296fde13eb0bf99ddf3a3ec
28 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
29 DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B e30fff372b0112cc05723463cb4e93de79b5b643483796402eb88a7e704706a4033af2dbab9424cf14b1d894b57fc053b969f5fbfa15cf74e30e3d045703918f SHA512 5e8c6945da5e9cfb8d20663910fc38ee36813067e1679e17bbf1dfc6fc0aa9125f1fc949d81937b297215925004e0ebfb3b55c7e707184b5ffcf23d28882113d
30 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
31
32 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90.ebuild
33 index c59cb90ecb8c..2a033bf8c0ea 100644
34 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90.ebuild
35 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.90.ebuild
36 @@ -1,4 +1,4 @@
37 -# Copyright 2020-2021 Gentoo Authors
38 +# Copyright 2020-2022 Gentoo Authors
39 # Distributed under the terms of the GNU General Public License v2
40
41 EAPI=7
42
43 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.13.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.13.ebuild
44 index 6af5d253a073..d6013f70c1af 100644
45 --- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.13.ebuild
46 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.13.ebuild
47 @@ -1,4 +1,4 @@
48 -# Copyright 2020-2021 Gentoo Authors
49 +# Copyright 2020-2022 Gentoo Authors
50 # Distributed under the terms of the GNU General Public License v2
51
52 EAPI=7
53
54 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.170.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.170.ebuild
55 new file mode 100644
56 index 000000000000..c41d8d334c9c
57 --- /dev/null
58 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.170.ebuild
59 @@ -0,0 +1,96 @@
60 +# Copyright 2020-2022 Gentoo Authors
61 +# Distributed under the terms of the GNU General Public License v2
62 +
63 +EAPI=7
64 +
65 +inherit kernel-build
66 +
67 +MY_P=linux-${PV%.*}
68 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
69 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
70 +CONFIG_VER=5.4.21
71 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
72 +GENTOO_CONFIG_VER=5.4.114
73 +
74 +DESCRIPTION="Linux kernel built with Gentoo patches"
75 +HOMEPAGE="https://www.kernel.org/"
76 +SRC_URI+="
77 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
78 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
79 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
80 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
81 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
82 + amd64? (
83 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
84 + -> kernel-x86_64.config.${CONFIG_VER}
85 + )
86 + arm64? (
87 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
88 + -> kernel-aarch64.config.${CONFIG_VER}
89 + )
90 + ppc64? (
91 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
92 + -> kernel-ppc64le.config.${CONFIG_VER}
93 + )
94 + x86? (
95 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
96 + -> kernel-i686.config.${CONFIG_VER}
97 + )"
98 +S=${WORKDIR}/${MY_P}
99 +
100 +LICENSE="GPL-2"
101 +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
102 +IUSE="debug"
103 +
104 +RDEPEND="
105 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
106 +BDEPEND="
107 + debug? ( dev-util/pahole )"
108 +PDEPEND="
109 + >=virtual/dist-kernel-${PV}"
110 +
111 +src_prepare() {
112 + local PATCHES=(
113 + # meh, genpatches have no directory
114 + "${WORKDIR}"/*.patch
115 + )
116 + default
117 +
118 + # prepare the default config
119 + case ${ARCH} in
120 + amd64)
121 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
122 + ;;
123 + arm64)
124 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
125 + ;;
126 + ppc)
127 + # assume powermac/powerbook defconfig
128 + # we still package.use.force savedconfig
129 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
130 + ;;
131 + ppc64)
132 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
133 + ;;
134 + x86)
135 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
136 + ;;
137 + *)
138 + die "Unsupported arch ${ARCH}"
139 + ;;
140 + esac
141 +
142 + echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
143 + local merge_configs=(
144 + "${T}"/version.config
145 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
146 + )
147 + use debug || merge_configs+=(
148 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
149 + )
150 + [[ ${ARCH} == x86 ]] && merge_configs+=(
151 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
152 + )
153 +
154 + kernel-build_merge_configs "${merge_configs[@]}"
155 +}