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/vanilla-kernel/
Date: Wed, 02 Dec 2020 20:21:50
Message-Id: 1606940497.d303a3755b93a2e63a2deba3cde5e4d42f755d6b.mgorny@gentoo
1 commit: d303a3755b93a2e63a2deba3cde5e4d42f755d6b
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 2 15:09:14 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 2 20:21:37 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d303a375
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.81
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 2 +
13 .../vanilla-kernel/vanilla-kernel-5.4.81.ebuild | 103 +++++++++++++++++++++
14 2 files changed, 105 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index c8de4868128..865fb1f8869 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -17,6 +17,8 @@ DIST linux-5.4.79.tar.sign 989 BLAKE2B 26a1fcf560cb14a68ecb57e32ab7d6eed0cd33082
21 DIST linux-5.4.79.tar.xz 109628092 BLAKE2B b18636d55425207c572cfdf81d4b316ae2ea0054ca9d35bcddd46c17b16fba2e9f4776c57dd049296d4068669106ae15a9a19ed949b428dcab6d82e59117c477 SHA512 cb0ed9cb4b70b22d62c5faf607dc5ad1d338f75640e0ea6540bc508ee7803df572012a29cac50d1ccfc7ec9302416ae7b5451101b676ed789128370c9bad2470
22 DIST linux-5.4.80.tar.sign 989 BLAKE2B 7d0fa889c353c83eeb38d4868de3736baf6dd668db2b6660472b85dd6f9fffa83350954da80bd8e6441b54aa15324d68734ca863b0b1980b92a7b3a58073037e SHA512 54b7a124065020a69702fbc4ec82359c728ba32e8cafb7ba083d12974914c8309cc6b33b85769d87f91cbb2583b7c0a20d019d1b3808f32f07dda0ec795e8906
23 DIST linux-5.4.80.tar.xz 109626784 BLAKE2B b395b0326162ca6d9b9a59966e641eb1df63dbd402c8287b276c915478819132e201ae68fcbab2fbae353591ff4f38951a643b6a2e1283a551ab8464c21a2abc SHA512 ba400e61ce4e55a8bf391b45df15bb71f43f42de1f2cf2c19468f503b102ec1269589908fa186bfff946baf031ae1531f30ab420605a078439508898e5fdfb37
24 +DIST linux-5.4.81.tar.sign 989 BLAKE2B 2ca269f0675bdbe25658449704356127d61df07c9bb9cd1112ce0178c8e50683a0d817cd9e596c743a7c7cee3d938a568051f45c0c729043c026966dbd2d4000 SHA512 f9e0abf50c4e8177167a1e68906d9f58b4379f213901cc6ba1a5b3f74ac9468ed78945a6ac11895f93bf22989098be65645e92d9ab40daaa57ae75ffcb0f9159
25 +DIST linux-5.4.81.tar.xz 109638792 BLAKE2B b33192fff45e5f4b2e2d32684e1520657781c92f1b2b131885b16041c244de44e65bba9dd4ea62f7a9e67795145e35bd66fc515dacdb2518e19e1290c6f9e5f6 SHA512 562d460c916a239f62af3f0cf892c02b23614652bf8fb6aff39fb264536d28039e592c32b231888b62f816a9264f6aca687bcd219c56712e7db6638a30ad779e
26 DIST linux-5.9.10.tar.sign 989 BLAKE2B 28777305ef639cdeb41d76bd5db9212994a2a8d505b394b822f798937af43b946a4098477d1dce132a9caafc4b1009d7f3edac4a79b9eb45d66ff4bdfab69680 SHA512 a68c71883e0972e3cee877156b3dfdd5bc2ac6fee18d9da48c8355d2f19a8c2cf5bca2237f1806bdf0759c330f882331a581fbbf49fa2410f2a42e3cadfa5012
27 DIST linux-5.9.10.tar.xz 115545932 BLAKE2B 423d0e2fea39d54c9bbda532dce95f67c2736646b88515e72a3cea97842a25f4b2b4ef0aa2896d623bbc89eb6e8ca14f5b447030f190677601048816ae4a76e1 SHA512 f3f5195508affa84ccac30621c852b0dec42a227e2a3677a31b6fafcffdcf34964bf43cc96b08698faf319a1eead54f26638d7c70c20df31592e1c00ff00ae06
28 DIST linux-5.9.11.tar.sign 989 BLAKE2B d8c810fdbf587f70d7665960ed0df082417cde3d9b55b336147b672c2879c80630885162c57adcd437e14d9fc41112fd3f0cd20459822500b7a13c29b4da5e39 SHA512 4046df5a6318a9fd22ce13ca806028a8a97402224c6f8a032d222179d1dd24f80892fe60f51b63c6815370769a3eb7d64985bfa3b076cb61fc082c2de00dba3a
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
31 new file mode 100644
32 index 00000000000..9c5f2af87ff
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.81.ebuild
35 @@ -0,0 +1,103 @@
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 verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.4.21
46 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
47 +GENTOO_CONFIG_VER=5.4.77-r1
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
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://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
53 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
54 + verify-sig? (
55 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
56 + )
57 + amd64? (
58 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
59 + -> kernel-x86_64.config.${CONFIG_VER}
60 + )
61 + arm64? (
62 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
63 + -> kernel-aarch64.config.${CONFIG_VER}
64 + )
65 + ppc64? (
66 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
67 + -> kernel-ppc64le.config.${CONFIG_VER}
68 + )
69 + x86? (
70 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
71 + -> kernel-i686.config.${CONFIG_VER}
72 + )"
73 +S=${WORKDIR}/${MY_P}
74 +
75 +LICENSE="GPL-2"
76 +KEYWORDS="~amd64 ~arm64 ~x86"
77 +IUSE="debug"
78 +
79 +RDEPEND="
80 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
81 +BDEPEND="
82 + debug? ( dev-util/dwarves )
83 + verify-sig? ( app-crypt/openpgp-keys-kernel )"
84 +
85 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
86 +
87 +pkg_pretend() {
88 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
89 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
90 +
91 + kernel-install_pkg_pretend
92 +}
93 +
94 +src_unpack() {
95 + if use verify-sig; then
96 + einfo "Unpacking linux-${PV}.tar.xz ..."
97 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
98 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
99 + assert "Unpack failed"
100 + else
101 + default
102 + fi
103 +}
104 +
105 +src_prepare() {
106 + default
107 +
108 + # prepare the default config
109 + case ${ARCH} in
110 + amd64)
111 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
112 + ;;
113 + arm64)
114 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
115 + ;;
116 + ppc64)
117 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
118 + ;;
119 + x86)
120 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
121 + ;;
122 + *)
123 + die "Unsupported arch ${ARCH}"
124 + ;;
125 + esac
126 +
127 + local merge_configs=(
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 +}