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, 28 Apr 2021 20:44:08
Message-Id: 1619642631.d520178cccf557ff2cc449f28fd13c4ed858b2a4.mgorny@gentoo
1 commit: d520178cccf557ff2cc449f28fd13c4ed858b2a4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 28 17:53:30 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 28 20:43:51 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d520178c
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.115
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.115.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 f0e7ab73004..a0add8095bb 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -26,6 +26,8 @@ DIST genpatches-5.4-116.base.tar.xz 3335896 BLAKE2B efdbbacd50bfb4a54d3de569f22c
21 DIST genpatches-5.4-116.extras.tar.xz 1768 BLAKE2B 34c8926f21ae07fa0b18aca7c85273986da3810180e62178f841023e7f896417eb1fad53084ac6f8e140ac90adad839494c49ada159290b806c675eef76c1962 SHA512 1abf8d8cfc7fce46c77d1f3f431b067b2ad1eaf9afe3c025d786b8a65bfdf9e469a72a75b64a0fd191487a391f2a1e717aeabd5634fc372d023d1f5fc39f1f6d
22 DIST genpatches-5.4-117.base.tar.xz 3353396 BLAKE2B b4fdd41a247389b695bd5f84cdf1f1bb3df1db236c919375998e273aff8ed6b5a503d58dc8d3df8ca4fa1d2daf0735dce232841ef70018804607b6148f8ead76 SHA512 9ff4502b5983d95182b6dd383e31acbd5b693c0f55a67934e54e092891097cc13bb142a6efa25db127773cad6810d83e835458420ca7c2973e3d98ec188842dc
23 DIST genpatches-5.4-117.extras.tar.xz 1772 BLAKE2B ee10f6f48ae519334fcaf405f751d30b2eda6b9b9e5bbcf5a5efa7a41741eca11d61931efc25548a148ca4c64cb28acb9d518920868a159c4813c404f131bbc5 SHA512 94147b0b028deb471eca0a2e302e9f04e5ad8aeb06dd7bb42eacc7d377f514adfea9733e99aae4ad14a85ac87bfd5c90c77143a5c2d4390c2157d6a937f09417
24 +DIST genpatches-5.4-118.base.tar.xz 3359396 BLAKE2B 5617e29367808fd5be4d7cd95bbfa2680f07fcdf0c4b02f3a5750f715a0e728ba3c1cba82254495cf1496a53a174c6209821d57984c0810c7665ce325aad90ee SHA512 496d33188a6fa440cee3997b4367c57f46e398b35799a2f4a349f34f5947884e7c28df56c4990a48ae1c8cf46932bc86c7c1fcc9593ba7e1e786943b55373bf6
25 +DIST genpatches-5.4-118.extras.tar.xz 1772 BLAKE2B 0da077edfd1be718e67ea06824f29b86c645597be80c9b7fd99fbab25b1638bb3e95d2a0ba3b0c6c31beddee7d6dd3fcc89c640139ff787ecdff1e7d0b5eff72 SHA512 9b99f9f6ae84f10db1dc3b75df6c4d095e6624286bd1de888efe3d063e06c9ff44dd51f18ed4d153c935ec6be48d045f8286db1a49ead4abe120e20620ac2307
26 DIST gentoo-kernel-config-5.10.18.tar.gz 1219 BLAKE2B 55ec8c66a9b090e590e23574b54edde0fefb575f25e6848b1c84834847304e30e52fc0810b8fd219cfb23c097bb8f7444e0b010bde44209f0c4811f99db7e0aa SHA512 ee137c85e94fe5989646cb19a72aca62ddd4795813f7bbf15d66262b0e72d90d84d5d17a31bae7980c061e0576e3f3254dca53ba6e547cf12cb7ab08771e3900
27 DIST gentoo-kernel-config-5.10.32.tar.gz 1269 BLAKE2B 4a21a57d567d9a527ef829f375275c65347b2e6461b00e50099458c496af0a7b3b863a6e1d8421ad18c52c64c1c4cd7e5fd416673b67738cde6253af8a9f18db SHA512 a83ef22a7f9f83f01bd65a5470f0678111b0a7dcf1dc564e04264f68cc54833dbed4cccffe2864caf3ac14169611259f0bb786c1aefe194372d6d3f67fa64c00
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.115.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.115.ebuild
31 new file mode 100644
32 index 00000000000..06fbd7e64e6
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.115.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/~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 +}