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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 12220158017 for ; Thu, 30 Sep 2021 16:45:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B3A1E088A; Thu, 30 Sep 2021 16:45:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 43A20E088A for ; Thu, 30 Sep 2021 16:45:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1F51D342C69 for ; Thu, 30 Sep 2021 16:45:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 82D6412A for ; Thu, 30 Sep 2021 16:45:49 +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: <1633020342.da48576222e34d7dfe9d0a4dabe385d38fee3fe4.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.150.ebuild X-VCS-Directories: sys-kernel/gentoo-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: da48576222e34d7dfe9d0a4dabe385d38fee3fe4 X-VCS-Branch: master Date: Thu, 30 Sep 2021 16:45:49 +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: a83b55e5-726d-48f6-af05-4a713d851e01 X-Archives-Hash: ddeb89e66734ca5c14beb249d971b750 commit: da48576222e34d7dfe9d0a4dabe385d38fee3fe4 Author: Michał Górny gentoo org> AuthorDate: Thu Sep 30 13:06:12 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Sep 30 16:45:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da485762 sys-kernel/gentoo-kernel: Bump to 5.4.150 Signed-off-by: Michał Górny gentoo.org> sys-kernel/gentoo-kernel/Manifest | 2 + .../gentoo-kernel/gentoo-kernel-5.4.150.ebuild | 97 ++++++++++++++++++++++ 2 files changed, 99 insertions(+) diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest index e1d17a20bd6..7ab8a49c6f2 100644 --- a/sys-kernel/gentoo-kernel/Manifest +++ b/sys-kernel/gentoo-kernel/Manifest @@ -16,6 +16,8 @@ DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B ddc01301f5c778230159b9ea8ba1 DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92 SHA512 cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7 DIST genpatches-5.4-153.base.tar.xz 3999576 BLAKE2B 0e6b62fd5d755890341ae3c491aad025bb830cbf0f925b1cf54e5bc6e721231452079b6341dd0dcfbe44e8e5d08dea8bd9d671bd901a95f13116625d4f230bd2 SHA512 ee8b2ea91c0531e38af6f982cbcb97e08fb69f7b51b13a69ee7d03289bdfc30c108bffbc21dd6d48510b91a8e66e974e207ae8f6e89b3ca9775b5348debf5650 DIST genpatches-5.4-153.extras.tar.xz 1784 BLAKE2B 567f135cb5eebc37964e7c5aa9193b03469e03c9be26618761635299e6f1cc9928ae6acbe4534a026be917fdf40afe52994f7228ac1f7ebd737e9c4274ede3ff SHA512 1f906399a3564fea70997c73d5189644e623c4b6ac92d8b3b5dadeb2afee495cabd7e11d5d5b0e14b0dda4db0c1fd0991d88f37d504b56fac69e39d636b6c682 +DIST genpatches-5.4-154.base.tar.xz 4018472 BLAKE2B dd471796a671f5eca01d5c77bbfcfc4ce408f77363feabca8537d2d2e01c9e6cf4f0d2efee9908ce300d6eef0da118320369219eb863207d71d481f22f479e4f SHA512 be437b90132c76e6fb8cea6c669b9808e081dd13732831a1ffd1b7e09850c88c63739e99ebd084aae39c59fa2c3d8a3e1ec821e851f9090db648830d31a2abcb +DIST genpatches-5.4-154.extras.tar.xz 1784 BLAKE2B a97a459428ffbedc0a8f4e8a4bc8c15b22bb74b00198843bd3558d2a21b770d0c8273f1c0d9efa31515eb2585052ae6500f93489b06e5a24ceca5396d5393ce0 SHA512 829a6b76f50c1c08ae46a1a102772b35ca04f37dc3908b34ba3c16d8034b3510d5eed95dcf61ba65773ef7506733669917cdc015913f2418f866df007d25c5e4 DIST gentoo-kernel-config-5.10.42.tar.gz 3992 BLAKE2B b04f585ccc823c25baafea011a5df9e4ed79f5537fb0c47726bb54d3f6197627b078a6f8510707a68edd9308f7ede84ca3f9bff78e64e06c9ea3d53db496c10f SHA512 5d42e1ac694441acb8ea13fa3e80615bd18f0932a37f50c3d34c8c2f95ef4dfa6541407ddcad802b4fb13468e0e85d8cd09ac37d3612260f9a81d081cb4b6713 DIST gentoo-kernel-config-5.13.4.tar.gz 4024 BLAKE2B 9b4e3205c356c791768b9de09057b55499519af5551165040c5ad50bd85b2886e34a9f8dfeea08c6a2113b903341c2bed897bc2615913cdfe3d13434d7be6f48 SHA512 55d9f2c72d164f81aede7ce5b2c703f8a426ad0a1a3323c0a304c9f07ed86aa06949ba2f42da115b977b810886a47a0126eda96ade853970a951c301eee5e12c DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.150.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.150.ebuild new file mode 100644 index 00000000000..1bf22439675 --- /dev/null +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.150.ebuild @@ -0,0 +1,97 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build + +MY_P=linux-${PV%.*} +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 )) +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +CONFIG_VER=5.4.21 +CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea +GENTOO_CONFIG_VER=5.4.114 + +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/v${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 ~ppc64 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/gentoo-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/pahole )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +pkg_pretend() { + ewarn "Starting with 5.4.52, Distribution Kernels are switching from Arch" + ewarn "Linux configs to Fedora. Please keep a backup kernel just in case." + + kernel-install_pkg_pretend +} + +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 + ;; + 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[@]}" +}