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 A947313835A for ; Wed, 21 Apr 2021 17:35:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2B85E085B; Wed, 21 Apr 2021 17:35:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B4248E084A for ; Wed, 21 Apr 2021 17:35:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D061340C57 for ; Wed, 21 Apr 2021 17:35:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2B5DE4A5 for ; Wed, 21 Apr 2021 17:35:47 +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: <1619026533.c74bad21b3d7cc7c1fdd959ea14e8c4230360c5a.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-5.4.114.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: c74bad21b3d7cc7c1fdd959ea14e8c4230360c5a X-VCS-Branch: master Date: Wed, 21 Apr 2021 17:35:47 +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: 4e90d2c4-9fdf-4534-82e6-0cd7e2722391 X-Archives-Hash: 1b622cbf7f444b37872bac7c23dea3de commit: c74bad21b3d7cc7c1fdd959ea14e8c4230360c5a Author: Michał Górny gentoo org> AuthorDate: Wed Apr 21 12:55:28 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Apr 21 17:35:33 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74bad21 sys-kernel/vanilla-kernel: Bump to 5.4.114 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 3 + .../vanilla-kernel/vanilla-kernel-5.4.114.ebuild | 108 +++++++++++++++++++++ 2 files changed, 111 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index d6828268122..95dc921c1ee 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -1,4 +1,5 @@ DIST gentoo-kernel-config-5.10.18.tar.gz 1219 BLAKE2B 55ec8c66a9b090e590e23574b54edde0fefb575f25e6848b1c84834847304e30e52fc0810b8fd219cfb23c097bb8f7444e0b010bde44209f0c4811f99db7e0aa SHA512 ee137c85e94fe5989646cb19a72aca62ddd4795813f7bbf15d66262b0e72d90d84d5d17a31bae7980c061e0576e3f3254dca53ba6e547cf12cb7ab08771e3900 +DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c DIST gentoo-kernel-config-5.4.89.tar.gz 1240 BLAKE2B 50bd2e64eb1a62d2f0d67e02b78da56cb507fd7a5993d663b880c94ecd535898285ed01e00d5d07fc1ba0d044657e776456736d8fdcacecf7ca464979a8a1d06 SHA512 ad31f9895b9dd45edd7f8715516edfc303c23600f243f3ca122c7c554c9fdbe3c3aa62970a24ef7291d7937e04c63c0258f6348e796686902a011c055c1bed01 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52 DIST kernel-aarch64-fedora.config.5.11.11 225875 BLAKE2B 132f9ef1393edf843a7a5026da736975a465084e550b354e09a13c598fed6942c9eef7f46c2f04dd40861ed227b533041c5efb6f6fde442bdbad718aa563ef0c SHA512 9def40a4df1d20497050c2badedb8b8828d67793b465855405fcebdd04d624b6c3314347c93db07acbff0262a41e68290365d2865945138468cf5ba4419594db @@ -34,3 +35,5 @@ DIST linux-5.4.112.tar.sign 991 BLAKE2B 7f06eb8b2acf5b0529e60d7d6a09a6337c703784 DIST linux-5.4.112.tar.xz 109098024 BLAKE2B c8a50b84ba2fea5b1efa6643634042ac60d19b4acb2996e914df99bbddb91a90e772cf8c7a3e38963f1ac2547363c7b203dd1b0ede1571f9e4e685d7e79d419b SHA512 364550a20f91caca3b6f754fba00aee940b20305e9e880899633cef26a5f4ac3641b8817f4ccb615ab084551f4616654bee70558354bb66c924d1e989c8b5db4 DIST linux-5.4.113.tar.sign 991 BLAKE2B 3f3d392ecbf345e37aab2be2acabcf1cf39570ffbafaa5e8d9bc48c02402e834ce847817ec88dd7187799b576837d3d47e4942199e2e0077eb5a294c7f74d3b1 SHA512 a7b78f71bb0d226b13544e6401432842dc6777e3da13501668d50336bcc980b4fa71f3c9e2f324f5c1e128cd6f61210f5096529f1baaf4081f9686f4568dd6f2 DIST linux-5.4.113.tar.xz 109091724 BLAKE2B df24da5ec14c0df95c4f350c2bf64ad2bfe66a3ad7a37774b433c847d18efd8029e9054bd1ec969af69d48b1a4bd44d40bb06d3038ff99c423bcc913915b9451 SHA512 a21308478ad83350aa48f316fa94015c56fe79beaca82324c13129812aef12ae1123edd67281b68669e08a827c6923f8cea5598063b31c73a0c901628161d2cd +DIST linux-5.4.114.tar.sign 991 BLAKE2B 8982832ae53b1647e2de45b83251520c6efb5e9ac1ee0b60ba564dc7af3cfb4a328c929998d72dc076eb0528e92cb36222c20b192b003731a2a7b3b0b7c3b62b SHA512 82070ff0fbc730876a93ffce4abac6c349c80c07dcf61bd67fc742c3626f8156295f2e4c648c52a0c7cc81b79ed64daf41b6766394a511662a0c10a5683e00ff +DIST linux-5.4.114.tar.xz 109099616 BLAKE2B ccc84eed56d7379d77f3c211ac35354d31ab15a7455d9fbe9e109ff4f67eeeb2da5d1bad307583ab18d15f3e10ef0e9d24974d5b833d817060cfee537ec5a2e6 SHA512 c22fb1cafb49819c60ed59b411147d7e4513ce41f1b0c31dac46d610a92ee62d7137d9e8654d2330719c42270ff7891edcee987fb4fb1c2b8fbf9c7c428e79d5 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.114.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.114.ebuild new file mode 100644 index 00000000000..e11e956ef1f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.114.ebuild @@ -0,0 +1,108 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit kernel-build verify-sig + +MY_P=linux-${PV} +# 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 from vanilla upstream sources" +HOMEPAGE="https://www.kernel.org/" +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign + ) + 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 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/vanilla-kernel-bin:${SLOT}" +BDEPEND=" + debug? ( dev-util/dwarves ) + verify-sig? ( app-crypt/openpgp-keys-kernel )" +PDEPEND=" + >=virtual/dist-kernel-${PV}" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc + +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_unpack() { + if use verify-sig; then + einfo "Unpacking linux-${PV}.tar.xz ..." + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \ + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x)) + assert "Unpack failed" + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz" + else + default + fi +} + +src_prepare() { + 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="-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[@]}" +}