[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/

[Michał Górny]

commit:     1bfa32c4d8ee5946c48a492eeecf96f323f5db4d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Sep  3 13:07:35 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Sep  3 15:41:04 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bfa32c4

sys-kernel/gentoo-kernel: Bump to 5.4.144

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |  2 +
 .../gentoo-kernel/gentoo-kernel-5.4.144.ebuild     | 97 ++++++++++++++++++++++
 2 files changed, 99 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index d78110e8fa3..5f014bebbf6 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.4-146.base.tar.xz 3857908 BLAKE2B 
fe3119842aeb3f1f8ba9af26d4db
 DIST genpatches-5.4-146.extras.tar.xz 1784 BLAKE2B 
e3b75e9f8f29bcf441dececc62a46cd5db846859bb9fb01462846333dfb42f35c559b5b6533035b891062de619dac678b9467fd0432423bcd8505385c0beae47
 SHA512 
0923ebf0da182eef762653b282fad6d50862c3d520ee1888bf8fb2257b96bb4cb06a3e88ec0b6a8587f17c97f9660ffbaf4695eb0d0d0f46fb59861b49949e35
 DIST genpatches-5.4-147.base.tar.xz 3875304 BLAKE2B 
98cc4815b004967ef7a00b2b8af96cf002c09b22d54222e0f932e1ef83731846011bb3c4b8f972c85aeb086b0bcd6a0ce0f2ed390dd5f0225b137b33bb2255bf
 SHA512 
999f5e9a99cf8dea0c8da91b0e365703064620b04bcc48909d89af73f551a0da3785201b4a4fd0edfd184872f81109dbb78ca57d95d1c2759a1cac111fe1066d
 DIST genpatches-5.4-147.extras.tar.xz 1788 BLAKE2B 
a0e7283baba01090e1c0125b4333787ad406dc311c0f6fc9fc3eb6c4b288efb7742fe5968a2f1a0f6fbef9286df7947c1d64f78c8f3c727d82ff95bdfc749977
 SHA512 
75afcb75617b32172f5766592d86cd08f0c17ba35de18ec83edbefec66d04e8acb6660a59dea5016479db19488339bdd47ddc5182bf2fb5c61587ccbb4063681
+DIST genpatches-5.4-148.base.tar.xz 3887780 BLAKE2B 
127c72912bf3db08c86bdce400ee1b57a06055fa114f2f3c358f555fa077c230a4e6e5039961b4e1aa4f9e7de97d7e3084c5d625d423915809adb14d0b366a6e
 SHA512 
dfee1a5233734888268036452d980f5dd57e801297acbcc847f969a1185a0c4a83a1be97f33f1988bfb9a48f702b0c4078e930812594b8a995d5c7e3fd737e68
+DIST genpatches-5.4-148.extras.tar.xz 1788 BLAKE2B 
3569f9649b403a8dabae9cb4721c17dda84061c7d03aa72714b976968a8d18fe451945fa41939be5de301446e640f957b229f79d8fbc20c899d498abffa72a54
 SHA512 
a7a082bff05441624cba87d4398e98713953d06365d7ea1c1ae0977fd4e70cfe565bfed4ed2387c7552dd58b5ef05ebf9f12051930e2126e6e007ac06bbf8e9f
 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B 
b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f
 SHA512 
5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713
 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 
9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48
 SHA512 
55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c
 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B 
e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203
 SHA512 
225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.144.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.144.ebuild
new file mode 100644
index 00000000000..1bf22439675
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.144.ebuild
@@ -0,0 +1,97 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       
https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       amd64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+                       -> kernel-x86_64.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+                       -> kernel-aarch64.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+                       -> kernel-ppc64le.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+                       -> kernel-i686.config.${CONFIG_VER}
+       )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}"
+BDEPEND="
+       debug? ( dev-util/pahole )"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+
+pkg_pretend() {
+       ewarn "Starting with 5.4.52, Distribution Kernels are switching from 
Arch"
+       ewarn "Linux configs to Fedora.  Please keep a backup kernel just in 
case."
+
+       kernel-install_pkg_pretend
+}
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               arm64)
+                       cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               ppc64)
+                       cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
+       local merge_configs=(
+               "${T}"/version.config
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+       )
+       use debug || merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+       )
+       [[ ${ARCH} == x86 ]] && merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+       )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}