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, 15 Apr 2021 09:03:48
Message-Id: 1618477405.f25e08df5913d16ba87f5a5b1bf843de0e103b2a.mgorny@gentoo
1 commit: f25e08df5913d16ba87f5a5b1bf843de0e103b2a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 15 06:35:22 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 15 09:03:25 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f25e08df
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.112
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.112.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 e513b30fac8..0831ac792e9 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -36,6 +36,8 @@ DIST genpatches-5.4-113.base.tar.xz 3302232 BLAKE2B 106c01266550457aba13bff1ec60
21 DIST genpatches-5.4-113.extras.tar.xz 1768 BLAKE2B e2546e7a593e709e3994efb176853f8212a33324c048412b14c037b0f55b6d216bdb8231764066250f1e6b96048ba2f8ca743f51041e71c1d512741e0b58b069 SHA512 21f45e81787d150936dc4a330d28baaf372b7f9e241b93739708667107cb42c525a8b97eba4afebe3638204f67111ce14d90cfa2876e0a67d06840d4606f78cf
22 DIST genpatches-5.4-114.base.tar.xz 3305288 BLAKE2B 345acf1ef846178a5a70f385f3d9c2dea25b1892fb755cbd43c78f3aa553097294549a5f24e9552ab0d37d5086fb58e98b72db5230ab8506e725a0908edd5143 SHA512 fdbb6b9c10eafc3069b72460db1209843ec4d4d024548a384dca72592e3c6e5e4eb3b9b34058266499da26caf0a168a1469de7bf4934e0855c6a5db1f4d8d69e
23 DIST genpatches-5.4-114.extras.tar.xz 1768 BLAKE2B 506b391e93021d06af44ad90a1da1937aa45e51938220d9de89a525a073cee83b43966b546cfb6dedcc631a07134e55acb7e208a64a117d41f88db99273ba9a7 SHA512 9d13965d4a2db92647946c4126bd40d5a05ac0d848aedda82a6ea8a19f562ec1d8debc13594332cb1fc2a3bac9df76b08c5f666d5bf79b4285483c0d7ca02ab7
24 +DIST genpatches-5.4-115.base.tar.xz 3335100 BLAKE2B 49863f2b97492223e0a42eecc0dfc6b53ed054810ec1281f064e39cc47e45b4897f795f8c2e43dcf3b974531221b2275ab26592914c845f4c18468be520f5f7d SHA512 b3b8b279a8fbd0cb58f4ec18e6351a08083fe06bde33cc53f378f82757ca8f004c016a562dedd4092412ce41be62f6f58a885deb12af87ffd288a597e9eaadf8
25 +DIST genpatches-5.4-115.extras.tar.xz 1772 BLAKE2B 49c7ee35b73827fc454adf526f5ceed9f7c71b6ac2c2e954943142999ed7c1e7a58a543d1519c1d3d6b7e4e9aa3970094650663f10b65408414155909037b23f SHA512 d45ff15542dd01aa7381e992fee90391000cb42d421fab243563fcc547acb8576ab74ef78bf2eb1d81fcd327bf76ee3cc3a6addad5f5ead7eba47837d139792a
26 DIST gentoo-kernel-config-5.10.18.tar.gz 1219 BLAKE2B 55ec8c66a9b090e590e23574b54edde0fefb575f25e6848b1c84834847304e30e52fc0810b8fd219cfb23c097bb8f7444e0b010bde44209f0c4811f99db7e0aa SHA512 ee137c85e94fe5989646cb19a72aca62ddd4795813f7bbf15d66262b0e72d90d84d5d17a31bae7980c061e0576e3f3254dca53ba6e547cf12cb7ab08771e3900
27 DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06 SHA512 ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01
28 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.112.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.112.ebuild
31 new file mode 100644
32 index 00000000000..083b5b39ab9
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.112.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##*.} + 3 ))
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.89
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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
54 + https://dev.gentoo.org/~alicef/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/dwarves )"
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 +}