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: Mon, 28 Mar 2022 15:52:27
Message-Id: 1648482734.2a8f1b58f32e9974ba33c7318fe6af546844eda5.mgorny@gentoo
1 commit: 2a8f1b58f32e9974ba33c7318fe6af546844eda5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 12:30:20 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 15:52:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a8f1b58
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.188
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.188.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 895f091697b6..c9839ace3d21 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -26,6 +26,8 @@ DIST genpatches-5.4-190.base.tar.xz 4508904 BLAKE2B 89aa6c02b3f145a6b5efc42fc880
21 DIST genpatches-5.4-190.extras.tar.xz 1816 BLAKE2B 40fb8b5f71a95cc9696b36d49d8d59c22a0408b3ed16e50bc2661cdd65572f2d7f77845c98fac939c7c4e4a768435f16b8fa4a72a26f0e152329e82d9f9a39af SHA512 ce1b57535f747925dac1e117bf6037cd41c5ad984a3e5747baec4f6214debadf084f375742efa763db6b823309e09c6b190c01253fb9d434773ae5a7bc40e191
22 DIST genpatches-5.4-191.base.tar.xz 4508792 BLAKE2B 121c16f90445bf80db180aadd06505634d903d13a05271686eabe41c4bb6e19d38e730824d5dadecf3cac0ed28c9b78567b5d97475478a6799e0af3965f0a18a SHA512 2648edc327df3945a34100778ccb0ce26d304d9bc11e57c7f5694d7525b5aab11c9af4a332dce930d394ee4be278a6fb9631a8ea423aa01ca73bbedde3115bc4
23 DIST genpatches-5.4-191.extras.tar.xz 1812 BLAKE2B 94beb2c654fb68206e4598dab054b4503ca7290519f18e4dd389da0a1c78b055c6139969c2ff6bfb67583ae56356fc9b45acee9b20c7636b8506c5426524d865 SHA512 c307a54a9ff2a274384dc8a09c326ef7b2bdeb1b43b064ab45a398e2e713616167e947dace4de8b0605b6d7a5a141d18cd9e5d15a6c78f6f8d86f5c03a47044d
24 +DIST genpatches-5.4-192.base.tar.xz 4516512 BLAKE2B dd316606186f305369ea67348acf0b6afbe2eacc16564851a1eb94224afcbdc066f920578092a15bacc7abb7a8f659aa44bde26859aae2525eaa84e8cd0447f1 SHA512 28bed80b1bfa457d24f8367a3a76460e569f7c8eb4f0a6b632f1898615ccb4da4c2fbba95dcfd1cce5675fe6151cee4c0df6bc0fdb158c25c25cf71a9397127b
25 +DIST genpatches-5.4-192.extras.tar.xz 1816 BLAKE2B 2d6760ff367ee0ba6ff8d56f81c7c3587ccd8c4f8fb952e3380148b2f3532a19cd614f352241134eb3256f8e59c000806f3d1eb33caa582e0c4be813d3275672 SHA512 f8d43a3a80abd947cbd667b3ed449215d98967fa8dc2200efbba86db946a04dc7dc971d74afe1aa6b923ea3f9914b28c3bcb9f6ec205b1bfb0cd60c0ae57758a
26 DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B e30fff372b0112cc05723463cb4e93de79b5b643483796402eb88a7e704706a4033af2dbab9424cf14b1d894b57fc053b969f5fbfa15cf74e30e3d045703918f SHA512 5e8c6945da5e9cfb8d20663910fc38ee36813067e1679e17bbf1dfc6fc0aa9125f1fc949d81937b297215925004e0ebfb3b55c7e707184b5ffcf23d28882113d
27 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
28 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.188.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.188.ebuild
31 new file mode 100644
32 index 000000000000..4a10594a85f7
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.188.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##*.} + 4 ))
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 +}