zfs/spl: fix everything.

This commit is contained in:
Christian Neukirchen 2015-03-20 15:20:10 +01:00
parent f5ce9c2f54
commit 9c89bf2da4
2 changed files with 30 additions and 15 deletions

View file

@ -2,8 +2,10 @@
pkgname=spl pkgname=spl
version=0.6.3r1.3 version=0.6.3r1.3
revision=1 revision=1
wrksrc="${pkgname}-${pkgname}-${version/r/-}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-config=user --sbindir=/usr/bin" configure_args="--with-config=user --sbindir=/usr/bin"
hostmakedepends="automake libtool"
short_desc="Solaris Porting Layer -- userland and kernel modules (using DKMS)" short_desc="Solaris Porting Layer -- userland and kernel modules (using DKMS)"
maintainer="Christian Neukirchen <chneukirchen@gmail.com>" maintainer="Christian Neukirchen <chneukirchen@gmail.com>"
license="GPL-2" license="GPL-2"
@ -12,18 +14,24 @@ distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version
checksum=ae4ddabd68518821485be60e62dbf640168598abeb9edcdb29d46ba7c2923241 checksum=ae4ddabd68518821485be60e62dbf640168598abeb9edcdb29d46ba7c2923241
triggers="dkms" triggers="dkms"
dkms_modules="spl ${version}" dkms_modules="spl ${version/r/-}"
depends="dkms ${pkgname}-devel>=${version}_${revision} glibc-devel" depends="dkms>=2.2.0.3_9 ${pkgname}-devel>=${version}_${revision} glibc-devel"
post_install() { pre_configure() {
vmkdir usr/src autoreconf -fi
tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz -C ${DESTDIR}/usr/src tar czf ../clean.tar.gz .
scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${sourcepkg}-${version}/dkms.conf -n spl }
post_install() {
vmkdir usr/src/${pkgname}-${version/r/-}
tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version/r/-}
scripts/dkms.mkconf -v ${version/r/-} -f ${DESTDIR}/usr/src/${sourcepkg}-${version/r/-}/dkms.conf -n spl
} }
spl-devel_package() { spl-devel_package() {
short_desc="Solaris Porting Layer -- development headers" short_desc="Solaris Porting Layer -- development headers"
pkg_install() { pkg_install() {
vmove usr/src/${sourcepkg}-${version}/include vmove usr/src/${sourcepkg}-${version/r/-}/include
} }
} }
do_clean() {
rm -f ../clean.tar.gz
}

View file

@ -2,11 +2,12 @@
pkgname=zfs pkgname=zfs
version=0.6.3r1.3 version=0.6.3r1.3
revision=1 revision=1
wrksrc="${pkgname}-${pkgname}-${version/r/-}"
build_style=gnu-configure build_style=gnu-configure
configure_args="--with-config=user --sbindir=/usr/bin configure_args="--with-config=user --sbindir=/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-dracutdir=/usr/lib/dracut"
hostmakedepends="dracut" hostmakedepends="dracut automake libtool"
makedepends="spl-devel>=${version} zlib-devel libuuid-devel libblkid-devel" makedepends="spl-devel>=${version} zlib-devel libuuid-devel libblkid-devel"
conf_files="/etc/zfs/zed.d/zed.rc" conf_files="/etc/zfs/zed.d/zed.rc"
short_desc="Z File System -- userland and kernel modules (using DKMS)" short_desc="Z File System -- userland and kernel modules (using DKMS)"
@ -17,9 +18,13 @@ distfiles="https://github.com/zfsonlinux/${pkgname}/archive/${pkgname}-${version
checksum=125f8815ee78c5391eb8e909d29edf563965cff1bdde06178e0bfe383af63572 checksum=125f8815ee78c5391eb8e909d29edf563965cff1bdde06178e0bfe383af63572
triggers="dkms" triggers="dkms"
dkms_modules="zfs ${version}" dkms_modules="zfs ${version/r/-}"
depends="dkms spl>=${version} glibc-devel" depends="dkms>=2.2.0.3_9 spl>=${version} glibc-devel"
pre_configure() {
autoreconf -fi
tar czf ../clean.tar.gz .
}
post_install() { post_install() {
# mount.zfs needs to be in /usr/sbin. # mount.zfs needs to be in /usr/sbin.
mv ${DESTDIR}/sbin ${DESTDIR}/usr mv ${DESTDIR}/sbin ${DESTDIR}/usr
@ -28,11 +33,10 @@ post_install() {
vlicense COPYRIGHT vlicense COPYRIGHT
vlicense OPENSOLARIS.LICENSE vlicense OPENSOLARIS.LICENSE
vmkdir usr/src vmkdir usr/src/${pkgname}-${version/r/-}
tar xzf ${XBPS_SRCDISTDIR}/${pkgname}-${version}/${pkgname}-${version}.tar.gz -C ${DESTDIR}/usr/src tar xf ../clean.tar.gz -C ${DESTDIR}/usr/src/${pkgname}-${version/r/-}
scripts/dkms.mkconf -v ${version} -f ${DESTDIR}/usr/src/${pkgname}-${version}/dkms.conf -n zfs scripts/dkms.mkconf -v ${version/r/-} -f ${DESTDIR}/usr/src/${pkgname}-${version/r/-}/dkms.conf -n zfs
} }
zfs-devel_package() { zfs-devel_package() {
depends="${sourcepkg}>=${version}_${revision}" depends="${sourcepkg}>=${version}_${revision}"
short_desc="Z File System -- development files" short_desc="Z File System -- development files"
@ -42,3 +46,6 @@ zfs-devel_package() {
vmove "usr/lib/*.so" vmove "usr/lib/*.so"
} }
} }
do_clean() {
rm -f ../clean.tar.gz
}