diff --git a/conf.sh b/conf.sh index b39f09c..ce2ebf3 100644 --- a/conf.sh +++ b/conf.sh @@ -2,11 +2,11 @@ # # FIXME: reset all kernel configs set to pkgrel=1 when this changes # -zol_version="2.1.2" +zol_version="2.1.3" zol_rc_version="2.1.0-rc8" # The ZOL source hashes are from zfsonlinux.org -zfs_src_hash="258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7" +zfs_src_hash="b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd" zfs_rc_src_hash="8627702ac841d38d5211001c76937e4097719c268b110e8836c0da195618fad2" zfs_initcpio_install_hash="29a8a6d76fff01b71ef1990526785405d9c9410bdea417b08b56107210d00b10" diff --git a/src/zfs/PKGBUILD.sh b/src/zfs/PKGBUILD.sh index bd07b05..8f20c21 100755 --- a/src/zfs/PKGBUILD.sh +++ b/src/zfs/PKGBUILD.sh @@ -1,9 +1,5 @@ #!/bin/bash -if [[ ${archzfs_package_group} =~ -git$ ]]; then - modpath="\${pkgdir}" -fi - cat << EOF > ${zfs_pkgbuild_path}/PKGBUILD ${header} pkgbase="${zfs_pkgname}" @@ -45,7 +41,7 @@ package_${zfs_pkgname}() { ${zfs_replaces} cd "${zfs_workdir}" - make DESTDIR="\${pkgdir}" INSTALL_MOD_PATH=${modpath}/usr install + make DESTDIR="\${pkgdir}" INSTALL_MOD_PATH=\${pkgdir}/usr install # Remove src dir rm -r "\${pkgdir}"/usr/src