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: Sun, 11 Jul 2021 20:57:00
Message-Id: 1626037005.238b1567b83dbc89d53ff676a984d80821a0bbac.mgorny@gentoo
1 commit: 238b1567b83dbc89d53ff676a984d80821a0bbac
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 11 16:00:15 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 11 20:56:45 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=238b1567
7
8 sys-kernel/gentoo-kernel: Bump to 5.10.49
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.10.49.ebuild | 105 +++++++++++++++++++++
14 2 files changed, 107 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index f12f98ffce0..c537ef925cb 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -12,6 +12,8 @@ DIST genpatches-5.10-51.base.tar.xz 1649104 BLAKE2B 611e698ca58531702279ae9874c0
21 DIST genpatches-5.10-51.extras.tar.xz 3412 BLAKE2B dbbe9031fdf275673014bafe3ee7d15e668f61187b6809df769a660830d026172b1eef1eefbbae61a2471004c14deba15913b0d4b57cfdf3750954ca075074b0 SHA512 6276fbea90ad4655021bcfb4e22c247e861807fa0c1a0ea6ce2fa439264422beaf74d0c8e08bf5fb0951727e1c4c189db5fe6672ff182d6c993919c0fcbeacbf
22 DIST genpatches-5.10-52.base.tar.xz 1649944 BLAKE2B 9712926fab35abb79b0c4bcc448fca65c1941f0840bbcfa3dc3c13a22f7711105bf3dd9536d3ff00fc5717eed70df5977d6771c3bd62a51cb8d36df824432831 SHA512 04519253c689cb6d88e82b624ef2928fe1bb8203113267c74cba5c1dd87cda072071c795410598f7f5ccd2533b65958027c959809c4b12503ecf9a4d7eb3fe50
23 DIST genpatches-5.10-52.extras.tar.xz 3412 BLAKE2B a458b569dfb6643b5a13fcce6c5df46c844119009c0593c6e655a2b0b7589af70a682745fc79f14fbc4fd7e45c52a924b8cc4665a31665a6abe1ba0c8d779bc2 SHA512 5a8f76b2791fefc6f0990402bd5307870517e79daccd52b4d126b8b278dafc086b47649631b3b07f220e3b06d03f12f765bbfb837988257db737c34806a78744
24 +DIST genpatches-5.10-54.base.tar.xz 1652540 BLAKE2B 37ecda0a4f76784572985be5073e7a3f33eb3aa43e641a2bc083e987c88c45cbc277bdeb20bb6ae4d264a17b65273119790ba8dcba7e22fd76ea8d0bd1be1cfb SHA512 85587df46e72cde33fb869f16b7fcc995a4d947552ab4bfb45ffcc852dad1f4b56a58d81446a00a142b9e628bd2fcc8c4922b50a282706f430b0bd9e20aa34e4
25 +DIST genpatches-5.10-54.extras.tar.xz 3416 BLAKE2B 3602707190ed04f62c4b2e8e0e765a53cf436b437373e71b6afd392cf05a73ac9e24f89293aac17c3730cdd696485ebf9d98161b248c9acafbfbe0b0c2db8ab8 SHA512 e4aad3f799dbcf00f813e39c8b9b355f17914a33d1ef422b3e7ee48c48e77a69925cc5664f0f171d1a632f622417b9d7ec88e56b1575c8e5f82af94f64337f42
26 DIST genpatches-5.11-25.base.tar.xz 1030312 BLAKE2B c3e0f5840c32292d36be31a8606934bfa1ccb7e31f04cd214574009577907d00912bacce1f85dddeda77ba99f40f61fa5aa5259a693c74abd63a05be5a44f2aa SHA512 5adbe3770562b57d7180a44ccca8e665cc5b0d9ba5168c4b3555b348708edd7469464bd770124d9a8641095bdbe786d843ae3da64b845d577999c9e40360c970
27 DIST genpatches-5.11-25.extras.tar.xz 1772 BLAKE2B 0bd2afbd93cd7553c8e058f61c515ed9d47e9f328529e6cf36a7100b363dc8e4c3004afa06a0c0b95963bcf69a216ae6a7bf595062401725a4a25f942f44a3e8 SHA512 114094a87bad0dc4a265847fa18b88a2795daf151de8451bb4fbe4af70f3f4bcff8905d8d90522f85914bb7ba7227ebab7f69ab59112afb2187332b393450fec
28 DIST genpatches-5.12-11.base.tar.xz 611232 BLAKE2B af0db172fa831bc84b1935d387e3d7b360c5a94d8499b6fa204f21b7a822c844e88a87f4a2724d0b8b508676ee564dbbe304893bfdd3197d67c8f6aeae011cb2 SHA512 f422bc1aca29732db09184ca2fcf7478536a87e73b59325f063c73103c8ce425858baa78b185eab61a80dda15e3818b45a669c69f7898382aa3563b315ad45b3
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49.ebuild
31 new file mode 100644
32 index 00000000000..45a37c02060
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.49.ebuild
35 @@ -0,0 +1,105 @@
36 +# Copyright 2020-2021 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.10.12
47 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
48 +GENTOO_CONFIG_VER=5.10.42
49 +
50 +DESCRIPTION="Linux kernel built with Gentoo patches"
51 +HOMEPAGE="https://www.kernel.org/"
52 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
53 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
54 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
55 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
56 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
57 + amd64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
59 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
63 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
67 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
71 + -> kernel-i686-fedora.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
77 +IUSE="debug hardened"
78 +REQUIRED_USE="arm? ( savedconfig )"
79 +
80 +RDEPEND="
81 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
82 +BDEPEND="
83 + debug? ( dev-util/pahole )"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}"
86 +
87 +QA_FLAGS_IGNORED="usr/src/linux-.*/scripts/gcc-plugins/.*.so"
88 +
89 +src_prepare() {
90 + local PATCHES=(
91 + # meh, genpatches have no directory
92 + "${WORKDIR}"/*.patch
93 + )
94 + default
95 +
96 + # prepare the default config
97 + case ${ARCH} in
98 + amd64)
99 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
100 + ;;
101 + arm)
102 + return
103 + ;;
104 + arm64)
105 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
106 + ;;
107 + ppc64)
108 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
109 + ;;
110 + x86)
111 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
112 + ;;
113 + *)
114 + die "Unsupported arch ${ARCH}"
115 + ;;
116 + esac
117 +
118 + local myversion="-gentoo-dist"
119 + use hardened && myversion+="-hardened"
120 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
121 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
122 +
123 + local merge_configs=(
124 + "${T}"/version.config
125 + "${dist_conf_path}"/base.config
126 + )
127 + use debug || merge_configs+=(
128 + "${dist_conf_path}"/no-debug.config
129 + )
130 + if use hardened; then
131 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
132 +
133 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
134 +
135 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
136 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
137 + fi
138 + fi
139 + kernel-build_merge_configs "${merge_configs[@]}"
140 +}