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

[Michał Górny]

commit:     61e7213d33f0b963cb3302764bbcba8ad65d9ba2
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  3 16:29:41 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  4 05:40:42 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e7213d

sys-kernel/gentoo-kernel: Bump to 5.4.223

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.4.223.ebuild     | 100 +++++++++++++++++++++
 2 files changed, 102 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 6baee6bd1ede..10a5cc0833b6 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -14,6 +14,8 @@ DIST genpatches-5.4-225.base.tar.xz 5166864 BLAKE2B 
20ffa864c45b41e82079158fc464
 DIST genpatches-5.4-225.extras.tar.xz 1812 BLAKE2B 
9f10288c90b85f42bb95694c9fc215f680251d121cc371495b798081beb4cb6a6bea10a54e291a187cf4f194a9edf7ee479b461dc188b1187692784651f1042f
 SHA512 
0b9215d36bd6e04e0a7aae544997d10db03770a9e43b152c266b8ed099a12fd8b6da851d81a0b3885e5e4965bf5d9fa5cfa3a6fa3f1ea9642e6ca7b9abef124e
 DIST genpatches-5.4-226.base.tar.xz 5186832 BLAKE2B 
fb55ce4cae1d02a54869a3dd5e319d8e09d2b407adaf26f7b5bb0370f4f58e620af8e9d7eb7ec12cb4e5906a29de533eda7234687d689ddc29dcded1c146be3d
 SHA512 
e6aa0090c92cc6b3460c251544bdbf7d6c8c249e897fd04b5de0c34255ebfa8a0d29fbd7ff698656aaaec71978634b9685bf5b9052bef564587512a1def6e639
 DIST genpatches-5.4-226.extras.tar.xz 1812 BLAKE2B 
a477853adc62b2f1ee5d2093966c211638d4f0d3550de98990261db927a1946ee6a8163502f0a5b66b57d326521cdfe18ed1875bc126a63ce662e4442abaa9d1
 SHA512 
821a81cc51ecf898420e480860de4a7083fa2c6f1681e468f9058c7de403af07f72351395791facc34977dc05b6dedf4b2684fd29914bfe6802fd2fcac3465df
+DIST genpatches-5.4-228.base.tar.xz 5198204 BLAKE2B 
35942e1ffbfd792f2479ce2b97c7f191cf5fc5712ccf101ee1f5f7f0486d53da2307237fc2d50fe0353c82557df03fbdfbc669949616dfeda69970628ad98ee5
 SHA512 
333dd865d3f10083566ddf43ff4d159a6842c3ed92c703dbcebd0832b0fdbc53c0025856eb1608ac485c805702608e52c600e08922fb831536bc6a099f74f1d8
+DIST genpatches-5.4-228.extras.tar.xz 1812 BLAKE2B 
dc4f0815c8915ae371db4da0ecc1066a269547ba1a967a6067121de25c06445356b6f1339088d402e7f9ca5dbb91b49ab717dc3168760cb26ff3e279177e16e4
 SHA512 
7ab2f0466b677b3506c080bacae1217b54b35ccb45f65000757bfa09e3ca2834a3b78c4b03730f11c6948be3e3a04c1fe3bc562585248039185d94ba805adfe7
 DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 
72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa
 SHA512 
e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
 DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 
36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39
 SHA512 
b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
 DIST genpatches-6.0-6.base.tar.xz 307564 BLAKE2B 
14e3d451ae6f21219ed86f8fea2cd8c4888e8b8d23e43d6d855ccb3e07346348aa267e0e20e65c0cb782c3fbb0adc98e3e6728dc83d58bb8dbbed656b3273076
 SHA512 
1ed76b47ee510074787be882b999dc60c108e1411f4704c9104936f808b12bb97700883f2eed9e41d6da6a0cb5fd00cdd47f267cff1c34173bed49e1379a8786

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.223.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.223.ebuild
new file mode 100644
index 000000000000..5fa543cace37
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.223.ebuild
@@ -0,0 +1,100 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+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/projg2/gentoo-kernel-config/archive/${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 ~ppc ~ppc64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+       debug? ( dev-util/pahole )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+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
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .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[@]}"
+}