commit:     c3e0bce5ff7e7f58f813af42976dda34ff39fca1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 21 17:52:05 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 05:08:04 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3e0bce5

sys-kernel/gentoo-kernel: Bump to 5.10.185

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

 sys-kernel/gentoo-kernel/Manifest                  |   2 +
 .../gentoo-kernel/gentoo-kernel-5.10.185.ebuild    | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index 58d281823ecb..c00592d228b7 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,6 +6,8 @@ DIST genpatches-5.10-193.base.tar.xz 5429232 BLAKE2B 
c8ab1eec55b3e282af48601c93a
 DIST genpatches-5.10-193.extras.tar.xz 3868 BLAKE2B 
5261a2132d49eb98e7e292f577eed23ba8da86f3b05b57a75d15543dd1ec0c424f4dba04a39aea6b12e320792a9f0802be6d7876bc64a1f864abed03fc8e0c36
 SHA512 
5383cad41ca1a0fb2933de4fc07207562ff572231f17398ab9958012b3f27d382b2043fbc9fbd784ec1d5f666f0baaf27e75d0a31473c56779f4cb1a32d89707
 DIST genpatches-5.10-194.base.tar.xz 5453496 BLAKE2B 
839e14bae65711a5ef31e8e5f32a619f4bb04e0adb88010ed12023737a1729a11e7860f4043a980b8f8f2d4f71725f045d4bbf5a6013138349fe1eab389e8ee4
 SHA512 
25d2033b9a17f6bbc6ca2342d53fc56f086d75c2b5f4917c8803f393eb7924f0c3da349d5415e91f3290d6206bf5ae0884b3e66c99b0717357c6fc0e8b8a77aa
 DIST genpatches-5.10-194.extras.tar.xz 3868 BLAKE2B 
24b257569d83f8e91dc9159d83b0f2b0b118019e600c3e92ae2625bafcbbd2c466d20f5a4bf5627c3d6f1006b2539bfb175103028956f77088cac7974fd79454
 SHA512 
aca296b91622ed0fca07774d58a6c32c4231e4445d7a1d91e90da773ef0d9d3c5355a2538df4081d062b153c11f6a5c931ed20833cc3f699f114c52e3213e886
+DIST genpatches-5.10-195.base.tar.xz 5537632 BLAKE2B 
9ce6e702d0d172dbf8160f2fb5de2cbe0c4213a7791eb54f8d99dc2c35c147915b2fbca6d340de39fc6f547d412bad09c7dda6fff04a31f352723f42654124cb
 SHA512 
198c3673681f08c52ad668b2b5551a3090c9257fc682dd3cbed7ad96c0859ff2c060c94e996f6d1b5fd2f8edce10c5da7a46e37811086dd13ba41168d00a3913
+DIST genpatches-5.10-195.extras.tar.xz 3868 BLAKE2B 
439dd9915aef7b40da7319d5dfb8df39662948c5d2d8e5fa4f6488e01fb1cfe4257bf1e29f1c096544f0e5357ce37dd18ec4181fbe4fba02072bf1dc2c2f6fe6
 SHA512 
9bb0a81c65ce41ac316023480eb309a92881b4185f047be0cc462299e3d38252a6f79d25967b41098f83cf888381f0e3376295623333cee5bcf27e093c2c9a4d
 DIST genpatches-5.15-120.base.tar.xz 4681108 BLAKE2B 
7e69c38991ab3b5ec949f48fff8564c854017b8bafac61747eede20f79d71dade59effaee29fe849b1fdbee7abcaeeeef3f55a39b95b96bda6a70af05a905a68
 SHA512 
2be319896281e7cab1646da40a3067c3815270ff5fb29edccda9138862a39ace2192a1cd38a4232bc14ebed0d6c0c877a9fd58f225d7cedca743664e2a993025
 DIST genpatches-5.15-120.extras.tar.xz 3932 BLAKE2B 
fb00b97c8b61234646388bec0dd23a1310a7bdca9d04a2048a32a4e30605662c7001188bc125170aeca2ded63954a71b612908286aeab06928dec00cedc76902
 SHA512 
c2b6ee91b3505dae7fe78a393001cdf6ac7d0020f8123f14d961b90d1424144996e182fcb5304d5890c041e2d940a960bac0795ebc22e85459285b16f67d9b3f
 DIST genpatches-5.15-121.base.tar.xz 4695588 BLAKE2B 
2bbc7102194c0526cdc1f2e310871756ab87e5edf35273c41a2a8c26abfa56149361a2a8af68e215e14912bf2238c7610f60f69f88916404781488352fbdd95c
 SHA512 
822e207359ef8ce3894152de6aacf66974d8b8bcbc5329dbcbda379cb6dc81d348ad9a38022abd05131c1a4df955426da25bf37b83ac06ccead4aa1277b2eb36

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.185.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.185.ebuild
new file mode 100644
index 000000000000..60cb6b3234c4
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.185.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 10 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~alicef/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-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+       debug? ( dev-util/pahole )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+       usr/src/linux-.*/scripts/gcc-plugins/.*.so
+       usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               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-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-gentoo-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+
+       # this covers ppc64 and aarch64_be only for now
+       if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+               merge_configs+=( "${dist_conf_path}/big-endian.config" )
+       fi
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to