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 EC89F158095 for ; Sat, 30 Jul 2022 02:22:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE8DCE10B7; Sat, 30 Jul 2022 02:22:41 +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 959C5E10B6 for ; Sat, 30 Jul 2022 02:22:41 +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 1E05D340F25 for ; Sat, 30 Jul 2022 02:22:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 505C1560 for ; Sat, 30 Jul 2022 02:22:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1659147735.6352f5e16c232095ecd4852a2c1affd3d94068e6.sam@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.134.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6352f5e16c232095ecd4852a2c1affd3d94068e6 X-VCS-Branch: master Date: Sat, 30 Jul 2022 02:22:37 +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: 93396e8c-1c56-4487-b816-2cc895f65f4a X-Archives-Hash: 9f0093cc58b3a25d146b761d7fc87541 commit: 6352f5e16c232095ecd4852a2c1affd3d94068e6 Author: Sam James gentoo org> AuthorDate: Fri Jul 29 21:06:10 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Jul 30 02:22:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6352f5e1 sys-kernel/gentoo-kernel: Bump to 5.10.134 Signed-off-by: Sam James gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.10.134.ebuild | 131 +++++++++++++++++++++ 2 files changed, 133 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index a7888753796d..53cfcffea19b 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -10,6 +10,8 @@ DIST genpatches-5.10-141.base.tar.xz 3795548 BLAKE2B 42dcff42a0c56c0a16028e289c1 DIST genpatches-5.10-141.extras.tar.xz 3868 BLAKE2B 2f2dc5299a10634e3c011457d1c40c70a8e6ffd64b38e4567193b5be25f66a8687b2fd850192adca24b938b003fe0569c8519eb6e36b557f58b775bf542d311b SHA512 a93b152ecf75984ecf0d0b56e73c19aa11df09a4b27042255c6ce771dabecffc2e3504e394478be6738cd70912f626120bde430af65acd77f17464d2e0b8fb6a DIST genpatches-5.10-142.base.tar.xz 3863448 BLAKE2B de45611ba9c92f59829a61b84ad0461535ca68fc5efa2418417bd1fe7e1ac643e2b65e0b467414eea90fd034445219c13782b1c99136367247420502289f7523 SHA512 63b835f0006f0e2ec97432cab93f21f47a7a36098f5699305d6ca2d01d2419fe6ac6588e68210d1332b4e1dad8a6fc74ad95034c8be1524601e4c30b447a3634 DIST genpatches-5.10-142.extras.tar.xz 3868 BLAKE2B fdff4c1e3ac6b09322168d92469bc5220dded731e05250100df2b5a94d90b2c5bd7612e6c32574ae1c67cd59e6f73d348b3f56bb9027ed1ba11427975796f1e4 SHA512 227bba85de2bf1eba0b0c3d4f314ca0f2f5c3c475ba78e5a82fbb3a682fd37bcef80ef1a91f1ee3747bd2a8c639d2f791110ac72c5406243dd2f54c87d846dd4 +DIST genpatches-5.10-143.base.tar.xz 3888492 BLAKE2B 981a8e21ffff29acfb070164fef85e6beaf41e36a6e9b139a7bbc2027750321286d7e1a6cc51604841352bd65fcc363a80edbb6455c9d8ae83be560603350f95 SHA512 6556642c9d99f0e8160c4e50f99dff42982346ba132abe77bdb83c1fcaf9435fd2573fa56380ce140efff7773ee5ef1cf9475360e6d5703caf4c38b14c135ec0 +DIST genpatches-5.10-143.extras.tar.xz 3868 BLAKE2B 8bcfec127807585e1145930a119e5f8b6f4f481370c4243dfa0b3f5aac36f5b19ce566b458718128224ae63ed3ac8d232a60a917e80890a13a9b48325bd7253f SHA512 ad4f8a858caf876456536ddb7f6998f7d11c81047efa23cf3289fa93b6b9067fbdaa9329cf7b3e3089c0c07b9adabeca49ffa7a1a7eea7d9f5c0a306996d1fb1 DIST genpatches-5.15-56.base.tar.xz 2245780 BLAKE2B 0f5e5d7c8a29f590598f4721307e3b1a316342cc31b8e5ab5496ed58b65470d19bed59ff40cf7b26bd4970eee04581ee8ac544eebe63c54063c161a55c828cea SHA512 0a1c4edd8f863f2c77a14cf48d79c35868ba8b2f02fb2436e1913e97c8285046ecbedc33e6faddf02a0c813e677492be0fc972e3731c733e488006602eb6119f DIST genpatches-5.15-56.extras.tar.xz 3932 BLAKE2B 2b167a35d9dfe16a18b22318ac4597147fb25bef53a66108c2f2e4d6e6d3df1c9d4b1fd6d63ba4a8078f94f8cd69d14b359123355ba266ef72b44f7d9addca9b SHA512 ce91556981720f3718921993eb15f5af623cad8dc40a36bec6cbb0d52153fd1288bf97927daab1b1e3ccd1451d4295b109ead0160c657a00c62c2d6f25fbc09f DIST genpatches-5.15-57.base.tar.xz 2275504 BLAKE2B 23dad9d2e9dfc1f77f6e39f8d9e68a6e3168d581136d50d53b3503278bb5e4abfc25e2f9fdab63eeed674e370bee8ae7cc5c54058f6942abaa4eeac49258d765 SHA512 b675437c320b28f4b4ee979fff5c32ea607fd795b090206b49d66fdb95fc2ca1b959fffd33b9e5241a160c2f19902efc8218f2c39eaaa312a5b4149282e08b99 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134.ebuild new file mode 100644 index 000000000000..161f70398d65 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.134.ebuild @@ -0,0 +1,131 @@ +# Copyright 2020-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +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/mgorny/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[@]}" +}