[pve-devel] [PATCH zfsonlinux] update submodule and patches for to zfs-0.8.5

[pve-devel] [PATCH zfsonlinux] update submodule and patches for to zfs-0.8.5

[Stoiko Ivanov]

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
-- 
2.20.1

Re: [pve-devel] [PATCH zfsonlinux] update submodule and patches for to zfs-0.8.5

[Thomas Lamprecht]

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

[pve-devel] applied: [PATCH zfsonlinux] update submodule and patches for to zfs-0.8.5

[Thomas Lamprecht]

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
> 

applied, but squashed in the commit hash fixup for the correct signed
zfs-0.8.5 tag