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 75CBC158094 for ; Wed, 28 Sep 2022 14:29:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 73EA1E087A; Wed, 28 Sep 2022 14:29:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 3F31FE085B for ; Wed, 28 Sep 2022 14:29:27 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FA5C34120F for ; Wed, 28 Sep 2022 14:29:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6CF85F1 for ; Wed, 28 Sep 2022 14:29:24 +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: <1664375350.c075172434dd8254f8c75e8b2cbad2f7280261ca.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.146.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c075172434dd8254f8c75e8b2cbad2f7280261ca X-VCS-Branch: master Date: Wed, 28 Sep 2022 14:29:24 +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: addbc27f-7941-43fe-b841-3e52bee95a9b X-Archives-Hash: 9d7928d51aec6e9e7de17065ce9832c4 commit: c075172434dd8254f8c75e8b2cbad2f7280261ca Author: Michał Górny gentoo org> AuthorDate: Wed Sep 28 10:14:09 2022 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Sep 28 14:29:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0751724 sys-kernel/gentoo-kernel: Bump to 5.10.146 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.146.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index c36dee9d1082..b1558fd0e97c 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -4,6 +4,8 @@ DIST genpatches-5.10-153.base.tar.xz 4142480 BLAKE2B 18d28cae57ea98f1ce9faf8e88a DIST genpatches-5.10-153.extras.tar.xz 3868 BLAKE2B 4baa8ba350a6b0f02715d65646b00f24142e6c6be6a2270204b4e98ffbb3900b1a47bdfe741266013859b9119719c7b979e0035eb1bbfb154b39318727f56ca0 SHA512 b367c4dd3a3217d3d39a7e2f8850ed21fae2afaf508939b2da897f597f10b36a1a4375af20f07e305be0bbee89ae8787af3cc842562239af5c45430f2872cab9 DIST genpatches-5.10-154.base.tar.xz 4154484 BLAKE2B f9db695e8f2e3feebc7a6d0ceb0971dce9fa35e440f6bfe73dff91de00d1ff8dd4687e36b04a2a3b95b12765c2b2fb93df59aad5fffd77702e2e4d2a64e6aed3 SHA512 fb138a235ccfd4bcce0912fd2dcb40a659f7dd6267725963ed839bbcb176a5721a065a0027a9366a26694472d45484b6c02b683f9a1bdf69caa980070f2b6a0e DIST genpatches-5.10-154.extras.tar.xz 3872 BLAKE2B fe27fd30c6ff3684f01b7ab7a2287bc3f9e0918c254b90233d3a210454daa6022eedca3823623e9d45b303b0e1f1bd3240ce75554c18dd795c82631b453c998d SHA512 97b117f143ea38226d8129fb0c508de24e06a479f0119347dc83a04b9632afac289b66102b92be84236062d2ea0f5b6b75a3f04f8bcbd3e44d98f39467882101 +DIST genpatches-5.10-155.base.tar.xz 4187452 BLAKE2B bfa7612befc96a338e411ae20536bed348b95c6a51d067dee15ed64d0dfdc4e5700d26473720923f1a6393fbab29b5731014d29ae5a98bcd3c0a0a6125a24b73 SHA512 6a01cbe8def4e387778d5abd5eefabd556ac1ca283c0cb9bcea7fb1bf2c2812996fae5416c2e88f7b55934686fac52d777af3fdf0ac6dbc8ae3c280934c664f2 +DIST genpatches-5.10-155.extras.tar.xz 3868 BLAKE2B 744b3272427213e9aeb1a10abc768b911587729101cb21b8b2be231e1b683cd22aae95ef9af9d09ecf585cf0422f242d3b49f81072cda336f719504fe2755a8a SHA512 092db0ae428c0b3ff7727d34c577ab0e928ef2632879b33057f037427836f7a4095de510cfc8b5ad87ef54d90d81518a2edf1e7ada439ce28f02645fea105427 DIST genpatches-5.15-72.base.tar.xz 2987972 BLAKE2B be108e6921f5a04605ab7c557e1ed50ce092a85eb36e6d60b4edc630457437eb89736dd992fb823522f3ca9c3ca530f3e437ad8f8b38a130bb56bc887070e1a5 SHA512 fdb5806584961dde27c7760ff4c20f6c7d08682bb998522a577dfa52a8fa021cea991c46db5efd1ab76e060e73bc38fb5728d0fae2c65f0846828c57779d6b39 DIST genpatches-5.15-72.extras.tar.xz 3932 BLAKE2B 00c700eb5307d1834977c88e134fc2bea16f258d6eb374e6cb6d85c522cbf1730d6e2e937e7abb392350de8aa3cff6811f5ac0d3b93822fbd9a43c20abb525c2 SHA512 a08ba388711c30d3c101ebbdfb671c63f85ce3d07ba4545c3b01b70687d65f31fd9a1afadecdc49f0d9b113c5596df878acebd425b868ffd9111a555d4ced47d DIST genpatches-5.15-73.base.tar.xz 2997804 BLAKE2B 8915a7983e7766c43e7e4fb91f38ba690e60df58fb8c7d6b5f833b21df459bf5949c35e510275c793f6987e70923cdfebde739f498ca16f772920e262f391172 SHA512 3859fc75041d4c7593104e158ecf833fb0ff07aedec5143623132114308d9c877a9f2a405d83cf442f0048c046c3fa3700f51ab836de448ecf2c7b4064630c61 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.146.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.146.ebuild new file mode 100644 index 000000000000..4824ab95a1fb --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.146.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 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=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-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[@]}" +}