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, 06 Jan 2021 19:00:27
Message-Id: 1609959613.b602b82534e3d1ec2874fb2023aea20872d91ba4.mgorny@gentoo
1 commit: b602b82534e3d1ec2874fb2023aea20872d91ba4
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 6 16:01:12 2021 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 6 19:00:13 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b602b825
7
8 sys-kernel/vanilla-kernel: Bump to 5.4.87
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 4 +
13 .../vanilla-kernel/vanilla-kernel-5.4.87.ebuild | 104 +++++++++++++++++++++
14 2 files changed, 108 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index d47b4a9c148..ec46f0b6d10 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -12,6 +12,8 @@ DIST linux-5.10.3.tar.sign 989 BLAKE2B 24cb9883b4006c91e4fce03e5a35db072b95622a9
21 DIST linux-5.10.3.tar.xz 116591740 BLAKE2B 0a8603991e9de4b50c2a0c9b7f96d2d169a41567f81bfc8bfd3d41edd45a948d2a672236c9651d701f16f0cb619c39996c9cc883647bacb2cefb33100e072d98 SHA512 3b1fb09f5ffd53e36eaceda6aa97c976d7fd2ffda4e13ce05ecf625c32bbdc0643eee7bc4e43230482dcd328a57669d6d6c7551fa4592d5f3c1a8924bb5a012b
22 DIST linux-5.10.4.tar.sign 989 BLAKE2B d29e97723b686c4ef8fcb4b087908cba5ff73b42c08a78d8e042c18e3b44edf926b05385b90d586cc00a6b8913854e4e06c362c9e63ad4fd2563f072c3faf179 SHA512 c4c93f6ed2052180669760516427378aa361dd32f06e94a8735b298bb1abb7f7101efc15b6203a0f1a0e71a7ffbf949ccd21d00a32b3f02cc0b1ea3eefdf6a68
23 DIST linux-5.10.4.tar.xz 116612908 BLAKE2B 57f6d719451aacfd298452703ae02e6188885500e8cdf18fffa6b9967b0934a23cd378ab4c49b76ccb2f7a9012d6aa7ff1349d488cb31e40924be2f27b244cec SHA512 aab782786cc06b5f1872bbb88c4f55a73d222f8ecf1ab8f5b7d96de2160b11b4407e02a44b206d2c00e395ba0662aa5a038b8e10d185621a0b33c576b523b490
24 +DIST linux-5.10.5.tar.sign 989 BLAKE2B 376175dc06bdef26ba4d6ad1503d983cd2b49e4b49a5d575fda0f492ff7ad57a05b8485bea452804f13263f0e6d50e63021d7d67fc0cc18429b6b09942965bc7 SHA512 f917e71683247f8c04045c41ea50dc6b49aa17434d12d82c698b1153e9c625c7e6cf7aadd0d9a7f83bf743d26bd879228c8fdc101bc46838a6f075e7e646021c
25 +DIST linux-5.10.5.tar.xz 116604852 BLAKE2B 25b71eb091ea6526a7ebfef5bc201b76d612e5138b6b3caa708f90e76196c30d1865c223e2084a118a3883a9620d47c9576b1ab7db2c8d9c0f204dda7c640eab SHA512 f3462c8ee26c34a8ee344fa146f6f3aeceab03ef1cff83f3b831251f52aa70823d67085030a37b7fea21b305e20bcd7616d16557a7b5bd757b8f84d9805413da
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 @@ -20,3 +22,5 @@ DIST linux-5.4.85.tar.sign 989 BLAKE2B 90ecac8f32d7c22af508b3233768065cc4626b670
30 DIST linux-5.4.85.tar.xz 109636476 BLAKE2B adc66aa3a2a901ed4d7450cc46efe4cef48536e03d19519b9f3f7015930489a9499b60ab8b66624bb54cf5c25aee0d3c39023c979615c0adf3edb5c89f5d595b SHA512 a1b188952ba81d9c4a19442035f9595292b443632fc17b1d976d2de11626287bdb75db1f50858c6224cff8665e3501619799c199c19b32283e7b6ea5683fd1a5
31 DIST linux-5.4.86.tar.sign 989 BLAKE2B 03cd85aecb55488abcd7c09ce0f2d4a83e99267fe9ee1e36aaf66e4ea947275e373ac1f3e95f11049da58f760cc38ec240ee777aadc825f75aabce3645f00022 SHA512 b65b4a2ea90c2e907b247254dd73529e4098158ed29d9b31dba9c1d4a0e14f2e9b36c9e4870e764e0bc7bd0c884c40e9f420fbf43aedd75f21794cfca04b705e
32 DIST linux-5.4.86.tar.xz 109648392 BLAKE2B 6c46810bce8902794849dfbab686b9c63ceea726d0a58351901d67c50370ed75d325095c0f426706c664f81a315621adae2f7080752e40e5a29b67ea67626005 SHA512 3cb6d81434ed7c340f67530f1bc9cadff81a916ecccc421833e3c70de0c72d1b3790c0ccae228a0ead591b2ccf1abf7fec0299565590e7f08889b509af141952
33 +DIST linux-5.4.87.tar.sign 989 BLAKE2B e3cc133ad3edc6d9cc8e0f5aa8d1405c5fd7d37d3b34bac28404d9a75a6fa0d4d8d06c4914fa6606f5d80a0ef742a02422a45cb727fb9d9824a37ad002459337 SHA512 4c2a83b8aba30199b11e5ee1f7546aa0572b7121867d23ae8635868bec8ba86ea0473908fdf08246a589e353e4088c9065d28c6210a29be8e0dab9888b02e430
34 +DIST linux-5.4.87.tar.xz 109641324 BLAKE2B 0618c30298460d1d2de3062542782e8c3bf842fb36a0341391eb0e3bd9217b8478bef7474b9bb7dd4f6eaf360d215905b558326e9fabf887fb6a335a3c1ca4ab SHA512 6041678c79ec3568462a329b8ba0c1bd7f59bda594a621d597917a84838a394804da547b3b772416fbebcd59f5274761a40a52d22abb9820ea190d37bcb30b40
35
36 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.87.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.87.ebuild
37 new file mode 100644
38 index 00000000000..ce8b37632c4
39 --- /dev/null
40 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.87.ebuild
41 @@ -0,0 +1,104 @@
42 +# Copyright 2020-2021 Gentoo Authors
43 +# Distributed under the terms of the GNU General Public License v2
44 +
45 +EAPI=7
46 +
47 +inherit kernel-build verify-sig
48 +
49 +MY_P=linux-${PV}
50 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
51 +CONFIG_VER=5.4.21
52 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
53 +GENTOO_CONFIG_VER=5.4.77-r1
54 +
55 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
56 +HOMEPAGE="https://www.kernel.org/"
57 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
58 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
59 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
60 + verify-sig? (
61 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
62 + )
63 + amd64? (
64 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
65 + -> kernel-x86_64.config.${CONFIG_VER}
66 + )
67 + arm64? (
68 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
69 + -> kernel-aarch64.config.${CONFIG_VER}
70 + )
71 + ppc64? (
72 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
73 + -> kernel-ppc64le.config.${CONFIG_VER}
74 + )
75 + x86? (
76 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
77 + -> kernel-i686.config.${CONFIG_VER}
78 + )"
79 +S=${WORKDIR}/${MY_P}
80 +
81 +LICENSE="GPL-2"
82 +KEYWORDS="~amd64 ~arm64 ~x86"
83 +IUSE="debug"
84 +
85 +RDEPEND="
86 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
87 +BDEPEND="
88 + debug? ( dev-util/dwarves )
89 + verify-sig? ( app-crypt/openpgp-keys-kernel )"
90 +
91 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
92 +
93 +pkg_pretend() {
94 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
95 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
96 +
97 + kernel-install_pkg_pretend
98 +}
99 +
100 +src_unpack() {
101 + if use verify-sig; then
102 + einfo "Unpacking linux-${PV}.tar.xz ..."
103 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
104 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
105 + assert "Unpack failed"
106 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
107 + else
108 + default
109 + fi
110 +}
111 +
112 +src_prepare() {
113 + default
114 +
115 + # prepare the default config
116 + case ${ARCH} in
117 + amd64)
118 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
119 + ;;
120 + arm64)
121 + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
122 + ;;
123 + ppc64)
124 + cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
125 + ;;
126 + x86)
127 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
128 + ;;
129 + *)
130 + die "Unsupported arch ${ARCH}"
131 + ;;
132 + esac
133 +
134 + local merge_configs=(
135 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
136 + )
137 + use debug || merge_configs+=(
138 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
139 + )
140 + [[ ${ARCH} == x86 ]] && merge_configs+=(
141 + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
142 + )
143 +
144 + kernel-build_merge_configs "${merge_configs[@]}"
145 +}