From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <t.lamprecht@proxmox.com>
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) server-digest SHA256)
 (No client certificate requested)
 by lists.proxmox.com (Postfix) with ESMTPS id 4BB5A60563
 for <pve-devel@lists.proxmox.com>; Wed,  7 Oct 2020 18:27:27 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
 by firstgate.proxmox.com (Proxmox) with ESMTP id 355088251
 for <pve-devel@lists.proxmox.com>; Wed,  7 Oct 2020 18:26:57 +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) server-digest SHA256)
 (No client certificate requested)
 by firstgate.proxmox.com (Proxmox) with ESMTPS id 87C0A2FFFD
 for <pve-devel@lists.proxmox.com>; Wed,  7 Oct 2020 18:26:55 +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 52F6945C15
 for <pve-devel@lists.proxmox.com>; Wed,  7 Oct 2020 18:26:55 +0200 (CEST)
To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>,
 Stoiko Ivanov <s.ivanov@proxmox.com>
References: <20201007142815.19925-1-s.ivanov@proxmox.com>
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Message-ID: <98e9a848-25e4-33db-a106-769fa2d63c82@proxmox.com>
Date: Wed, 7 Oct 2020 18:26:54 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:82.0) Gecko/20100101
 Thunderbird/82.0
MIME-Version: 1.0
In-Reply-To: <20201007142815.19925-1-s.ivanov@proxmox.com>
Content-Type: text/plain; charset=UTF-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
X-SPAM-LEVEL: Spam detection results:  0
 AWL -0.517 Adjusted score from AWL reputation of From: address
 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment
 KAM_LOTSOFHASH           0.25 Emails with lots of hash-like gibberish
 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years
 NICE_REPLY_A           -0.001 Looks like a legit reply (A)
 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: Re: [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 <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>, 
 <mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Wed, 07 Oct 2020 16:27:27 -0000

On 07.10.20 16:28, Stoiko Ivanov wrote:
> 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 <s.ivanov@proxmox.com>
> ---
> 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
> 

this is the wrong commit ref, probably one made before the actual release,
superseded with a newer one through a force push  (educated guess).

The actual one seems to be d2632f0cc196a685428115ab023bf4fe3d8e5806 [0][1]

[0]: https://github.com/openzfs/zfs/releases/tag/zfs-0.8.5
[1]: https://github.com/openzfs/zfs/commit/d2632f0cc196a685428115ab023bf4fe3d8e5806