summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-11-16 18:36:19 +0100
committerThomas Deutschmann <whissi@gentoo.org>2021-11-16 18:38:04 +0100
commit5d7061a540ee6868e6e4b70868f838ddf5e6e07a (patch)
treeb0d8b6f20eab9c7d678893d7f1b4c5edfecca7d0 /sys-kernel/genkernel
parentdev-python/responses: Bump to 0.16.0 (diff)
downloadgentoo-5d7061a540ee6868e6e4b70868f838ddf5e6e07a.tar.gz
gentoo-5d7061a540ee6868e6e4b70868f838ddf5e6e07a.tar.bz2
gentoo-5d7061a540ee6868e6e4b70868f838ddf5e6e07a.zip
sys-kernel/genkernel: fix building of btrfs-progs
Bug: https://bugs.gentoo.org/823716 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'sys-kernel/genkernel')
-rw-r--r--sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch24
-rw-r--r--sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild (renamed from sys-kernel/genkernel/genkernel-4.2.6.ebuild)2
2 files changed, 26 insertions, 0 deletions
diff --git a/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch b/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch
new file mode 100644
index 000000000000..f9306d851d33
--- /dev/null
+++ b/sys-kernel/genkernel/files/genkernel-4.2.6-fix-btrfs-progs-deps.patch
@@ -0,0 +1,24 @@
+commit 779376e0a1e3c55a8bdc40c5e55ce9bb50ee8eae
+Author: Thomas Deutschmann <whissi@gentoo.org>
+AuthorDate: Tue Nov 16 18:33:12 2021 +0100
+Commit: Thomas Deutschmann <whissi@gentoo.org>
+CommitDate: Tue Nov 16 18:33:12 2021 +0100
+
+ btrfs-progs-5.15+ needs libudev
+
+ Fixes: d3ee3d06 ("Bump btrfs-progs to v5.15")
+ Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
+
+diff --git a/defaults/software.sh b/defaults/software.sh
+index 9f64ab0..ec2bacb 100644
+--- a/defaults/software.sh
++++ b/defaults/software.sh
+@@ -32,7 +32,7 @@ GKPKG_BOOST_BUILD_BINPKG="${GKPKG_BOOST_BUILD_BINPKG:-%%CACHE%%/boost-build-${GK
+
+ GKPKG_BTRFS_PROGS_PN="btrfs-progs"
+ GKPKG_BTRFS_PROGS_PV="${GKPKG_BTRFS_PROGS_PV:-VERSION_BTRFS_PROGS}"
+-GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo"
++GKPKG_BTRFS_PROGS_DEPS="util-linux zlib zstd lzo eudev"
+ GKPKG_BTRFS_PROGS_SRCTAR="${GKPKG_BTRFS_PROGS_SRCTAR:-${DISTDIR}/btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}.tar.xz}"
+ GKPKG_BTRFS_PROGS_SRCDIR="${GKPKG_BTRFS_PROGS_SRCDIR:-btrfs-progs-v${GKPKG_BTRFS_PROGS_PV}}"
+ GKPKG_BTRFS_PROGS_BINPKG="${GKPKG_BTRFS_PROGS_BINPKG:-%%CACHE%%/btrfs-progs-${GKPKG_BTRFS_PROGS_PV}-%%ARCH%%.tar.xz}"
diff --git a/sys-kernel/genkernel/genkernel-4.2.6.ebuild b/sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild
index e5a3606bbf76..1088ddbbe1c2 100644
--- a/sys-kernel/genkernel/genkernel-4.2.6.ebuild
+++ b/sys-kernel/genkernel/genkernel-4.2.6-r1.ebuild
@@ -126,6 +126,8 @@ if [[ ${PV} == 9999* ]]; then
DEPEND="${DEPEND} app-text/asciidoc"
fi
+PATCHES=( "${FILESDIR}"/${P}-fix-btrfs-progs-deps.patch )
+
src_unpack() {
if [[ ${PV} == 9999* ]]; then
git-r3_src_unpack