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 EB4FE15800A for ; Sun, 27 Aug 2023 02:55:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B65E02BC209; Sun, 27 Aug 2023 02:55:04 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4A1152BC209 for ; Sun, 27 Aug 2023 02:55:04 +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 166C7335C06 for ; Sun, 27 Aug 2023 02:55:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43AA710B0 for ; Sun, 27 Aug 2023 02:55:01 +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: <1693104895.9ddebca49b90a0a4d1acd272b58a1cacc60190e2.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.15.128.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 9ddebca49b90a0a4d1acd272b58a1cacc60190e2 X-VCS-Branch: master Date: Sun, 27 Aug 2023 02:55:01 +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: b32025a4-26e5-4b7e-909f-564935b02052 X-Archives-Hash: 485449276f1f0c06ad84ee08ef564574 commit: 9ddebca49b90a0a4d1acd272b58a1cacc60190e2 Author: Michał Górny gentoo org> AuthorDate: Sat Aug 26 17:17:45 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 27 02:54:55 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ddebca4 sys-kernel/gentoo-kernel: Bump to 5.15.128 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.15.128.ebuild | 141 +++++++++++++++++++++ 2 files changed, 143 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index a0ca201c8a2b..a1cbbdefe0a6 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -2,6 +2,8 @@ DIST genpatches-5.10-201.base.tar.xz 5812032 BLAKE2B 17e4a8b463e258f0548e3ccea5c DIST genpatches-5.10-201.extras.tar.xz 3868 BLAKE2B e2420ee9cfb3e2a928ca1cc5a87bb832f436c3fedb0f4f001975a48a058c69cedcd58f97e5c76758ab737681ced55fc214a537fdab9400b839673bdba6c697c4 SHA512 c719a63005ea809d9bdc5d4b01f1400db0419a28bd629843f2d339a6f08684b4876fdc0eaa09133b7853ed80201517439e04580618ceabb40484e952efe796a3 DIST genpatches-5.15-133.base.tar.xz 5249652 BLAKE2B 309acc807e07bfcbb34e0ae87618d6dbb76e6481699fc017f449e61a2518e96e1abaf43ffe32bb9f76786fbe8bad5607407be4a40dd8d26be484943d5b4afee1 SHA512 f0c689a808a7724cb4f30d697c22a0a089df3e0f837440b22b6c32672355b79898c8097810fa1e420e0f8c364f5a33b6c373db58b7c8caac8b67be763a820cea DIST genpatches-5.15-133.extras.tar.xz 3932 BLAKE2B b99e279af41ad1d19a58e8f9b1bbf392c805a46c371d7a022a65c0090b5824c6ce26280525a0c21feda2a5a5cfffcafc690a2194d29af6a44e10a9d4c923db8b SHA512 7cd772a6feed01543305417ff03b834bb002821ccf254e7f5481623a7f16b0b54da5fc72c21f4ae3481308eaab08fcca8fc5103ffbed58dc4355cfb661f04f8e +DIST genpatches-5.15-134.base.tar.xz 5282056 BLAKE2B f973657ec1cafc1e6cfa44b3fb2d8d07b33dedf7118811ff44afcd369991864667635aaaffd9d4abc9cfde5308bc32dcbf44097c1989511a9cd4ae4bd4392190 SHA512 e6d2fba989cc1d67a0d77526b9498f9d1214b2b3fa2210b17c58d7a4d47630a7d1ef1788d255082acd17e475997c12a007d8411ae5478f2cb2a34c7d4e2ffc60 +DIST genpatches-5.15-134.extras.tar.xz 3932 BLAKE2B e6d0b37360f85c3672cb4f56fcca5f649b3a5f9f81e64c7fca1b1e4691f2de4258fda7a262b44fa4a7b37e6af93d8f6869ad6b3b03d5184df25ed5aab24f2655 SHA512 677b4a0448bb8c618127c3fcd34ea752b788deb26f3e3a843847baf9c3396a3fbf10a8cfe105c825877e02e5fb13e81e6bef0c697180a5ade644b61e7d60e24d DIST genpatches-5.4-261.base.tar.xz 6100368 BLAKE2B 1333f1a5aae4faabe031192eee4e491ab80c1e6291e542a99cf308295ed2301c93d74cd41e34fa10e1110710d26edcb9b4b132ee635cde5711b6474557601866 SHA512 4083c69df7ce9aa2e57eb69be4132689d10c95155c7608d6fc52f661abc1f0f9077f546016b3df32b8252777fff78af347af7022d18203aa8416ed83b68ef88b DIST genpatches-5.4-261.extras.tar.xz 1812 BLAKE2B fcc06d16147422b0ea123b116644539b3527e44bca78d46cf5795d44e42575c7017ec3b5c9dd566c5523e3b23f14b4d817846502d4ef353180c3a3c79caa4c2b SHA512 5cc879a4333aa3e162a5da4bf118a12ae5694c2fb98f11f9e1eee57f91b707974d735c290790942a14b2df5bdf092f58d1cf03f7058aea6f8e588700ec185dbf DIST genpatches-6.1-52.base.tar.xz 3173368 BLAKE2B 429b5bc3af457d91b9c178737e573d150e337859c0f07a25043c86b834829e749b92c57fa2d80b2acfe9864f916ebe77c830249be23391d6553f5469b1934708 SHA512 0f003893b6c24fa9bb79722d6d83edb25e77fff11a526f86052980ee175d6dd599784cfcc7ad82055de9663a178fb9de38a766cfe61fe17fbde696a5292f023f diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.128.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.128.ebuild new file mode 100644 index 000000000000..ad2d0803bd9c --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.128.ebuild @@ -0,0 +1,141 @@ +# 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##*.} + 6 )) +CONFIG_VER=5.15.19 +CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01 +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/~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 ~sparc ~x86" +IUSE="debug hardened" +REQUIRED_USE=" + arm? ( savedconfig ) + hppa? ( savedconfig ) + sparc? ( 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 + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg +" + +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 + ;; + sparc) + return + ;; + 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[@]}" +}