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: Fri, 03 Mar 2023 17:33:18
Message-Id: 1677864789.eb6d5d869f27c21405231399a7f1f0bc98e378d6.mgorny@gentoo
1 commit: eb6d5d869f27c21405231399a7f1f0bc98e378d6
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 3 13:42:29 2023 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 3 17:33:09 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6d5d86
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.234
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.234.ebuild | 103 +++++++++++++++++++++
14 2 files changed, 105 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 6df34bdea76f..7cfdfcb79206 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -18,6 +18,8 @@ DIST genpatches-5.4-237.base.tar.xz 5514132 BLAKE2B 90509a99ec10e042915362652369
21 DIST genpatches-5.4-237.extras.tar.xz 1812 BLAKE2B 5a4e6b9593a9e9f87afd5f06f03fcdec5fb6072c6689f392821a9778e84634da193c8085ee37348adcd7059ab05ec056e9d7dc9fa27ec98c118ba18878baeeb1 SHA512 21f552b05deabff804c841247fa037e71cca35892f8d212cd5c2c0dcf8a43e455a7d4934f59e4182513dc2257a34f5a976823cf6c0f87a5bf3449365ad353769
22 DIST genpatches-5.4-238.base.tar.xz 5519048 BLAKE2B 9413ae97bb032e51ad570ff2c59ad9527d165563d32a8c9aeb4eea2ff9176115180c0c664f6729ea6aa9b3bfc4968c465636078c2ddf439271f18750ad048ca8 SHA512 d91f42ad1370bcd8bd8f56410abc74b964b123b42a0100c1b4d934d50903d7a4ff4eaa79f02ed85362f0eb3ae6e3e984d1ef85add8f969ca9ddf5c51917cc372
23 DIST genpatches-5.4-238.extras.tar.xz 1812 BLAKE2B b797329d02faf1f7bcc9bebc5f4b028e581a0c45660f15ff6010b6b8d5b920725c4697e26e8ec22fc94070723fba6e5c6fbe273fbd4a5c5245fc0a8247037e5e SHA512 b4adc55c826f9154f977e329dbacb1c5e92a2dee1d694e9b0d2b63d0ce4e3bc55ad05918678865d7964aa6e437f939e7e07652a5498e9a316f09069daae8487f
24 +DIST genpatches-5.4-239.base.tar.xz 5520768 BLAKE2B 9023bb6baa304282c516ae3d8ecff8753bc9b4f0f06166a9e5358d19d6c24d41df4aed6df3174071deabfa9e3224a2c11a94a1b04741c844da88e8f2843178ab SHA512 a776e9663e762d61e5646b56d705a82d17459ff657ef0ffa817b380bb62ed4ba8ca1b84dfba5700c9b33e018736f366b335769005004f9ee15645110a5751d41
25 +DIST genpatches-5.4-239.extras.tar.xz 1812 BLAKE2B f16995331f57d04a5e92164dcb09eab416c56184d9df7546bac597f25614af08053823f3877dcb4ffd54253ad610e9a8c39818290ffde145c3839041ca79fa7e SHA512 c0f6e320892485d8806efc553bef45b9bda7f35bf357af562136d6f10d41c2dcac767595902f2084ddce9ebce9dcc1952e9e72833b79b396dbf398a66017898d
26 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0
27 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653
28 DIST genpatches-6.1-15.base.tar.xz 803732 BLAKE2B 5f43fb07787e9e861b54b4977acff47c13870b24cba98296538651c656e332be2bd194b91a67d68858bb7ddf116e0e97179c5c039c64b75f4392829d091ee387 SHA512 482cb110c5d218a0b0dd4dd828862d9cfb5044b5c90f75218dd7bbf266dba1a11af11ecd913029904d6de1d572d2cbb247b5bbf1c4bb5711eb9fb03b327aaa81
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.234.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.234.ebuild
31 new file mode 100644
32 index 000000000000..aab83b3a5cd9
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.234.ebuild
35 @@ -0,0 +1,103 @@
36 +# Copyright 2020-2023 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=g6
49 +
50 +DESCRIPTION="Linux kernel built with Gentoo patches"
51 +HOMEPAGE="
52 + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
53 + https://www.kernel.org/
54 +"
55 +SRC_URI+="
56 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
57 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
58 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
59 + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
60 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
61 + amd64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
63 + -> kernel-x86_64.config.${CONFIG_VER}
64 + )
65 + arm64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
67 + -> kernel-aarch64.config.${CONFIG_VER}
68 + )
69 + ppc64? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
71 + -> kernel-ppc64le.config.${CONFIG_VER}
72 + )
73 + x86? (
74 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
75 + -> kernel-i686.config.${CONFIG_VER}
76 + )
77 +"
78 +S=${WORKDIR}/${MY_P}
79 +
80 +LICENSE="GPL-2"
81 +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86"
82 +IUSE="debug"
83 +
84 +RDEPEND="
85 + !sys-kernel/gentoo-kernel-bin:${SLOT}
86 +"
87 +BDEPEND="
88 + debug? ( dev-util/pahole )
89 +"
90 +PDEPEND="
91 + >=virtual/dist-kernel-${PV}
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 + ppc)
110 + # assume powermac/powerbook defconfig
111 + # we still package.use.force savedconfig
112 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
113 + ;;
114 + ppc64)
115 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
116 + ;;
117 + x86)
118 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
119 + ;;
120 + *)
121 + die "Unsupported arch ${ARCH}"
122 + ;;
123 + esac
124 +
125 + echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
126 + local merge_configs=(
127 + "${T}"/version.config
128 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
129 + )
130 + use debug || merge_configs+=(
131 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
132 + )
133 + [[ ${ARCH} == x86 ]] && merge_configs+=(
134 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
135 + )
136 +
137 + kernel-build_merge_configs "${merge_configs[@]}"
138 +}