[PR PATCH] zfs: do not ship autotools cache, ship initramfs-tools

[PR PATCH] zfs: do not ship autotools cache, ship initramfs-tools

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1270 bytes --]

There is a new pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages zfs-initramfs-tools
https://github.com/void-linux/void-packages/pull/40774

zfs: do not ship autotools cache, ship initramfs-tools
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/40774.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-zfs-initramfs-tools-40774.patch --]
[-- Type: text/x-diff, Size: 2040 bytes --]

From 46c5517af8fb30464b8b4f82ea5085535795c06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Thu, 24 Nov 2022 15:58:13 +0700
Subject: [PATCH] zfs: do not ship autotools cache, ship initramfs-tools

---
 srcpkgs/zfs/template | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template
index 5ed7711352d9..316002635f0d 100644
--- a/srcpkgs/zfs/template
+++ b/srcpkgs/zfs/template
@@ -1,7 +1,7 @@
 # Template file for 'zfs'
 pkgname=zfs
 version=2.1.6
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-config=user --with-mounthelperdir=/usr/bin
  --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
@@ -26,19 +26,9 @@ if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then
 	makedepends+=" libatomic-devel"
 fi
 
-post_patch() {
-	# When collecting a "clean" tree for DKMS, don't leave patches in place
-	local _f
-	for _f in "${XBPS_SRCPKGDIR}/${pkgname}"/patches/*.patch; do
-		rm -f "${_f##*/}"
-	done
-}
-
 pre_configure() {
 	export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/tirpc/"
 	autoreconf -fi
-
-	tar czf ../clean.tar.gz .
 }
 
 post_install() {
@@ -48,13 +38,13 @@ post_install() {
 
 	vsv zed
 
-	vmkdir usr/src/${pkgname}-${version}
-	tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version}
+	make dist-gzip
+	vmkdir usr/src/
+	tar xf ${pkgname}-${version}.tar.gz -C ${DESTDIR}/usr/src/
 	scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf -n zfs
 
 	# Remove init and service control pieces not used in Void
 	rm -rf ${DESTDIR}/usr/lib/systemd
-	rm -rf ${DESTDIR}/usr/share/initramfs-tools
 	rm -rf ${DESTDIR}/etc/init.d
 	rm -rf ${DESTDIR}/etc/default
 	rm -f ${DESTDIR}/etc/zfs/zfs-functions
@@ -89,11 +79,6 @@ zfs-pam_package() {
 	}
 }
 
-
-do_clean() {
-	rm -f ../clean.tar.gz
-}
-
 # REMARKS:
 # Did not split out pyzfs, because it's distributed with zfs, and no reason to
 # send separately.

Re: [PR PATCH] [Merged]: zfs: do not ship autotools cache, ship initramfs-tools

[sgn]

[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]

There's a merged pull request on the void-packages repository

zfs: do not ship autotools cache, ship initramfs-tools
https://github.com/void-linux/void-packages/pull/40774

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->