commit: 4e5b07234a8b8ac37c2e78cb3b7038f78f3f1c90
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 7 16:41:09 2022 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> 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 <bkohler <AT> 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
