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, 30 Dec 2020 19:41:11
Message-Id: 1609357257.e81601613526bd42c24c057f117c982d93ce6af1.mgorny@gentoo
1 commit: e81601613526bd42c24c057f117c982d93ce6af1
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 30 17:27:21 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 30 19:40:57 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8160161
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.4
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.10.4.ebuild | 98 ++++++++++++++++++++++
14 2 files changed, 100 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 0e9af5394e1..18b66a07cdb 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -22,6 +22,8 @@ DIST linux-5.10.2.tar.sign 989 BLAKE2B 26c7e1b6025fdc8b37ed8854848a7eb9bd277c837
21 DIST linux-5.10.2.tar.xz 116590032 BLAKE2B 708b51b58f63d8954073d7ab559286fc854c700108505e659474e55b2d0968cea002b8356d5441e6b24d37a4194684a6244293c760da6d442a6c76e268619a18 SHA512 1254a6e0c47e5f134a66fce4013c84b20cbdda9fd086b43049b5cd28531e7b610b0d7366d87bcf1bc12a5f17ad5e4f6495a842c15f6a7588c586326cfa57d346
22 DIST linux-5.10.3.tar.sign 989 BLAKE2B 24cb9883b4006c91e4fce03e5a35db072b95622a9bfa3730e04684f4bd80e7c76f34b40d6cddfd996371cc9fd1d11a8b61acca8959e31d17de16d9a94e058186 SHA512 d0b79d11a1007fddbf455098139624290275d4b9fd490e53b82b3f22f1ab564c9a36ebb9705f95107f40d6d91ba7a49ed233531e0e112072dc62c7ad5f824ba4
23 DIST linux-5.10.3.tar.xz 116591740 BLAKE2B 0a8603991e9de4b50c2a0c9b7f96d2d169a41567f81bfc8bfd3d41edd45a948d2a672236c9651d701f16f0cb619c39996c9cc883647bacb2cefb33100e072d98 SHA512 3b1fb09f5ffd53e36eaceda6aa97c976d7fd2ffda4e13ce05ecf625c32bbdc0643eee7bc4e43230482dcd328a57669d6d6c7551fa4592d5f3c1a8924bb5a012b
24 +DIST linux-5.10.4.tar.sign 989 BLAKE2B d29e97723b686c4ef8fcb4b087908cba5ff73b42c08a78d8e042c18e3b44edf926b05385b90d586cc00a6b8913854e4e06c362c9e63ad4fd2563f072c3faf179 SHA512 c4c93f6ed2052180669760516427378aa361dd32f06e94a8735b298bb1abb7f7101efc15b6203a0f1a0e71a7ffbf949ccd21d00a32b3f02cc0b1ea3eefdf6a68
25 +DIST linux-5.10.4.tar.xz 116612908 BLAKE2B 57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378ab4c49b76ccb2f7a9012d6aa7ff1349d488cb31e40924be2f27b244cec SHA512 aab782786cc06b5f1872bbb88c4f55a73d222f8ecf1ab8f5b7d96de2160b11b4407e02a44b206d2c00e395ba0662aa5a038b8e10d185621a0b33c576b523b490
26 DIST linux-5.4.80.tar.sign 989 BLAKE2B 7d0fa889c353c83eeb38d4868de3736baf6dd668db2b6660472b85dd6f9fffa83350954da80bd8e6441b54aa15324d68734ca863b0b1980b92a7b3a58073037e SHA512 54b7a124065020a69702fbc4ec82359c728ba32e8cafb7ba083d12974914c8309cc6b33b85769d87f91cbb2583b7c0a20d019d1b3808f32f07dda0ec795e8906
27 DIST linux-5.4.80.tar.xz 109626784 BLAKE2B b395b0326162ca6d9b9a59966e641eb1df63dbd402c8287b276c915478819132e201ae68fcbab2fbae353591ff4f38951a643b6a2e1283a551ab8464c21a2abc SHA512 ba400e61ce4e55a8bf391b45df15bb71f43f42de1f2cf2c19468f503b102ec1269589908fa186bfff946baf031ae1531f30ab420605a078439508898e5fdfb37
28 DIST linux-5.4.83.tar.sign 989 BLAKE2B 0c1c9737b51eb02747146498475436682fec4d0e97c6e90e840682878eff34aeffa6970eac0ce117ce18bb8ca2e15fc1a9b0bfb83e021b710fa10dd713437c32 SHA512 be2564571dc109611e802d5dfe1d69339d375bb01259d46888c18ef03979401d9943721131c10609a8a07f14cfe0b990e558e15c7d89a2eccc71e86d620cf4c0
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.ebuild
31 new file mode 100644
32 index 00000000000..cc953811ce2
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.4.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 verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.10.2
46 +CONFIG_HASH=b40ee468dab9a27cca8b91fef64d1d43ce0ed1b2
47 +GENTOO_CONFIG_VER=5.9.8-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-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"
78 +REQUIRED_USE="
79 + arm? ( savedconfig )"
80 +
81 +RDEPEND="
82 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
83 +BDEPEND="
84 + debug? ( dev-util/dwarves )
85 + verify-sig? ( app-crypt/openpgp-keys-kernel )"
86 +
87 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
88 +
89 +src_unpack() {
90 + if use verify-sig; then
91 + einfo "Unpacking linux-${PV}.tar.xz ..."
92 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
93 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
94 + assert "Unpack failed"
95 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
96 + else
97 + default
98 + fi
99 +}
100 +
101 +src_prepare() {
102 + default
103 +
104 + # prepare the default config
105 + case ${ARCH} in
106 + amd64)
107 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
108 + ;;
109 + arm)
110 + return
111 + ;;
112 + arm64)
113 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
114 + ;;
115 + ppc64)
116 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
117 + ;;
118 + x86)
119 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
120 + ;;
121 + *)
122 + die "Unsupported arch ${ARCH}"
123 + ;;
124 + esac
125 +
126 + local merge_configs=(
127 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
128 + )
129 + use debug || merge_configs+=(
130 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
131 + )
132 + kernel-build_merge_configs "${merge_configs[@]}"
133 +}