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, 26 May 2021 20:00:23
Message-Id: 1622059204.b5de551f6006593cd727e778fac1975c4adc0ff3.mgorny@gentoo
1 commit: b5de551f6006593cd727e778fac1975c4adc0ff3
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 26 13:34:05 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed May 26 20:00:04 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5de551f
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.122
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.122.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 51900cf095b..65b87c356c7 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -14,6 +14,8 @@ DIST genpatches-5.4-123.base.tar.xz 3488228 BLAKE2B 0fe5c3056c3cb060f4921e3b7a40
21 DIST genpatches-5.4-123.extras.tar.xz 1772 BLAKE2B da9bc0d9513d010364506850d1c23d13e1a1ef8c4cb8d60e3430d12f4cc2ea87a74643ba9fa1a061eabdee9985b1931aab1b2587ee26bec9b2cf165b90fe83e5 SHA512 ff3b417825ba200b32abf888b6cf6e8d754526e57a30c06fbe4f961c84f67cd921b93b9848fc6b49f120b4cf8ddba9284755da73869db35327af7549d63f3cd1
22 DIST genpatches-5.4-124.base.tar.xz 3499808 BLAKE2B 98d5cac4ac9f5d59c4dc1bcf3e5d74bd46377261da545a3dc89664cba209e83dc1c5d03372e56a1695a8dd3b8af988be4892735d9e590ad5ed0b5755f0185792 SHA512 6a6cc5734e97191f2f9645b80be2a71ccc174526de2839c503d518bc74ced3b146808a43a66cd9f9f44f4578f06413dab958002e4e96e4f28f14d75b71375858
23 DIST genpatches-5.4-124.extras.tar.xz 1772 BLAKE2B dd0400f17cd878676cfc7f52f36a3cb48ffa785bf3cd27fc5c0f40af34babb0f5b9fe931a4b92423c944ec8260d3b74ce5f1bc9e6d452ba4dfc6595125f5d6b3 SHA512 8dcac324ae81815546faa670428db2474b3a58e842c966017a4ed253eb537e7ab753e99f7675bfb2bc54bd4567f381d28586fccca2d213e0faf4125acded27b4
24 +DIST genpatches-5.4-125.base.tar.xz 3512440 BLAKE2B 4a63e044f420911602426aaacd6476128288169dc12baccc0810d44dce50cac275fef38cba3b119724bb66fb12d3171337e88ce2968099328eb2f7b3651fd945 SHA512 30ef5565de7ecc57c849519121b22f94fc731f2c59418cb45fa29e50b49f487d621f0005c4487cbb8d6be3a00456db9934512c73c16972197daa8ddffa5a7115
25 +DIST genpatches-5.4-125.extras.tar.xz 1768 BLAKE2B bfa75a0d735871051ce3f66962b9287ef80d4928dea58ce2f9b4d817788d4975e8aed09888ef2cba716292eb650633cf9a191843b81e69f8f717f5b44fec6dc7 SHA512 ae8a8e69c44567baaf1a7efc27bb3384da6f83c9f80c90b692e90c296bcc33862f4670ab72969ae727b310a5995a707c1bf112c67ca268893f32b616f6391f24
26 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
27 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
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.122.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.122.ebuild
31 new file mode 100644
32 index 00000000000..289552d0f2d
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.122.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.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/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 +}