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, 22 Jun 2022 20:01:22
Message-Id: 1655928063.3eda02dc9248587fdb8e2d9c09c830aa3add7e95.mgorny@gentoo
1 commit: 3eda02dc9248587fdb8e2d9c09c830aa3add7e95
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jun 22 14:35:35 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jun 22 20:01:03 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eda02dc
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.200
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.200.ebuild | 100 +++++++++++++++++++++
14 2 files changed, 102 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 3adc64b635f3..fba61b44b40c 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-5.18-8.base.tar.xz 440848 BLAKE2B 8a965867409cc340b13687eec9c739
21 DIST genpatches-5.18-8.extras.tar.xz 3924 BLAKE2B 3f575b12166621c67c9cf6ee15a76af551a039d142a85678abc10829e9a573641be8557b9b606352d46fa4d123e95071b2946447a6f53afef5b37eec5f342cf7 SHA512 7aab8d9d18dfb6129ee0e995450c9d9d759545a9fa2cde1d26dfc03d677b9133a310f3943cd77b5981830a6a1cff59463e85759ef5cd68bcb2838dd96104f590
22 DIST genpatches-5.4-203.base.tar.xz 4798932 BLAKE2B dc918ca3e7538b66b87a8bd8d2c673f56b71706d913007176de20014a2ebe38889541aa3441af7f4d6db69044779a1e54dadc122e59d180c15fe5131b8056aca SHA512 975dd953d5baf0e72e5718dd4979657597adc380559f41e769e94d294a08b272ba06080517d134a3b2611a6d4779cc3d8b423d869b7dec5e6c43af0634996871
23 DIST genpatches-5.4-203.extras.tar.xz 1812 BLAKE2B c4f67f3fcd08b6d845c7fc6174a747e805ee2614ddc2733771cfeec8df5535a7e0a6b8c3528b23c7cd1127765094deb565d3e1b96bda5d1882510cdce4b050ea SHA512 029f4ba2b1fc2c581d343e9847b926ffbcbcd1c0a5cc45c28f35f2ca1572cffaf6ce75a9bfb42d2cd94f6a93ab5bdb8a3297636ddeb4be4afc66efa87a55d7cc
24 +DIST genpatches-5.4-205.base.tar.xz 4658076 BLAKE2B 172fc1760b7636d6d2de9014c36f792e7e85f81d36748e7fed87f6784647e3488acb401c26abead8703319616c83ed09bebaceb47f8f179b91ef3af3a2b4dc37 SHA512 03a2368388de8fa0977f0af58234060d2ce156d23fa5d954e49791182ad78d2bb66c7abe319323f184c3d344915083c961c8d7646f2ac7faa56d85a21fcb7c9e
25 +DIST genpatches-5.4-205.extras.tar.xz 1812 BLAKE2B 43a42c678c8788065209ca46d4e621f4f73493ea40c37cb39871a7850547572cd1484f56e67b08e34a94fcbf247f827a750d93c4cfb126bfa1a8bea852afee03 SHA512 95340a3d7098b312a7df149b98fab683d57c0a06e3a2c77facc6611e61a97eb8e820894a5cb5171b54d5f7b276ade96a83a229e60103047e2e67838afe518090
26 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
27 DIST gentoo-kernel-config-g2.tar.gz 4359 BLAKE2B 965392fb5b3c1290c596d3e8593cfcf54e76cedd47de335c1b9658c1b35649af18a94639bf3df84507c797e6d7ea074f7f2a2579d2d01073478b30a4f167b2aa SHA512 d1bdef2e817799fcebbcdae1f3b1666f8ca70b0d5adca74014dd665f6b02c81b839220d8fe3794ea1202e1f2589d281344699864207c98b95d23a1d1f03bd42d
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.200.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.200.ebuild
31 new file mode 100644
32 index 000000000000..bf4c0106cbb7
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.200.ebuild
35 @@ -0,0 +1,100 @@
36 +# Copyright 2020-2022 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##*.} + 5 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.4.21
47 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
48 +GENTOO_CONFIG_VER=g1
49 +
50 +DESCRIPTION="Linux kernel built with Gentoo patches"
51 +HOMEPAGE="https://www.kernel.org/"
52 +SRC_URI+="
53 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
54 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
55 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
56 + https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
57 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
58 + amd64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
60 + -> kernel-x86_64.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
64 + -> kernel-aarch64.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
68 + -> kernel-ppc64le.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
72 + -> kernel-i686.config.${CONFIG_VER}
73 + )
74 +"
75 +S=${WORKDIR}/${MY_P}
76 +
77 +LICENSE="GPL-2"
78 +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
79 +IUSE="debug"
80 +
81 +RDEPEND="
82 + !sys-kernel/gentoo-kernel-bin:${SLOT}
83 +"
84 +BDEPEND="
85 + debug? ( dev-util/pahole )
86 +"
87 +PDEPEND="
88 + >=virtual/dist-kernel-${PV}
89 +"
90 +
91 +src_prepare() {
92 + local PATCHES=(
93 + # meh, genpatches have no directory
94 + "${WORKDIR}"/*.patch
95 + )
96 + default
97 +
98 + # prepare the default config
99 + case ${ARCH} in
100 + amd64)
101 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
102 + ;;
103 + arm64)
104 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
105 + ;;
106 + ppc)
107 + # assume powermac/powerbook defconfig
108 + # we still package.use.force savedconfig
109 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
110 + ;;
111 + ppc64)
112 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
113 + ;;
114 + x86)
115 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
116 + ;;
117 + *)
118 + die "Unsupported arch ${ARCH}"
119 + ;;
120 + esac
121 +
122 + echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
123 + local merge_configs=(
124 + "${T}"/version.config
125 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
126 + )
127 + use debug || merge_configs+=(
128 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
129 + )
130 + [[ ${ARCH} == x86 ]] && merge_configs+=(
131 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
132 + )
133 +
134 + kernel-build_merge_configs "${merge_configs[@]}"
135 +}