tomcharnock/void-packages
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

zfs: cross compilation support; remove unwanted files.

Browse Source
This commit is contained in:
Juan RP 2016-01-12 09:38:15 +01:00
parent 78b8f5abc6
commit 8cef54c75a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
srcpkgs/zfs/patches/musl-fixes.patch
View File

@ -339,3 +339,14 @@ index 1eca0fe..efd6287 100644
if (*size > NVS_XDR_MAX_LEN(bytesrec.xc_num_avail)) if (*size > NVS_XDR_MAX_LEN(bytesrec.xc_num_avail))
return (EFAULT); return (EFAULT);
--- a/lib/libnvpair/Makefile.am.orig 2016-01-12 09:33:43.534468667 +0100
+++ b/lib/libnvpair/Makefile.am 2016-01-12 09:34:02.813433477 +0100
@@ -26,7 +26,7 @@ nodist_libnvpair_la_SOURCES = \
$(KERNEL_C)
libnvpair_la_LIBADD = \
- $(top_builddir)/lib/libuutil/libuutil.la
+ $(top_builddir)/lib/libuutil/libuutil.la $(TIRPC_LIBS)
libnvpair_la_LDFLAGS = -version-info 1:1:0

8
srcpkgs/zfs/template
View File

@ -1,13 +1,13 @@
# Template file for 'zfs' # Template file for 'zfs'
pkgname=zfs pkgname=zfs
version=0.6.5.4 version=0.6.5.4
revision=2 revision=3
patch_args="-Np1" patch_args="-Np1"
wrksrc="${pkgname}-${pkgname}-${version/r/-}" wrksrc="${pkgname}-${pkgname}-${version/r/-}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-config=user --with-mounthelperdir=/usr/bin configure_args="--with-config=user --with-mounthelperdir=/usr/bin
--with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d --with-udevdir=/usr/lib/udev --with-udevruledir=/usr/lib/udev/rules.d
--with-dracutdir=/usr/lib/dracut --with-tirpc" --with-dracutdir=/usr/lib/dracut --with-tirpc --with-blkid"
hostmakedepends="dracut automake libtool pkg-config" hostmakedepends="dracut automake libtool pkg-config"
makedepends="spl-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel" makedepends="spl-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel"
conf_files="/etc/zfs/zed.d/zed.rc" conf_files="/etc/zfs/zed.d/zed.rc"
@ -17,7 +17,6 @@ license="CDDL"
homepage="http://zfsonlinux.org/" homepage="http://zfsonlinux.org/"
distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz" distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version/r/-}.tar.gz"
checksum=081c53ff170f61aadadff53f12fdad38d467a4b1d27c11dfe2dcb18b663aaead checksum=081c53ff170f61aadadff53f12fdad38d467a4b1d27c11dfe2dcb18b663aaead
nocross=yes
triggers="dkms" triggers="dkms"
dkms_modules="zfs ${version/r/-}" dkms_modules="zfs ${version/r/-}"
@ -36,6 +35,9 @@ post_install() {
scripts/dkms.mkconf -v ${version/r/-} -f ${DESTDIR}/usr/src/${pkgname}-${version/r/-}/dkms.conf -n zfs scripts/dkms.mkconf -v ${version/r/-} -f ${DESTDIR}/usr/src/${pkgname}-${version/r/-}/dkms.conf -n zfs
vsv zfs-import vsv zfs-import
rm -rf ${DESTDIR}/usr/lib/systemd
rm -rf ${DESTDIR}/usr/share/initramfs-tools
} }
zfs-devel_package() { zfs-devel_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"