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 E81DE15A7D9 for ; Tue, 14 Mar 2023 14:38:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8C4BE07E1; Tue, 14 Mar 2023 14:38:41 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B72FE07C5 for ; Tue, 14 Mar 2023 14:38: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 A8BC7342FE9 for ; Tue, 14 Mar 2023 14:38:40 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 152AE88F for ; Tue, 14 Mar 2023 14:38:39 +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: <1678804713.3e1b2300c1fde42b8f92820cf2185abeef691be9.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.4.236.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3e1b2300c1fde42b8f92820cf2185abeef691be9 X-VCS-Branch: master Date: Tue, 14 Mar 2023 14:38:39 +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: 13b20e16-503c-4ee7-a43d-df88192c1355 X-Archives-Hash: 020aa995dfb1e4b1f42b52d6393e92f7 commit: 3e1b2300c1fde42b8f92820cf2185abeef691be9 Author: Michał Górny gentoo org> AuthorDate: Mon Mar 13 15:00:22 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Tue Mar 14 14:38:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1b2300 sys-kernel/gentoo-kernel: Bump to 5.4.236 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.4.236.ebuild | 103 +++++++++++++++++++++ 2 files changed, 105 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index 2ac9b9f5d9fe..eaf74d21a915 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -36,6 +36,8 @@ DIST genpatches-5.4-239.base.tar.xz 5520768 BLAKE2B 9023bb6baa304282c516ae3d8ecf DIST genpatches-5.4-239.extras.tar.xz 1812 BLAKE2B f16995331f57d04a5e92164dcb09eab416c56184d9df7546bac597f25614af08053823f3877dcb4ffd54253ad610e9a8c39818290ffde145c3839041ca79fa7e SHA512 c0f6e320892485d8806efc553bef45b9bda7f35bf357af562136d6f10d41c2dcac767595902f2084ddce9ebce9dcc1952e9e72833b79b396dbf398a66017898d DIST genpatches-5.4-241.base.tar.xz 5607360 BLAKE2B 2fe1ac8414a69000b32e9b9c9d1f067085648bb45d0e149c55a8e1faa68c0297dca4c077317d2644543cebc1ec93bb408b7b702de80aa5d70360e2bf80213ac2 SHA512 24e0c4188ba25c835a9fa7c18df12b0d34c74d090ebf60d23bf206cc0fd3a42e06e3e9868007c271813900379f6ba1b49eb85c2f86f9d4068f99d0c6eea6ff6a DIST genpatches-5.4-241.extras.tar.xz 1812 BLAKE2B cdac5d4fa8b7620b85608b6fe0870fc3dbcd3f9940e33fbac774b8319aa033472613df5daeac5c356efe1a898f51deaefb0d34cd7dc28eae0001fa04922cd207 SHA512 41d9c56caa35af7650ee7f8e28a64582b20aa5edece9cb6047a3047e3ed59f0e26ea296dd1f02d3e1faaa8a3ff6e36f1c150f0addcba868fc7b823e4b1ef5c8f +DIST genpatches-5.4-242.base.tar.xz 5610464 BLAKE2B 54d7c2e11a6b21ed8b16d26a56ffd392f35b82e1bd4548f65c40018ee6607eaea37d791734a31abb30ee061ac85089fbaede39f1ac35c2b0f48220f266d2db17 SHA512 cf7d24286d88319eb872f14c3907956c1ef9e0cba4d1a86e740e9eba3a450a2060c1f03d519ac49ad97e9afefb2a32fa7e77790387819c4d60d15039c425ef28 +DIST genpatches-5.4-242.extras.tar.xz 1812 BLAKE2B d2b8f6655e540964c1c6fd81a5e74bc2e7001bf86ec8a7e8293b2088ae24ce4bd41d0eb5097011a2c9669b9ff479bc828c2f8425924c920f35193d466b4dba58 SHA512 8d76a855216ef7dc89babce2d35a7b6b58b641105c117e246a01a779396fdcdb6cbcf7b599683ecbfeb53df09504244cca5569b08b15a4fbe6b81b10d51c8d86 DIST genpatches-6.1-14.base.tar.xz 774040 BLAKE2B 8e0866c762e2711b766cc75630d66c7c46221bdc47357a903c7e8506ad122b7b5ba84d102b19743d236ac5579b44d24f77b9f52f3c23695ab6a279cf7875e735 SHA512 6a753146013baf0b94d83abd690118517679d4d7dcf6e9f86cf8de35e24f80a792e9c0692f237098671c316d046d6f65f8d3512255e572daf6a8ca81853beca0 DIST genpatches-6.1-14.extras.tar.xz 3804 BLAKE2B 7f016579b130c9a4f7a8ec946254dbd682f22e5654ae777d11b265dafe2b177a4c40c5a979a760a5bd6ed3dac057b90a3120c60b958f6b748ea4731b9a5f1ea6 SHA512 2807d359459dd11b9d3356fcac609dbfb8487e8c924cc543ef37698667b1c8b74cff7b015839ca0677cf1f96b566e0b5018c057b517275886ab500cd2ca49653 DIST genpatches-6.1-15.base.tar.xz 803732 BLAKE2B 5f43fb07787e9e861b54b4977acff47c13870b24cba98296538651c656e332be2bd194b91a67d68858bb7ddf116e0e97179c5c039c64b75f4392829d091ee387 SHA512 482cb110c5d218a0b0dd4dd828862d9cfb5044b5c90f75218dd7bbf266dba1a11af11ecd913029904d6de1d572d2cbb247b5bbf1c4bb5711eb9fb03b327aaa81 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.236.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.236.ebuild new file mode 100644 index 000000000000..ca09c652dc92 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.236.ebuild @@ -0,0 +1,103 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 6 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +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.config + -> kernel-x86_64.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config + -> kernel-aarch64.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config + -> kernel-ppc64le.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config + -> kernel-i686.config.${CONFIG_VER} + ) +" +S=${WORKDIR}/${MY_P} + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT} +" +BDEPEND=" + debug? ( dev-util/pahole ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +src_prepare() { + local PATCHES=( + # meh, genpatches have no directory + "${WORKDIR}"/*.patch + ) + default + + # prepare the default config + case ${ARCH} in + amd64) + cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die + ;; + 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.config.${CONFIG_VER}" .config || die + ;; + x86) + cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die + ;; + *) + die "Unsupported arch ${ARCH}" + ;; + esac + + echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die + local merge_configs=( + "${T}"/version.config + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config + ) + use debug || merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config + ) + [[ ${ARCH} == x86 ]] && merge_configs+=( + "${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config + ) + + kernel-build_merge_configs "${merge_configs[@]}" +}