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 Sep 2022 14:29:28
Message-Id: 1664375348.9bd483c6d1299df0bfcf24b348179896108896a8.mgorny@gentoo
1 commit: 9bd483c6d1299df0bfcf24b348179896108896a8
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 28 10:13:12 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 28 14:29:08 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bd483c6
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.215
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.215.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 95853f383bdc..c36dee9d1082 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -20,6 +20,8 @@ DIST genpatches-5.4-218.base.tar.xz 5055868 BLAKE2B 2dde93f13540d5268d3855b6c4b5
21 DIST genpatches-5.4-218.extras.tar.xz 1812 BLAKE2B 3d98f3ae24c5612a9427c88943474b1ca8efbba31bf5e0c0f012b4bc41d1ed980042221a77374a19813d2ba02eab944343aebe2b45aac893352a27e6330dd74f SHA512 31a3790fc98eadb717e9dd9ae9a3c0f4d8d36a2fd9023f407c6c5cc8e4018f89c74535c44f7fda34e3f7b48a0116c4bd1a4770bb98bc60a264e9c541cb767d8b
22 DIST genpatches-5.4-219.base.tar.xz 5057112 BLAKE2B 2abaf4161586e089d1993edee6339b471a92dd08631bfbd7180219156417cdfc870163d5089a9185ed49b9a1eea37c9488316e239d67f469fc2f5b177a71e93c SHA512 37af5774e68df5bed8c13c516b245bb23abf0f6e93c369ca6937b1e6787445f0b3b27b8a5d325866f643896166d9ea5b8b8aad535f7c3afb5a45e8245355021e
23 DIST genpatches-5.4-219.extras.tar.xz 1812 BLAKE2B 0e80f8a4b52959abdea92d2a9a596153ebbdd79a1c1b0aa66068e51009167b4531a76c4f71b490b50650c062f02aba5ba6113401c69ccb64afbde0f29fc2f5a9 SHA512 3ca23ca0d6ed2726d8b1161f920027a776973d99ad174c6e46c3e69d0eec7ecb609b3d846a806ba6b5a7b2da3842465ca50b3dce9b62cff33b298bcdb004ecab
24 +DIST genpatches-5.4-220.base.tar.xz 5083772 BLAKE2B 643bbad38a1dc2d6140db59f2e747e47933621eda360072063b840c6ad7d83e3ebcb055660a4e24a3b5db24d42d6d86a1f7c56617d12a275f5595c80baa80d2a SHA512 82e5edf08d9b338653c4bd25ec6c9643e91cbe9bad045a37987ea9216d1ad5cdd81c873bfb09cd87350ddf55b1126efa936d8d8afee8419901bebab1c78b7569
25 +DIST genpatches-5.4-220.extras.tar.xz 1812 BLAKE2B 59356642113a6ea0d2756a317a1a02fe375ca4bd1efd70ae0ca5093eea05bb00af062f945db1719be3eba11b358e80fe7764aa8e62df1d3259d6ac1ea2b95152 SHA512 b9ba7d70b577367316f0c9721e0783798f5c2c023eb3ccb9f95907963c79963b72a65338674bed7ddba3fc75cf10e330a4ae6a90f0ea788aa15f3ec1a042850f
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.215.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.215.ebuild
31 new file mode 100644
32 index 000000000000..5fa543cace37
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.215.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=8
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/projg2/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 +}