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 C2E8F158003 for ; Wed, 7 Dec 2022 16:44:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 07EA5E07B3; Wed, 7 Dec 2022 16:44:22 +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 DB780E07B3 for ; Wed, 7 Dec 2022 16:44:21 +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 CB892341227 for ; Wed, 7 Dec 2022 16:44:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B61D21 for ; Wed, 7 Dec 2022 16:44:19 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1670431452.4e5b07234a8b8ac37c2e78cb3b7038f78f3f1c90.bkohler@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/genkernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/genkernel/genkernel-4.2.6-r8.ebuild sys-kernel/genkernel/genkernel-4.3.1-r1.ebuild sys-kernel/genkernel/genkernel-9999.ebuild X-VCS-Directories: sys-kernel/genkernel/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 4e5b07234a8b8ac37c2e78cb3b7038f78f3f1c90 X-VCS-Branch: master Date: Wed, 7 Dec 2022 16:44:19 +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: b98575ff-3405-47c3-8296-f5582e991d13 X-Archives-Hash: 8cbc0dfe6d75d3cc6c6ef67d7f8bd174 commit: 4e5b07234a8b8ac37c2e78cb3b7038f78f3f1c90 Author: Ben Kohler gentoo org> AuthorDate: Wed Dec 7 16:41:09 2022 +0000 Commit: Ben Kohler gentoo org> CommitDate: Wed Dec 7 16:44:12 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e5b0723 sys-kernel/genkernel: add missing RDEPEND on portage-utils Commit fe4f505d started using qlist to check for udev rules files, but on some systems portage-utils won't be installed (and it's not part of @system). Signed-off-by: Ben Kohler gentoo.org> .../{genkernel-9999.ebuild => genkernel-4.2.6-r8.ebuild} | 15 +++++++++++---- .../{genkernel-9999.ebuild => genkernel-4.3.1-r1.ebuild} | 1 + sys-kernel/genkernel/genkernel-9999.ebuild | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r8.ebuild similarity index 95% copy from sys-kernel/genkernel/genkernel-9999.ebuild copy to sys-kernel/genkernel/genkernel-4.2.6-r8.ebuild index 4453445d63f3..c8f6e7e8d8db 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-4.2.6-r8.ebuild @@ -45,7 +45,6 @@ VERSION_XFSPROGS="5.13.0" VERSION_XZ="5.2.5" VERSION_ZLIB="1.2.11" VERSION_ZSTD="1.5.0" -VERSION_KEYUTILS="1.6.3" COMMON_URI=" https://github.com/g2p/bcache-tools/archive/399021549984ad27bf4a13ae85e458833fe003d7.tar.gz -> bcache-tools-${VERSION_BCACHE_TOOLS}.tar.gz @@ -81,7 +80,6 @@ COMMON_URI=" https://tukaani.org/xz/xz-${VERSION_XZ}.tar.gz https://zlib.net/zlib-${VERSION_ZLIB}.tar.gz https://github.com/facebook/zstd/archive/v${VERSION_ZSTD}.tar.gz -> zstd-${VERSION_ZSTD}.tar.gz - https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/keyutils-${VERSION_KEYUTILS}.tar.gz " if [[ ${PV} == 9999* ]] ; then @@ -90,9 +88,10 @@ if [[ ${PV} == 9999* ]] ; then S="${WORKDIR}/${P}" SRC_URI="${COMMON_URI}" else - SRC_URI="https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.xz + SRC_URI="https://dev.gentoo.org/~whissi/dist/genkernel/${P}.tar.xz ${COMMON_URI}" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" + SRC_URI+=" https://gitweb.gentoo.org/proj/genkernel.git/patch/?id=8c9de489290dc470e30f8c7d0aaa3456eb124537 -> ${P}-s390x.patch" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86" fi DESCRIPTION="Gentoo automatic kernel building scripts" @@ -114,6 +113,7 @@ RDEPEND="${PYTHON_DEPS} app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches + app-portage/portage-utils dev-util/gperf sys-apps/sandbox sys-devel/autoconf @@ -132,6 +132,13 @@ if [[ ${PV} == 9999* ]]; then fi PATCHES=( + "${FILESDIR}"/${P}-devicemanager.patch + "${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch + "${FILESDIR}"/${P}-fuse-glibc-2.34.patch + "${FILESDIR}"/${P}-gcc-12-boost-1.79.patch + "${FILESDIR}"/${P}-chroot-path.patch + "${FILESDIR}"/${P}-slibtool.patch # 836012 + "${DISTDIR}"/${P}-s390x.patch ) src_unpack() { diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-4.3.1-r1.ebuild similarity index 99% copy from sys-kernel/genkernel/genkernel-9999.ebuild copy to sys-kernel/genkernel/genkernel-4.3.1-r1.ebuild index 4453445d63f3..891fef7e0d3f 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-4.3.1-r1.ebuild @@ -114,6 +114,7 @@ RDEPEND="${PYTHON_DEPS} app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches + app-portage/portage-utils dev-util/gperf sys-apps/sandbox sys-devel/autoconf diff --git a/sys-kernel/genkernel/genkernel-9999.ebuild b/sys-kernel/genkernel/genkernel-9999.ebuild index 4453445d63f3..891fef7e0d3f 100644 --- a/sys-kernel/genkernel/genkernel-9999.ebuild +++ b/sys-kernel/genkernel/genkernel-9999.ebuild @@ -114,6 +114,7 @@ RDEPEND="${PYTHON_DEPS} app-arch/cpio >=app-misc/pax-utils-1.2.2 app-portage/elt-patches + app-portage/portage-utils dev-util/gperf sys-apps/sandbox sys-devel/autoconf