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, 06 Aug 2020 15:42:34
Message-Id: 1596728525.9405f2be751b1f9790fc2dc8afd13ca3b645b32a.mgorny@gentoo
1 commit: 9405f2be751b1f9790fc2dc8afd13ca3b645b32a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 6 02:31:36 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 6 15:42:05 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9405f2be
7
8 sys-kernel/gentoo-kernel: Bump to 5.4.56
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.56.ebuild | 84 ++++++++++++++++++++++
14 2 files changed, 86 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index 5603341f59f..41860c07bab 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -6,6 +6,8 @@ DIST genpatches-5.4-53.base.tar.xz 1827188 BLAKE2B af537fc71643e9bcf7a4cacd5af6a
21 DIST genpatches-5.4-53.extras.tar.xz 1764 BLAKE2B 192b382f6309fef702204b4ae60375460587933c2e3dc2fc2aff6a2524828e956efc447b084e54538d72943d92882ded3aeabcf2bf75f34f3199490140bc2f80 SHA512 d44c1daa0b4c8661fbb66b01992ae6738b54cf32040f096bc95d6c0ea8f7cfd34e4c8f5065e7cd5d2a6d9c0b418b245aad622ad230582f45ac5859c88a46ebd0
22 DIST genpatches-5.4-55.base.tar.xz 2129856 BLAKE2B a9c688be16c22e0e563c0fa3c943931ef933d0114a1a98b41305d4f566fec453a4861465d5a1605835cd7277bcaee9cf5a238ea624bfb650e389960cb1dd6292 SHA512 a3f4b23d59f6e4253d6a9b113977b7ff64fba611b33244ba69a06887a9f597fcf6c87f23d7412471e77187d01b4ae736ebbb71ebb647426e09e0051fe4493c51
23 DIST genpatches-5.4-55.extras.tar.xz 1768 BLAKE2B 195b5747cee6c3302bdcc2cb9b05f0cb87c367bb63e7a0afdc93127cf2844e8babf9bd378370217d57364c9a3bd0eccf01a41b40606ef1feb96ef90e9e67f91a SHA512 32bfd86dad656b6f9878df9c7bf17557cb553e540c34ba8f4fe9bd9b4d42c006a62c29d465d91a67933e27bdbf9a1e35c3b87d95166822b48bdde2584bc8edf1
24 +DIST genpatches-5.4-57.base.tar.xz 2072976 BLAKE2B 6b1c954075b2cb45c90c091514d60a6cf31141cfdae1f6df210cfb5fe9b9218ecd1e8fd5fd83bc90c0ad18ff18db83d34f18a36f3cac31b71c9188026ea44429 SHA512 badd17281ba1906f3a9257590b4ddf21370d7a996e41d8be37e2bb14e25dd9490ffa915c2a4f84e25de9d9727d418bdce10ecf6ae4dc62947fa7078da61b4784
25 +DIST genpatches-5.4-57.extras.tar.xz 1768 BLAKE2B e3850182da8254aa5a13c9ea0208bdadc873ea7014892fd20abeb960e0f1a228d44d1cc8687c4be192c0064136a007507611439b66bdeb142133687da46f8b39 SHA512 87d6b85c69c52426ca93d117b0b68029a5ec11c7ad58f9a352b446c22c75147f33f92dcd0db4ba297053d1e701d62f3730a61f374b60fbfed172e376fec242ef
26 DIST genpatches-5.7-11.base.tar.xz 532736 BLAKE2B 9f5b5d8304c22cac1e081be759a6731c5902e2afc241c79dad2518083b9d56edb34f5ca2d9b39fea84cbe0e6569314e0db84eb69027830b997a6e318b6e27c13 SHA512 43bd55fef87afc5e97fc9d4d13705f6790eca5c1874fd266da2109ea0ac913e812e156cd231d67d3494f743f2263d33292770c4be9a8009e0c6f85704d77b21e
27 DIST genpatches-5.7-11.extras.tar.xz 1764 BLAKE2B 655bba046d32ee61d8b026f462e35c4e58536afbfdb37de32380a253fedceeac2da42a1366ecbe0b7e156f25319f67ad61a5eb51ba762fd8958068f1f1c0d0bf SHA512 b26c720473ffdef3ac40955692660ee4645a93e2cb86a76d1583d878c3832f3c8bdcbdc23bc6838c1d0255ec86a5671d4e205cb6e99dd5a1d64405fe0081a355
28 DIST genpatches-5.7-13.base.tar.xz 581360 BLAKE2B 16841cdedf5ac9fd897e6c3ea6f428a4bbde48dca1c5f6d432d1c63248d6cec9157d4f0680cf340cc08703715afb32db342aa837a978c29b1874917d13454dd6 SHA512 aa15be557a74258476d777575cbe98148bb99104f221206e5d1589dfee89ab7ed2637a4e6dd044f477e3c5b0388faf399dc7241951c37a1df405981927f9973c
29
30 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.56.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.56.ebuild
31 new file mode 100644
32 index 00000000000..6d4484f64a0
33 --- /dev/null
34 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.56.ebuild
35 @@ -0,0 +1,84 @@
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/~whissi/dist/genpatches/${GENPATCHES_P}.base.tar.xz
53 + https://dev.gentoo.org/~whissi/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 + x86? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
60 + -> kernel-i686.config.${CONFIG_VER}
61 + )"
62 +S=${WORKDIR}/${MY_P}
63 +
64 +LICENSE="GPL-2"
65 +KEYWORDS="~amd64 ~x86"
66 +IUSE="debug"
67 +
68 +RDEPEND="
69 + !sys-kernel/vanilla-kernel:${SLOT}
70 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
71 +BDEPEND="
72 + debug? ( dev-util/dwarves )"
73 +
74 +pkg_pretend() {
75 + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch"
76 + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case."
77 +
78 + kernel-install_pkg_pretend
79 +}
80 +
81 +src_prepare() {
82 + local PATCHES=(
83 + # meh, genpatches have no directory
84 + "${WORKDIR}"/*.patch
85 + )
86 + default
87 +
88 + # prepare the default config
89 + case ${ARCH} in
90 + amd64)
91 + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
92 + ;;
93 + x86)
94 + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
95 + ;;
96 + *)
97 + die "Unsupported arch ${ARCH}"
98 + ;;
99 + esac
100 +
101 + local config_tweaks=(
102 + # shove arch under the carpet!
103 + -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
104 + # we do support x32
105 + -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
106 + # disable signatures
107 + -e '/CONFIG_MODULE_SIG/d'
108 + -e '/CONFIG_SECURITY_LOCKDOWN/d'
109 + )
110 + use debug || config_tweaks+=(
111 + -e '/CONFIG_DEBUG_INFO/d'
112 + )
113 + [[ ${ARCH} == x86 ]] && config_tweaks+=(
114 + # fix autoenabling 64bit
115 + -e '2i\
116 +# CONFIG_64BIT is not set'
117 + )
118 + sed -i "${config_tweaks[@]}" .config || die
119 +}