commit:     82f2ef8553906601dfa31b053d0ab77ba487d0f2
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 08:22:25 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 10:22:02 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82f2ef85

sys-fs/zfs-kmod: un-break copy-builtin

https://github.com/openzfs/zfs/commit/acfc4944d0d6db114db9f2bb5401251c5bd767b6
^ broke it

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild 
b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
index 97395188fd4..cc5f18c9067 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild
@@ -94,6 +94,10 @@ src_prepare() {
                # Set module revision number
                sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die 
"Could not set Gentoo release"
        fi
+
+       # undo 
https://github.com/openzfs/zfs/commit/acfc4944d0d6db114db9f2bb5401251c5bd767b6
+       # we use release tarballs with no gitignore files already
+       sed -i 's:rm "$KERNEL_DIR/include/zfs/.gitignore"::' copy-builtin || die
 }
 
 src_configure() {

Reply via email to