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: Thu, 03 Sep 2020 18:07:55
Message-Id: 1599156466.53acd2d30929704d23e912a507794a9a4e4c5bdd.mgorny@gentoo
1 commit: 53acd2d30929704d23e912a507794a9a4e4c5bdd
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 3 14:01:42 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 3 18:07:46 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53acd2d3
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.62
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.62.ebuild | 98 ++++++++++++++++++++++
14 2 files changed, 100 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 70d95b56f08..cfa72c7a0db 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -2,6 +2,8 @@ DIST genpatches-5.4-61.base.tar.xz 2186332 BLAKE2B f0063cb381a98330178dcf4ffa017
21 DIST genpatches-5.4-61.extras.tar.xz 1764 BLAKE2B eeb60ddb3ac1b28aaccca2820d107dc65629b61460073b1e281903b04759f3c1a66ee8dca35459d1ea81fc75410709c8010c3c16aedf802fcc626cf47534ead0 SHA512 35a93c028932e1e6313ccce7fe0aa5277e57cad6c61418a436432aea5a3937e4621d72ae4d2e9b28c7b26342eaf0e63bdd9e55362d9f7b0aa4bb6a64b0c59c37
22 DIST genpatches-5.4-62.base.tar.xz 2210192 BLAKE2B 5aa23923418095dad7570323e6bf853a3f718a527e15c56cbb7f177e1c03f814d741c6ba3888b9fbd40af418d9400999995469f83548a220f0efed0635217f86 SHA512 e4622bdf08e4b678eb6701a6284a5d85e0bf91973ba0e4f797c6dd4e3a14a8b34879eb7561bc38a183d72281a18cadddd4d4caf0eb8fe7acf49bd0fc823fb329
23 DIST genpatches-5.4-62.extras.tar.xz 1768 BLAKE2B 6381f43f1f0bc497cfea4451538cd4a6900002a40031f5a726d0dfcd8da8ab1a8c2af4403810d2c6f0377ac5a1bcf799d43e42141361ab684e7a63a11e31bf84 SHA512 efbe0418614bcc2674040e4db0a137760f719793cab7e57cb237ff85ecffe1521a056c6c2ffda2c7efd7e47a0b914a06e87f92d73fbb754b41dfa63a88e7d4ea
24 +DIST genpatches-5.4-63.base.tar.xz 2261952 BLAKE2B 98f002f6a4f7a5908c4da9e9fb25451e995378d848f0bd6408e7e800bf94ecc41480eb76293dd840035d48806eb1bfaf92e33c2bf3979ca8e6f8fb417ac3644b SHA512 f5a089e940b70c7fdcb4de8aaf28c17f0783626af05271b3dec348307ee202525d11e139845db95f0e225cfbbee2185638ac79a617ca13168e0676685caaba4e
25 +DIST genpatches-5.4-63.extras.tar.xz 1768 BLAKE2B ca8c254b3f0f31ba0e0dff7e99127c36acf94783075ddb53ef8da28c017422e6a1537992e06796983b703d1062c0b6a609d58f6b0ed5e62a069902065bc6dca7 SHA512 075581b8fa5123d2b48b5a66d939fc126db7000229713a07cbc475c7052e07acb357c408b2b4484d3d60b72088c260af09e9d871c7ff6b0ea559ea396109aba3
26 DIST genpatches-5.7-18.base.tar.xz 778720 BLAKE2B 384315c8e0e23db1137f73d6d60bc6f681d7b74e23e2b5288ad741ae8f005255164074c08a4ece67667d5eaff15dd0f955fb2eb23d9745c8647ce7761aad3f47 SHA512 8c36cb71a02d9bff7d3257c527c16191a8ba05e08e4cd836047e97264d93cd93343d13e2a550f2b8321d638a00069d8108296240c7d2656023185c80ad640c0d
27 DIST genpatches-5.7-18.extras.tar.xz 1768 BLAKE2B 7312c4b26f1e3aaa51b8a8e67f9fade727b1ec6dbcc256d581061ea6ab878a47dcecfe6d949d677500a49d62928ce4a8c6aae75ce618b9555fcf7fa11fee4ecc SHA512 6b4459fef57765cf67503265ea094ffebbf5f2f9db7c753e1182f524f44981e9b047b6a1661f45b9d99f39e2c2ec57bb1a93e35dfc4a62997d9b629728c2b5c6
28 DIST genpatches-5.7-19.base.tar.xz 806520 BLAKE2B 1eba96a84e0a75a6dd53cbe24181ee761579f49ab95b2d128dac2bb2780fb0e5b2d5751b95368df70dbe8a9e6ea2ddde960b04e7961d52be02928f17ae2b43c4 SHA512 e654d6444e82e083996f57cb3a8775898e37ec1ab71cd0f639ee0398d6b1f4e875c5bc661db83f46b1d67c5d77a9528182f9ef7980e5c222084d0f016d6e57d5
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62.ebuild
31 new file mode 100644
32 index 00000000000..44e23fbb4fb
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.62.ebuild
35 @@ -0,0 +1,98 @@
36 +# Copyright 2020 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##*.} + 1 ))
45 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
46 +CONFIG_VER=5.4.21
47 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
48 +
49 +DESCRIPTION="Linux kernel built with Gentoo patches"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
52 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
53 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
54 + amd64? (
55 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
56 + -> kernel-x86_64.config.${CONFIG_VER}
57 + )
58 + arm64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
60 + -> kernel-aarch64.config.${CONFIG_VER}
61 + )
62 + ppc64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
64 + -> kernel-ppc64le.config.${CONFIG_VER}
65 + )
66 + x86? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
68 + -> kernel-i686.config.${CONFIG_VER}
69 + )"
70 +S=${WORKDIR}/${MY_P}
71 +
72 +LICENSE="GPL-2"
73 +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
74 +IUSE="debug"
75 +
76 +RDEPEND="
77 + !sys-kernel/vanilla-kernel:${SLOT}
78 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
79 +BDEPEND="
80 + debug? ( dev-util/dwarves )"
81 +
82 +pkg_pretend() {
83 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
84 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
85 +
86 + kernel-install_pkg_pretend
87 +}
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.config.${CONFIG_VER}" .config || die
100 + ;;
101 + arm64)
102 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
103 + ;;
104 + ppc64)
105 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
106 + ;;
107 + x86)
108 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
109 + ;;
110 + *)
111 + die "Unsupported arch ${ARCH}"
112 + ;;
113 + esac
114 +
115 + local config_tweaks=(
116 + # shove arch under the carpet!
117 + -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
118 + # we do support x32
119 + -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
120 + # disable signatures
121 + -e '/CONFIG_MODULE_SIG/d'
122 + -e '/CONFIG_SECURITY_LOCKDOWN/d'
123 + )
124 + use debug || config_tweaks+=(
125 + -e '/CONFIG_DEBUG_INFO/d'
126 + )
127 + [[ ${ARCH} == x86 ]] && config_tweaks+=(
128 + # fix autoenabling 64bit
129 + -e '2i\
130 +# CONFIG_64BIT is not set'
131 + )
132 + sed -i "${config_tweaks[@]}" .config || die
133 +}