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, 07 Jul 2021 19:35:34
Message-Id: 1625686519.ce41ad571b77f0ab0446f87e2f2b445f65066266.mgorny@gentoo
1 commit: ce41ad571b77f0ab0446f87e2f2b445f65066266
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 7 14:44:34 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 7 19:35:19 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce41ad57
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.130
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.130.ebuild | 97 ++++++++++++++++++++++
14 2 files changed, 99 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 70301465f72..32c5749112f 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -38,6 +38,8 @@ DIST genpatches-5.4-131.base.tar.xz 3611404 BLAKE2B 9793458c63d97afc9731c210a642
21 DIST genpatches-5.4-131.extras.tar.xz 1772 BLAKE2B c4933c4c6470123bbe2011673a18ae7910de41dbd8b0c6b5ce431a06d2cbdecf62a5e0ca9d28738e82e30c55dae29acc30b7e68801075e5d7d17f425909e6fbe SHA512 495876695c819ff98dc98fb34e8ee4b0eb6e82a69a7f519055d0cd2c6e3da584a97252861f269a8f2160c3e98f3a2907620f4b9e5bd145feae51fb3b17a3d2c8
22 DIST genpatches-5.4-133.base.tar.xz 3628504 BLAKE2B d3d99348c475bbeda9a1d0a7e3637ddc9c0896ae0de51fb6e9bd111ac94e3fefc717f84aea32a14410aa7257cc95b381c54b1501ae720c4eda569d0024206463 SHA512 d12584ab78c9cd7d3af459701eeed80519bea7e03dca6630205cc279bdd65c71a14d8738f2c29816a5b08381301210116fb769b583e3f6b83ed5e54755a00003
23 DIST genpatches-5.4-133.extras.tar.xz 1768 BLAKE2B abad0014d2d982087ac982d0f017587fba8ea2b5180e67a92ed4b5a62c4129a5d275f6556cbf782b459900e03696355e4017c4c833cefc571c7cf4bbf2b5c907 SHA512 121ad821cd6628166a1ca005f2b408737ba8c9c1b8315c13926bda862b49d2ed330fea169a348b0209d903fca7a8d4ebdb50cf7dd527efde49ca9d69de4106df
24 +DIST genpatches-5.4-134.base.tar.xz 3632276 BLAKE2B 475eaa6bb0c7291fbed3722ecfa8c05c5352677844481d4b37f2d5ba4b8a77697b6f43f1005aa1f899a561b3ba38670a160026fb935c2a1e75db7f1a9c292044 SHA512 4bfbf7ea9d909f2913094e7c0a34fd570540c4e9bc471ab8e90b2c73d1c99e6da23a11c0e254f4adfa6d155c51c763224a4851f4105a2a8ed69fd11c73a58101
25 +DIST genpatches-5.4-134.extras.tar.xz 1768 BLAKE2B 894032d098f79b3c247b1e0ab19646e9c79414c4070fbf19679286f7305dbabee8c39c11dfe7c7a1009f36d64f99b0627b75b455cda62b2143fc5a5102937cd8 SHA512 5d6b703ae705a8587a7abea96e64cc51f34d8762e5a93c5c9f410a52d7bac4c44aca2d21bbede8354ad5aa1fbef45aeaffedc7db69c21ea2a94c22a0069da398
26 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
27 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
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.130.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.130.ebuild
31 new file mode 100644
32 index 00000000000..1bf22439675
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.130.ebuild
35 @@ -0,0 +1,97 @@
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 +pkg_pretend() {
87 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
88 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
89 +
90 + kernel-install_pkg_pretend
91 +}
92 +
93 +src_prepare() {
94 + local PATCHES=(
95 + # meh, genpatches have no directory
96 + "${WORKDIR}"/*.patch
97 + )
98 + default
99 +
100 + # prepare the default config
101 + case ${ARCH} in
102 + amd64)
103 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
104 + ;;
105 + arm64)
106 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
107 + ;;
108 + ppc64)
109 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
110 + ;;
111 + x86)
112 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
113 + ;;
114 + *)
115 + die "Unsupported arch ${ARCH}"
116 + ;;
117 + esac
118 +
119 + echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
120 + local merge_configs=(
121 + "${T}"/version.config
122 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
123 + )
124 + use debug || merge_configs+=(
125 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
126 + )
127 + [[ ${ARCH} == x86 ]] && merge_configs+=(
128 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
129 + )
130 +
131 + kernel-build_merge_configs "${merge_configs[@]}"
132 +}