From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D859615800F for ; Wed, 22 Feb 2023 20:12:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D7FC2E0825; Wed, 22 Feb 2023 20:12:52 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AD6F5E0825 for ; Wed, 22 Feb 2023 20:12:52 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D37203409A4 for ; Wed, 22 Feb 2023 20:12:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 531F68C2 for ; Wed, 22 Feb 2023 20:12:48 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1677096757.536f0ddb00021c30ccd2b05172b175b9487986f2.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/gentoo-kernel/Manifest sys-kernel/gentoo-kernel/gentoo-kernel-5.10.169.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 536f0ddb00021c30ccd2b05172b175b9487986f2 X-VCS-Branch: master Date: Wed, 22 Feb 2023 20:12:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e7014b32-f4e0-4eb6-a2c9-1ee12fa1c931 X-Archives-Hash: 2996da84019bf8a18858609b0f6c44cd commit: 536f0ddb00021c30ccd2b05172b175b9487986f2 Author: Michał Górny gentoo org> AuthorDate: Wed Feb 22 16:28:02 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Feb 22 20:12:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=536f0ddb sys-kernel/gentoo-kernel: Bump to 5.10.169 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.169.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 20cca8fd5493..5ff17248c7cd 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -2,6 +2,8 @@ DIST genpatches-5.10-176.base.tar.xz 4910744 BLAKE2B 119dfaaa5a2212f088f767e3600 DIST genpatches-5.10-176.extras.tar.xz 3868 BLAKE2B a0a3808562dba6540d632b25e3a417f9a2514dddb13cda9692002b253a4d033bb58ffa4d606fd57764024f21a0907a94d93c2130deb9bbe92a60f310179e761c SHA512 847fd0c0ce8bf3aaee9c6aacb527d8590439f44f5e1e19ffda883b5ea7d8bbc502cbe5e126fc181eaad9dfbced8ca664e459b70085bdc6d51e7f001bf4901f2a DIST genpatches-5.10-177.base.tar.xz 4940872 BLAKE2B b2a81aebd81bff1144ecb1732345cdef2a91abc5bff2aade07770cf11cbb5475c58ce2e4c2dc00a5b292948cbe9316d4812dcb534da90bf9361f18136bd67194 SHA512 b6c25015719ad70a3322d65a5f796ff075a38db7225d90b5bd18af22348e46adb547a374c0ab8fb6790f30d211570dc6742aa7abf0b24987fa4e6fc49b2a7c3d DIST genpatches-5.10-177.extras.tar.xz 3868 BLAKE2B bffc5ec0895066aa1e497ebf412a298f1dedd4ac86758f72c364fc7e56508aee3928725646742a66bb3979b8ed33afa7539e3ffa9c0f350c0f81139f69671287 SHA512 2c0b9273c933764c5c2fcbf6176b3fea06777aca18d823055cd69740519e1a37027a058238a0a9c15b39f1b29417fbdfd771fb7247663097fa717889b5492641 +DIST genpatches-5.10-178.base.tar.xz 4951584 BLAKE2B 179abbcf89b3ddf39dd4df8656851cc180409aee9684505b47fcb950709d182a370db484a650f70a48dc51a2841b98244e3a98a06dcd5dedc8c6a976aa3e6939 SHA512 c6f6f60ce523e83be2f7ebdb216ef78ed9e27d5eb71e2e0709c2e346a3826624fa9aae1aef4d162e391783032cd7d06ee9761c7c42546de4c1e65b618fb3ff5b +DIST genpatches-5.10-178.extras.tar.xz 3868 BLAKE2B cb6e6ac11355b5a8ae19a464494a7e418edf5d475b793114a0f23f3e4b173dd906f13df77474a9223a0cd3359c2647a736939fd2f98744a1edc42c870ee14b59 SHA512 24665f3effa01f08f4cff8e84ada35a019b09d4173e29f1413674635b14b25d78cf2177fe3f99ad6bfb657c56970b010a3cb21e3defc3b03aecb9efe3218eb96 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622 DIST genpatches-5.15-99.base.tar.xz 4024008 BLAKE2B 82205380a55439dbe6f8605d09078d7a349ec60180204ced6c9902f340077c800cf515f3f513c69110eab37a8daa386a82ec4ba9e84dd02299ccc45379cdc659 SHA512 72033d94d3d509ecefb5a54e82906408802118cd985f617ccf7465e23d19363668159998dadb950bef58af11bab448110e6c753eb6eb7dd107feacbda4d67f3d diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.169.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.169.ebuild new file mode 100644 index 000000000000..8117858f61f9 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.169.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##*.} + 9 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +GENTOO_CONFIG_VER=g6 + +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[@]}" +}