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: Sat, 29 Oct 2022 15:31:12
Message-Id: 1667057426.0f71c83429d7467878fb1fa30850abf4f1718d41.mgorny@gentoo
1 commit: 0f71c83429d7467878fb1fa30850abf4f1718d41
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 29 11:29:56 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Oct 29 15:30:26 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f71c834
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.221
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.221.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 2db159599b25..e00bc6511bd4 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-5.19-19.base.tar.xz 1098964 BLAKE2B c79251602e677d36db4f923ad148
21 DIST genpatches-5.19-19.extras.tar.xz 3804 BLAKE2B c73e8bb8be2845ada725f71045e69fa38c99d0561e702d38e3827cf1e25ff2ab2105e3142d0f85baea59fa4a28a4521202d222c53190b741055609551ac1039f SHA512 b6f813b816f475a120543f637857f683e82cb22484fad7149bfbc5bcdd6d5119373d915ac53d6b743197910e78fc2ebdf35bcfb3612015e571629d33740f2701
22 DIST genpatches-5.4-225.base.tar.xz 5166864 BLAKE2B 20ffa864c45b41e82079158fc4645e5c809bda93c0de480aea22b2f1feac231c7eddaf031daae9939126297a197bb3cbcd48a696da76eda0fe8591cac817103b SHA512 da6a1febb01a772d8ba454de51fe902830461bcbd87e76f8f459bf9adbb8bbe2493914c5ebd4f291ea59bcfedea34d3aa96baf98409e84220240d70c17ab66a1
23 DIST genpatches-5.4-225.extras.tar.xz 1812 BLAKE2B 9f10288c90b85f42bb95694c9fc215f680251d121cc371495b798081beb4cb6a6bea10a54e291a187cf4f194a9edf7ee479b461dc188b1187692784651f1042f SHA512 0b9215d36bd6e04e0a7aae544997d10db03770a9e43b152c266b8ed099a12fd8b6da851d81a0b3885e5e4965bf5d9fa5cfa3a6fa3f1ea9642e6ca7b9abef124e
24 +DIST genpatches-5.4-226.base.tar.xz 5186832 BLAKE2B fb55ce4cae1d02a54869a3dd5e319d8e09d2b407adaf26f7b5bb0370f4f58e620af8e9d7eb7ec12cb4e5906a29de533eda7234687d689ddc29dcded1c146be3d SHA512 e6aa0090c92cc6b3460c251544bdbf7d6c8c249e897fd04b5de0c34255ebfa8a0d29fbd7ff698656aaaec71978634b9685bf5b9052bef564587512a1def6e639
25 +DIST genpatches-5.4-226.extras.tar.xz 1812 BLAKE2B a477853adc62b2f1ee5d2093966c211638d4f0d3550de98990261db927a1946ee6a8163502f0a5b66b57d326521cdfe18ed1875bc126a63ce662e4442abaa9d1 SHA512 821a81cc51ecf898420e480860de4a7083fa2c6f1681e468f9058c7de403af07f72351395791facc34977dc05b6dedf4b2684fd29914bfe6802fd2fcac3465df
26 DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa SHA512 e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
27 DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
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.221.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.221.ebuild
31 new file mode 100644
32 index 000000000000..5fa543cace37
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.221.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 +}