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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5391315808B for ; Tue, 22 Mar 2022 18:01:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E65AE0824; Tue, 22 Mar 2022 18:01:26 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 21D7FE0824 for ; Tue, 22 Mar 2022 18:01:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 5BA08342ECE for ; Tue, 22 Mar 2022 18:01:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D4EEA2B0 for ; Tue, 22 Mar 2022 18:01:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1647972069.2f73f5b8ed0602bdf8a0d7fbfb9643cb3a9740bd.sam@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/2.1.3-werror.patch sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild X-VCS-Directories: sys-fs/zfs-kmod/files/ sys-fs/zfs-kmod/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 2f73f5b8ed0602bdf8a0d7fbfb9643cb3a9740bd X-VCS-Branch: master Date: Tue, 22 Mar 2022 18:01: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: 0eaf970c-bcb6-4100-bd48-7b796a1e1ec6 X-Archives-Hash: 38b483edd4350982d2070aa0d4d46ea4 commit: 2f73f5b8ed0602bdf8a0d7fbfb9643cb3a9740bd Author: Sam James gentoo org> AuthorDate: Tue Mar 22 18:00:48 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Mar 22 18:01:09 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f73f5b8 sys-fs/zfs-kmod: fix -Werror issue Closes: https://bugs.gentoo.org/835646 Signed-off-by: Sam James gentoo.org> sys-fs/zfs-kmod/files/2.1.3-werror.patch | 30 ++++++++++++++++++++++++++++++ sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild | 4 ++++ 2 files changed, 34 insertions(+) diff --git a/sys-fs/zfs-kmod/files/2.1.3-werror.patch b/sys-fs/zfs-kmod/files/2.1.3-werror.patch new file mode 100644 index 000000000000..b4aba47d8324 --- /dev/null +++ b/sys-fs/zfs-kmod/files/2.1.3-werror.patch @@ -0,0 +1,30 @@ +https://bugs.gentoo.org/835646 +https://github.com/openzfs/zfs/commit/7b215d93bcc0a72d7020ccc050c64f39aa7f2be8.patch + +From: Ryan Moeller +Date: Thu, 17 Mar 2022 13:18:23 -0400 +Subject: [PATCH] Fix module build with -Werror + +This is a direct commit to zfs-2.1-release to fix release builds that +error out on an unused variable. The issue is avoided on master by a +huge series of commits that change how the ASSERT macros work, but that +is not feasible to backport. + +Reviewed-by: Tony Hutter +Reviewed-by: Brian Behlendorf +Reviewed-by: Igor Kozhukhov +Signed-off-by: Ryan Moeller +Closes #13194 +Closes #13196 +--- a/module/zfs/arc.c ++++ b/module/zfs/arc.c +@@ -1205,7 +1205,7 @@ static void + hdr_l2only_dest(void *vbuf, void *unused) + { + (void) unused; +- arc_buf_hdr_t *hdr = vbuf; ++ arc_buf_hdr_t *hdr __maybe_unused = vbuf; + + ASSERT(HDR_EMPTY(hdr)); + arc_space_return(HDR_L2ONLY_SIZE, ARC_SPACE_L2HDRS); + diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild index 2c6ab28bcfde..39f9cc590a1a 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.3.ebuild @@ -62,6 +62,10 @@ RESTRICT="debug? ( strip ) test" DOCS=( AUTHORS COPYRIGHT META README.md ) +PATCHES=( + "${FILESDIR}"/${PV}-werror.patch +) + pkg_pretend() { use rootfs || return 0