funkemunky/packages
1
0
Fork 0
mirror of https://github.com/terrapkg/packages.git synced 2026-06-26 05:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

update dkms, akmid, and userspace specs

Browse Source
This commit is contained in:
Willow Reed
2026-06-15 16:51:18 -06:00
parent bdff1afcf5
commit c40d4acb90
4 changed files with 69 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
anda/system/openzfs/akmod/akmod-openzfs.spec
+4 -4
View File
@@ -4,8 +4,8 @@
Name: akmod-openzfs
Summary: Kernel module (kmod) for OpenZFS filesystem
Version: 2.4.3
Release: 1%?dist
Version: 2.4.4
Release: 1%{?dist}
License: CDDL-1.0
URL: https://github.com/openzfs/zfs
Source0: https://github.com/openzfs/zfs/releases/download/zfs-%{version}/zfs-%{version}.tar.gz
@@ -31,7 +31,7 @@ Requires: akmods
Requires: kernel-devel
Requires: openzfs = %{?epoch:%{epoch}:}%{version}-%{release}
Conflicts: %{modulename}-dkms
Conflicts: dkms-zfs
Conflicts: dkms-openzfs
Provides: akmod-%{modulename} = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: akmod-openzfs = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: %{modulename}-kmod-common = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -87,5 +87,5 @@ done
%{?akmod_install}
%changelog
* Thu Jan 01 2026 Willow Reed <willow@willowidk.dev> - 2.4.0-1
* Thu Jan 01 2026 Willow Reed <willow@willowidk.dev>
- Initial package
anda/system/openzfs/dkms/dkms-openzfs.spec
+41 -13
View File
@@ -2,27 +2,40 @@
%global __brp_mangle_shebangs %{nil}
%define module openzfs
%define modulename %{module}
%define source_name zfs
%define _kmod_src_root %{_usrsrc}/%{module}-%{version}
Name: %{module}-dkms
Version: 2.4.3
Release: 1%?dist
Name: dkms-%{module}
Version: 2.4.4
Release: 1%{?dist}
Summary: ZFS DKMS Kernel Modules
URL: https://github.com/openzfs/zfs
Source0: https://github.com/openzfs/zfs/releases/download/zfs-%{version}/zfs-%{version}.tar.gz
License: CDDL-1.0
BuildArch: noarch
Requires: dkms >= 2.2.0.3
Requires: gcc, make, perl, diffutils, kernel-devel, kernel-modules
Requires: openzfs = %{?epoch:%{epoch}:}%{version}
BuildRequires: make
BuildRequires: perl
Provides: %{module}-kmod = %{version}
Requires: dkms >= 2.2.0.3
Requires: gcc
Requires: make
Requires: perl
Requires: diffutils
Requires: kernel-devel
Requires: kernel-modules
Requires: openzfs = %{?epoch:%{epoch}:}%{version}-%{release}
Provides: %{module}-kmod = %{version}-%{release}
Provides: dkms-openzfs = %{version}-%{release}
Conflicts: akmod-openzfs
RemovePathPostfixes: .dkms
Packager: Willow Reed <willow@willowidk.dev>
%description
This package contains the dkms ZFS kernel modules.
This package contains the DKMS-managed OpenZFS kernel modules.
%prep
%autosetup -n zfs-%{version}
@@ -31,15 +44,30 @@ This package contains the dkms ZFS kernel modules.
scripts/dkms.mkconf -n %{module} -v %{version} -f dkms.conf
%install
mkdir -p %{buildroot}%{_usrsrc}/%{modulename}-%{version}/
cp -rf lib dkms.conf %{buildroot}%{_usrsrc}/%{modulename}-%{version}/
INITIAL_ENVDIR=`pwd`
make distdir
cd %{source_name}-%{version}
for file in $(find cmd dracut etc lib man rpm udev tests -type f); do \
rm "$file"; \
test "$file" != "${file%%.in}" && printf "\x25:\n\t#\n" > "$file"; \
true; \
done
cd $INITIAL_ENVDIR
printf "#!/bin/sh\ncp \"$@\"\n" > %{source_name}-%{version}/cp
chmod 755 %{source_name}-%{version}/cp
mkdir -p %{buildroot}%{_usrsrc}
mv %{source_name}-%{version} %{buildroot}%{_kmod_src_root}.dkms
cp dkms.conf %{buildroot}%{_kmod_src_root}.dkms
%files
%defattr(-,root,root)
/usr/src/%{module}-%{version}
%{_kmod_src_root}.dkms
%pre
# Remove any existing zfs dkms modules
# Remove any existing openzfs dkms modules
dkms_root=/var/lib/dkms
if [ -d ${dkms_root}/%{module} ]; then
cd ${dkms_root}/%{module}
@@ -83,5 +111,5 @@ if [ "$1" = "0" -o "$1" = "remove" -o "$1" = "purge" ] ; then
fi
%changelog
* Thu Jan 01 2026 Willow Reed <willow@willowidk.dev> - 2.4.0-1
* Thu Jan 01 2026 Willow Reed <willow@willowidk.dev>
- Initial package
anda/system/openzfs/gomp/kmod-zfs.spec.preamble → anda/system/openzfs/gomp/kmod-zfs.spec-preamble
View File
anda/system/openzfs/userspace/openzfs.spec
+24 -3
View File
@@ -1,10 +1,17 @@
%global debug_package %{nil}
%global __brp_mangle_shebangs %{nil}
%global __python %{__python3}
%{!?python3_pkgversion: %global python3_pkgversion 3}
%{!?_udevdir: %global _udevdir %{_prefix}/lib/udev}
%{!?_dracutdir: %global _dracutdir %{_prefix}/lib/dracut}
%{!?_initconfdir: %global _initconfdir %{_sysconfdir}/sysconfig}
%{!?_pam_confdir: %global _pam_confdir %{_datadir}/pam-configs}
%{!?_pam_secconfdir: %global _pam_secconfdir %{_libdir}/security}
%global zfs_systemd_units zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target zfs-import.target zfs-volume-wait.service zfs-volumes.target
Name: openzfs
Version: 2.4.0
Release: 1%?dist
Version: 2.4.4
Release: 1%{?dist}
Summary: OpenZFS filesystem userspace utilities
License: CDDL-1.0
URL: https://openzfs.org
@@ -24,17 +31,22 @@ BuildRequires: libattr-devel
BuildRequires: libaio-devel
BuildRequires: libffi-devel
BuildRequires: zlib-ng-compat-devel
BuildRequires: systemd
BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros
BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-cffi
BuildRequires: python3-packaging
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: util-linux
Requires: sysstat
Requires: bash-completion
Recommends: akmod-openzfs
Conflicts: zfs-fuse
Obsoletes: spl < 0.8.0~
# we assume openzfs as the name for consistency, but if someone wants to install just zfs, this shows that this package provides zfs.
Provides: zfs = %{version}-%{release}
@@ -58,6 +70,7 @@ OpenZFS userspace tools
%configure \
--with-config=user \
--with-python=%{__python} \
--bindir=%{_bindir} \
--sbindir=%{_sbindir} \
--libexecdir=%{_libexecdir} \
@@ -81,13 +94,21 @@ OpenZFS userspace tools
--with-systemdpresetdir=%{_presetdir} \
--with-systemdmodulesloaddir=%{_modulesloaddir} \
--with-systemdgeneratordir=%{_systemdgeneratordir} \
--disable-sysvinit \
--enable-pam \
--enable-pyzfs \
--enable-systemd \
--disable-static
%make_build
( cd contrib/pyzfs && %py3_build )
%install
%make_install
( cd contrib/pyzfs && rm -rf %{buildroot}%{python3_sitelib} && %py3_install )
find %{buildroot} -name '*.la' -delete
%files
@@ -136,5 +157,5 @@ find %{buildroot} -name '*.la' -delete
%systemd_postun_with_restart zfs-zed.service
%changelog
* Thu Jan 01 2026 Willow Reed <willow@willowidk.dev> - 2.4.0-1
* Thu Jan 01 2026 Willow Reed <willow@willowidk.dev>
- Initial package