[packages/zfs] define vendor explicitly and add pld patch

atler atler at pld-linux.org
Tue Mar 5 11:24:51 CET 2024


commit cf0e3b62ba70e380f62b487d0b06fa421299bb21
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Mar 5 10:16:13 2024 +0100

    define vendor explicitly and add pld patch
    
    currently package implicitly depends on lsb-release which makes
    configure misdetect os as ubuntu and set bash comp dir to
    /usr/share/bash-completion/completions. without lsb-release os detection
    fails and ends up with default /etc/bash_completion.d.
    
    skip os auto detection by providing vendor to configure and set
    bash comp dir for pld

 pld.patch | 10 ++++++++++
 zfs.spec  |  5 ++++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/zfs.spec b/zfs.spec
index fb709ee..b414b4f 100644
--- a/zfs.spec
+++ b/zfs.spec
@@ -36,6 +36,7 @@ Group:		Applications/System
 Source0:	https://github.com/openzfs/zfs/releases/download/zfs-%{version}/%{pname}-%{version}.tar.gz
 # Source0-md5:	e0f2b72ccd47a5b401cbc9f38b1d9073
 Patch0:		initdir.patch
+Patch1:		pld.patch
 URL:		https://zfsonlinux.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
@@ -259,6 +260,7 @@ p=`pwd`\
 %prep
 %setup -q -n %{pname}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
 	cmd/arc_summary
@@ -295,7 +297,8 @@ p=`pwd`\
 	--with-systemdpresetdir=/etc/systemd/system-preset \
 	--with-systemdmodulesloaddir=/etc/modules-load.d \
 	--with-systemdgeneratordir=/lib/systemd/system-generators \
-	--with-udevdir=/lib/udev
+	--with-udevdir=/lib/udev \
+	--with-vendor=pld
 
 %{__make} \
 	%{?with_verbose:V=1}
diff --git a/pld.patch b/pld.patch
new file mode 100644
index 0000000..6a6f820
--- /dev/null
+++ b/pld.patch
@@ -0,0 +1,10 @@
+--- zfs-2.2.3/config/zfs-build.m4.orig	2024-02-22 18:27:01.262129327 +0100
++++ zfs-2.2.3/config/zfs-build.m4	2024-03-05 09:42:48.042560357 +0100
+@@ -627,6 +627,7 @@
+ 		debian)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
+ 		freebsd)    bashcompletiondir=$sysconfdir/bash_completion.d;;
+ 		gentoo)     bashcompletiondir=/usr/share/bash-completion/completions   ;;
++		pld)        bashcompletiondir=/usr/share/bash-completion/completions   ;;
+ 		*)          bashcompletiondir=/etc/bash_completion.d   ;;
+ 	esac
+ 	AC_MSG_RESULT([$bashcompletiondir])
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/zfs.git/commitdiff/cf0e3b62ba70e380f62b487d0b06fa421299bb21



More information about the pld-cvs-commit mailing list