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: Sat, 09 Jan 2021 21:15:39
Message-Id: 1610226927.01c7745f75b08dd480a36a191ed6382fc7032410.mgorny@gentoo
1 commit: 01c7745f75b08dd480a36a191ed6382fc7032410
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 9 19:57:38 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 9 21:15:27 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01c7745f
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.88
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.88.ebuild | 96 ++++++++++++++++++++++
14 2 files changed, 98 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 3fe3f85c5fd..242e516e339 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -16,6 +16,8 @@ DIST genpatches-5.4-88.base.tar.xz 2936760 BLAKE2B ef7a26374e0602b3f2e9fff948829
21 DIST genpatches-5.4-88.extras.tar.xz 1772 BLAKE2B dd72b20e1fe7f1b5f566c3d588d24cdad04e40d0270c9be60dd14c07c6a4ec9760dc57dc709d78bfb8d91017b6a4d6bf4c45a65dc019e9eaf02e02a56133f145 SHA512 f4e449986ee4c90ac79234d14e0e336d2c8cb74589ad6371067669f94041ee3b848848d2498d27da57ec71b050079f5338a87111af6f8edb3127698d0a39b478
22 DIST genpatches-5.4-89.base.tar.xz 2951348 BLAKE2B addc79a7135166b1f210820ccf6ccdc87c6177b71b15a0e0c9338be28cecb45fce0062c3b8d9e704410f1140ab6984d65c8aa9b49008008264d6cb6c7b0b2ba7 SHA512 13755cd0ed2132538272d0fb22d358be078c9838984ec8e5c8e2f45d06b0b09d7e8cf744cbbba25071923dd43e6d6eb6afa0598cadf3a24f231a6b9dc5b8ca43
23 DIST genpatches-5.4-89.extras.tar.xz 1772 BLAKE2B ef78f0322ecd34026b6b3a4849032edfb10673613b9ff69ee62b05cd175779d19873712942a728100a28a5bd73b0bd601b94101dccad9d4c7f80b2b044f8e3a0 SHA512 5f1165b201ffdb5bb78e84be19f81adfaf5784adb152f2110a24bc199c933e6de81a3e9a27341a61820245130c7b9f109817580d6a1459b5f22328e8cfbc2ed4
24 +DIST genpatches-5.4-90.base.tar.xz 2956112 BLAKE2B e0ba7a4fed329f452cb754ee4fcd2578a544dbcd7fed57a66cd6a825c4dafcd70d23c4d9571a7ac8de14794ba505816226e5a2b06b8df5d220d4243926edd800 SHA512 bd7fff0edf1635b2de08893a3e1ca5147a86574d87c33c3869c506e232b8c53add688357f7ef2a790185c2df73366610ee5ddd46fe1d88db16c3fb9f43c0a6ca
25 +DIST genpatches-5.4-90.extras.tar.xz 1772 BLAKE2B 557c305f86b0b6d5a93c1ca2da7751362f55d385cb4f57df12f15258d5cdcb1a0ad2c99c9ce53ba89b6c27abe761d5033ce54fa97ca6eaacbd845244d6b20d8b SHA512 eb2fc3f76099bd504f8e0cdf3c0aca60aa083b5c055e06fa2560e895278aa7d32f518ab2e671f9d0182e713ec6807552843448a38d633a4051b926ae4fd2adc4
26 DIST gentoo-kernel-config-5.4.77-r1.tar.gz 1289 BLAKE2B 6612741cfbf458f4bd8915b476aac3aa6934e8bbab344da877fa4ad52b6133e01f5d44bf0e5d048e79e56c1a351774135ee55f1aa839b230e2418db7c5d9b123 SHA512 2a09dd85af37447b278847aeaad114ef47470726cec015ed5ee1b54b3080f4b2c48de8b2f7b817eeb4e27c753579cf0820053e22caa762cb1552116d8d69eba0
27 DIST gentoo-kernel-config-5.9.8-r1.tar.gz 1198 BLAKE2B 8fc6d432e9d7e1f7f2be75c5741ab18be399066e9837a52023bebfbffe6299eabfa7e8e94822ef205bd443f6d75a75530cf0c3989dc0414a7c3e4ff06d4743bc SHA512 bc554f46ffb8a4422269e5d9b8e9e0c0f1ecd29fd008719f7ab027e87f4b4bb284d7854d1af2e1e5af0784043db79de058b38fd1ff0bf50d3086e8adc6254e1f
28 DIST kernel-aarch64-fedora.config.5.10.2 223109 BLAKE2B 705c331b559994b437954e4a0d0405d1f084b0689460b79f89a938ac66fdddbfa617b78b2bfb07bf5a085e1d4e8cfe735554031bc1e2b2ceeb6ef680c50b26bd SHA512 e57e6efe8dbd935d9b7438019fd2b8b7e558deac5471816fac6a6228ca95badf74c99a4d479cc3820f62176626c4a2526f9c16523d1e445634168358c2d24232
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.88.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.88.ebuild
31 new file mode 100644
32 index 00000000000..8b2996c9a51
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.88.ebuild
35 @@ -0,0 +1,96 @@
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##*.} + 2 ))
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.77-r1
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/vanilla-kernel:${SLOT}
81 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
82 +BDEPEND="
83 + debug? ( dev-util/dwarves )"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}"
86 +
87 +pkg_pretend() {
88 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
89 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
90 +
91 + kernel-install_pkg_pretend
92 +}
93 +
94 +src_prepare() {
95 + local PATCHES=(
96 + # meh, genpatches have no directory
97 + "${WORKDIR}"/*.patch
98 + )
99 + default
100 +
101 + # prepare the default config
102 + case ${ARCH} in
103 + amd64)
104 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
105 + ;;
106 + arm64)
107 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
108 + ;;
109 + ppc64)
110 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
111 + ;;
112 + x86)
113 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
114 + ;;
115 + *)
116 + die "Unsupported arch ${ARCH}"
117 + ;;
118 + esac
119 +
120 + local merge_configs=(
121 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
122 + )
123 + use debug || merge_configs+=(
124 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
125 + )
126 + [[ ${ARCH} == x86 ]] && merge_configs+=(
127 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
128 + )
129 +
130 + kernel-build_merge_configs "${merge_configs[@]}"
131 +}