From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (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 lists.proxmox.com (Postfix) with ESMTPS id 101E46054C for ; Wed, 7 Oct 2020 16:28:59 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D30AD2F56E for ; Wed, 7 Oct 2020 16:28:28 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 firstgate.proxmox.com (Proxmox) with ESMTPS id 34A602F564 for ; Wed, 7 Oct 2020 16:28:27 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E185F45C2C for ; Wed, 7 Oct 2020 16:28:26 +0200 (CEST) From: Stoiko Ivanov To: pve-devel@lists.proxmox.com Date: Wed, 7 Oct 2020 16:28:15 +0200 Message-Id: <20201007142815.19925-1-s.ivanov@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.711 Adjusted score from AWL reputation of From: address HEXHASH_WORD 1 Multiple instances of word + hexadecimal hash KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH zfsonlinux] update submodule and patches for to zfs-0.8.5 X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Oct 2020 14:28:59 -0000 upstream commit 2d2ce04b9931927ffd045f9ebba3d39d4d31f7db changed the location for installing pkgconfig files to the architecture specific one in /lib instead of /usr/share - this patch reflects the change in 'debian/libzfslinux-dev.install'. It follows the change from 9a04c500f17d8df20a017137211d0984cace98ff in debian's repository [0]. [0] https://salsa.debian.org/zfsonlinux-team/zfs.git Signed-off-by: Stoiko Ivanov --- did some very rough tests in a VM (container snapshot+rollback) and am currently running it on my host. Most commits are to enable compilation with newer kernel versions and minor bugfixes debian/libzfslinux-dev.install | 2 +- upstream | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/libzfslinux-dev.install b/debian/libzfslinux-dev.install index efc2bc2b..1a74689a 100644 --- a/debian/libzfslinux-dev.install +++ b/debian/libzfslinux-dev.install @@ -1,4 +1,4 @@ lib/*.a usr/lib/ usr/include usr/lib/*.so -usr/share/pkgconfig/*.pc +lib/pkgconfig/*.pc usr/lib/pkgconfig/ diff --git a/upstream b/upstream index 6b18d7df..55548516 160000 --- a/upstream +++ b/upstream @@ -1 +1 @@ -Subproject commit 6b18d7df3772cffa6469b00866d7eae585b912ae +Subproject commit 55548516595dee39906c747b73f5a2712a61aba8 -- 2.20.1