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, 15 Sep 2021 19:18:10
Message-Id: 1631733477.4848f14d8ac728146c8d49583b57bc92a602706e.mgorny@gentoo
1 commit: 4848f14d8ac728146c8d49583b57bc92a602706e
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 15 16:31:29 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 15 19:17:57 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4848f14d
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.146
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.146.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 400d4f5be67..6c096718e08 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -30,6 +30,8 @@ DIST genpatches-5.4-148.base.tar.xz 3887780 BLAKE2B 127c72912bf3db08c86bdce400ee
21 DIST genpatches-5.4-148.extras.tar.xz 1788 BLAKE2B 3569f9649b403a8dabae9cb4721c17dda84061c7d03aa72714b976968a8d18fe451945fa41939be5de301446e640f957b229f79d8fbc20c899d498abffa72a54 SHA512 a7a082bff05441624cba87d4398e98713953d06365d7ea1c1ae0977fd4e70cfe565bfed4ed2387c7552dd58b5ef05ebf9f12051930e2126e6e007ac06bbf8e9f
22 DIST genpatches-5.4-149.base.tar.xz 3897496 BLAKE2B 0f815da5a71bf0c55b7bd27f242be16686f977c78d3e7fa73483c0ed6a126e3a75ec10b98e9500b499af5e749f5ec3a3844fbf7f1d4ffd628f941a0745c9b1c2 SHA512 08c02e6f68ccd0f8168d6ca8334594a531940bceeb196229bce4acf0e3350ad9b12d4e0f4d11f54a659aaa2f464185b677cfe26e172d3091b4c86f2a7edc7bbe
23 DIST genpatches-5.4-149.extras.tar.xz 1788 BLAKE2B 05c45b84dbd9952cdaf41f881aaf67bdf2d6842c4eb967a765e5a19a9a63201d4d7a552983342bf010a5cefdbb36a1a4aae3254edc0322eccc7fb3442b007b9f SHA512 3ab95bda0b4cd11aa7769eb27c51051a79ce43112028557d4f87588e7140a674f3c58890e812722b8796aaa953e68ae22b92a3390ae8832bae16b617c6d49997
24 +DIST genpatches-5.4-150.base.tar.xz 3930104 BLAKE2B eb120013120a98449c8df210a5a02201949ca950dd812308a53e15b726d1752f296b0e3490e6fc9102fe91793be24d4f7554f3a1c1c1243766959fecb037b789 SHA512 238164efd759be2714884ddf5921de189e872dfd8ea4954356a610aacac899f806ca5f6fcf0c2e5eb64e7eff89a37f5c8b7b26b98c9f1705717e14abad6984fd
25 +DIST genpatches-5.4-150.extras.tar.xz 1788 BLAKE2B b408e6247a66358208489dfcf3bdd6aaf47a471089ffa8517a52039535f276ab411931a7c1dcc17b7d2aee99a49e530ceb43cfe0c59ecff982da40337c22e375 SHA512 0d1f94ab3cf4759f1f87a63d95ecb00c7a4c4c982b6bf73137bde0aefb1c07b037d8e613966c45cf3e4122e0c93771011e8094ca4517fe3da9ec4dd4e2820e35
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.146.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.146.ebuild
31 new file mode 100644
32 index 00000000000..1bf22439675
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.146.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 +}