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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1DA0A15800F for ; Thu, 12 Jan 2023 18:48:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13DE1E0964; Thu, 12 Jan 2023 18:48:02 +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 EE58BE0960 for ; Thu, 12 Jan 2023 18:48:01 +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 AE964335D54 for ; Thu, 12 Jan 2023 18:48:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B2CC82C for ; Thu, 12 Jan 2023 18:47:59 +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: <1673549269.4b22e73823e4ff6dd6c5c332c83641f4f4d718b5.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-6.0.19.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4b22e73823e4ff6dd6c5c332c83641f4f4d718b5 X-VCS-Branch: master Date: Thu, 12 Jan 2023 18:47:59 +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: dc330875-ac49-41e1-ae76-bd936d2a5c51 X-Archives-Hash: 1b6dc2e7bde991b958c1c9e31b9ddefc commit: 4b22e73823e4ff6dd6c5c332c83641f4f4d718b5 Author: Michał Górny gentoo org> AuthorDate: Thu Jan 12 15:32:54 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Thu Jan 12 18:47:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b22e738 sys-kernel/vanilla-kernel: Bump to 6.0.19 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.0.19.ebuild | 134 +++++++++++++++++++++ 2 files changed, 136 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 604c99778e10..eee807eda607 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -48,6 +48,8 @@ DIST linux-6.0.17.tar.sign 989 BLAKE2B 568e54c45f30560e9b02908241e0bb5ca752a604b DIST linux-6.0.17.tar.xz 133926564 BLAKE2B 18ec2a1893eadd6e64c284d2aec81f449a11b0aed9740ed12bd0ead85da9e600f2a6c3b09b523ce25a00e1f5d00ee47cd053fac1a777fbc99456ec7a8df9d231 SHA512 48e65a9296c795c80d44cda9f0facb06aa23bf1069ec6051525c79eb7ced8beac31242cafc4899022891c3f48a163800dbc86f0cbae27bd9e900b803370d001b DIST linux-6.0.18.tar.sign 989 BLAKE2B da2020ca6cac5c40fc635428c38f068f275d30fa0d77b03090cf161756c5873dc07f4f10657399f898368e1cf794518ebb5035577a309bc65a6cc9a208c63e9c SHA512 74c6bfbf1533016f6c58809b44a2f15c05bd2f57eb08751d046d3fcdc6f7fd50ec2fe564c6d24cb5b31ee3c8cfefd9daded125f57416ab18a99b1bdfb3c00062 DIST linux-6.0.18.tar.xz 133958940 BLAKE2B 4092c72e5605b04386355ef8e07ecfa70893af7d6d12da79955ebeac8303be785a329e6e4914238e9991dc314c6992c61c8f38c9fb10eefcb652fd98311e9471 SHA512 4fe661ec730e2907af25b26e30f1d11f0865e6c95da47ef9e95df496b84fc932af1321e86ce97059a23bd7d8d9381008b1e1b7e581f956295cd467ad13ffc0d3 +DIST linux-6.0.19.tar.sign 989 BLAKE2B 282c6f308c8617ffac058ccd9c57d90c0d4cd9d1046c2909fc2b134e17705da73ea8b389a6547e38bb88ae3048648d37243a57c8c32e65231f5c317ffe5cbafd SHA512 2a6ecc919c878ddd8704b04f5cfb360fb8dd6260fa809eb08ad65f140c8081e456d7b0e2842fd7fdbe6abcacb55c66fe72900230d2eee901ca7a319b3dd98d40 +DIST linux-6.0.19.tar.xz 133963104 BLAKE2B a19a5db545cc8d4d220942b791ced3c2e6b9c8980d1f427de9b3b1804cca5468475d0222b2e905ef96baa229c7df227f149a1703a9c94fc0e0d7126744740e94 SHA512 4a7d9af032aac53e6474b49d29297d5c20fb5f16391042646a0100ed6b6308d24f088572b110b6fe2a741800a161006e795835aea7a874735f036aa0457163d7 DIST linux-6.1.1.tar.sign 987 BLAKE2B a240a6428c456557362103620cb9d0d9eb0eb57d7e46ad7aa8183eee673b5578a811642222388cf99a9728bc47e35d7489dd05728b36c939227a109435a0e7ea SHA512 a089b3bfc255fcf10594ace137ca2553e717dd231434b08039252c23c2c7242fc3037b49a8a6fa8d55a92c99173f448bdcabd6116f185ed31078f7455aaa23ba DIST linux-6.1.1.tar.xz 134730676 BLAKE2B 8d25e501419dfe800b9cbbe219c39883be67a80e015c1c6034e83a9b142aa16bfc4db14a788a5331f6c44c03ca013f0c73e028b207e2e424dff1d3924d9a58fc SHA512 c303f53ace62cf5b860934130fa5c34d2a43e7719959bcc3f2b7f0e753ecca550da4d0dc52409b6b6dc1c9c515cbab75427a15e51b58e9f8b1ce12982d82d629 DIST linux-6.1.2.tar.sign 987 BLAKE2B 496c6817ca39458b0ef0853b84bcd89b5caa76b63739730056376713266d49298328342d1716980a244f00c57c74de03a6d36d6a80542590bb642ee2bb92e1e4 SHA512 c338bf4e330dab849c568a747209b8665e8cbb27ad7870eb26c41e66b828b2f8edeb03a3f02ac35523b1e2896f0156d5ba0f1f1900351dccaa1b4d5db6590317 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.19.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.19.ebuild new file mode 100644 index 000000000000..c9b57a73dafe --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.19.ebuild @@ -0,0 +1,134 @@ +# Copyright 2020-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit kernel-build toolchain-funcs verify-sig + +MY_P=linux-${PV} +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo +CONFIG_VER=6.0.8-gentoo +GENTOO_CONFIG_VER=g5 + +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/projg2/gentoo-kernel-config/archive/${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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/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 )" + +BDEPEND=" + debug? ( dev-util/pahole ) + verify-sig? ( sec-keys/openpgp-keys-kernel ) +" +PDEPEND=" + >=virtual/dist-kernel-${PV} +" + +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc + +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 + + 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="-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[@]}" +}