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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 1236A1382C5 for ; Fri, 18 Dec 2020 20:04:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55B93E08ED; Fri, 18 Dec 2020 20:04:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3DDFDE08ED for ; Fri, 18 Dec 2020 20:04:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A6D093410D8 for ; Fri, 18 Dec 2020 20:04:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 471B657 for ; Fri, 18 Dec 2020 20:04:23 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1608321837.c40d3a5fdfabc90e96db6212924f917283b4cf9c.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs-kmod/, sys-fs/zfs-kmod/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild X-VCS-Directories: sys-fs/zfs-kmod/ sys-fs/zfs-kmod/files/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: c40d3a5fdfabc90e96db6212924f917283b4cf9c X-VCS-Branch: master Date: Fri, 18 Dec 2020 20:04:23 +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: 2b5d33c9-6b41-4690-8b6f-b40f69bde89b X-Archives-Hash: 042c3cb0a6236b7cca4e700a5383cb71 commit: c40d3a5fdfabc90e96db6212924f917283b4cf9c Author: Georgy Yakovlev gentoo org> AuthorDate: Fri Dec 18 19:57:00 2020 +0000 Commit: Georgy Yakovlev gentoo org> CommitDate: Fri Dec 18 20:03:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c40d3a5f sys-fs/zfs-kmod: replace sed with a proper patch in 0.8.6 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Georgy Yakovlev gentoo.org> sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch | 27 ++++++++++++++++++++++++++ sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild | 7 +++---- 2 files changed, 30 insertions(+), 4 deletions(-) diff --git a/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch new file mode 100644 index 00000000000..2b1ef858254 --- /dev/null +++ b/sys-fs/zfs-kmod/files/0.8.6-copy-builtin.patch @@ -0,0 +1,27 @@ +From 0ce99b43b339226d62362f624d37f80a921eb197 Mon Sep 17 00:00:00 2001 +From: Georgy Yakovlev +Date: Fri, 18 Dec 2020 11:35:07 -0800 +Subject: [PATCH] copy-builtin: handle missing .gitignore + +acfc4944d0d6db114db9f2bb5401251c5bd767b6 broke copy-builtin in +release tarballs, because those do not contain .gitignore file. +Adding -f to rm call will make it return 0 even if file does not exist. + +Signed-off-by: Georgy Yakovlev +--- + copy-builtin | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/copy-builtin b/copy-builtin +index 84f469fef02..6a6eb1f3695 100755 +--- a/copy-builtin ++++ b/copy-builtin +@@ -36,7 +36,7 @@ rm -rf "$KERNEL_DIR/include/zfs" "$KERNEL_DIR/fs/zfs" + cp --recursive include "$KERNEL_DIR/include/zfs" + cp --recursive module "$KERNEL_DIR/fs/zfs" + cp zfs_config.h "$KERNEL_DIR/include/zfs/" +-rm "$KERNEL_DIR/include/zfs/.gitignore" ++rm -f "$KERNEL_DIR/include/zfs/.gitignore" + + for MODULE in "${MODULES[@]}" + do 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 cc5f18c9067..9067f366236 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.6.ebuild @@ -37,6 +37,9 @@ RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +# https://github.com/openzfs/zfs/pull/11371 +PATCHES=( "${FILESDIR}/${PV}-copy-builtin.patch" ) + pkg_setup() { CONFIG_CHECK=" !DEBUG_LOCK_ALLOC @@ -94,10 +97,6 @@ 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() {