Fix: Hardcoded depmod

The depmod command in spl.install and zfs.install was previously hardcoded
which caused way too many problems. The version string is now retrieved using
pacman.
pull/7/head
Jesus Alvarez 12 years ago
parent 4f1dad3e8e
commit fb8c78d61f
  1. BIN
      core/i686/archzfs.db.tar.xz
  2. BIN
      core/i686/archzfs.db.tar.xz.old
  3. BIN
      core/i686/archzfs.db.tar.xz.old.sig
  4. BIN
      core/i686/archzfs.db.tar.xz.sig
  5. BIN
      core/sources/spl-0.6.0_rc14_3.7.10-2.src.tar.gz
  6. BIN
      core/sources/spl-0.6.0_rc14_3.7.10-3.src.tar.gz
  7. BIN
      core/sources/spl-utils-0.6.0_rc14_3.7.10-2.src.tar.gz
  8. BIN
      core/sources/spl-utils-0.6.0_rc14_3.7.10-3.src.tar.gz
  9. BIN
      core/sources/zfs-0.6.0_rc14_3.7.10-2.src.tar.gz
  10. BIN
      core/sources/zfs-0.6.0_rc14_3.7.10-3.src.tar.gz
  11. BIN
      core/sources/zfs-utils-0.6.0_rc14_3.7.10-2.src.tar.gz
  12. BIN
      core/sources/zfs-utils-0.6.0_rc14_3.7.10-3.src.tar.gz
  13. BIN
      core/x86_64/archzfs.db.tar.xz
  14. BIN
      core/x86_64/archzfs.db.tar.xz.old
  15. BIN
      core/x86_64/archzfs.db.tar.xz.old.sig
  16. BIN
      core/x86_64/archzfs.db.tar.xz.sig
  17. 2
      devsrc/spl-utils/PKGBUILD
  18. 2
      devsrc/spl/PKGBUILD
  19. 5
      devsrc/spl/spl.install
  20. 2
      devsrc/zfs-utils/PKGBUILD
  21. 2
      devsrc/zfs/PKGBUILD
  22. 5
      devsrc/zfs/zfs.install

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -3,7 +3,7 @@
pkgname=('spl-utils')
pkgver=0.6.0_rc14_3.7.10
pkgrel=2
pkgrel=3
pkgdesc='Solaris Porting Layer kernel module support files.'
depends=('linux=3.7.10')
makedepends=('linux-headers=3.7.10')

@ -3,7 +3,7 @@
pkgname=('spl')
pkgver=0.6.0_rc14_3.7.10
pkgrel=2
pkgrel=3
pkgdesc='Solaris Porting Layer kernel modules.'
depends=('spl-utils=0.6.0_rc14_3.7.10' 'linux=3.7.10')
makedepends=('linux-headers=3.7.10')

@ -1,5 +1,3 @@
KERNEL_VERSION=3.7.10-2-ARCH
post_install() {
check_hostid
run_depmod
@ -29,5 +27,6 @@ check_hostid() {
run_depmod() {
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
KERNEL_VERSION=$(pacman -Qi linux | \grep Version | cut -d : -f 2)
depmod ${KERNEL_VERSION}-ARCH
}

@ -3,7 +3,7 @@
pkgname=('zfs-utils')
pkgver=0.6.0_rc14_3.7.10
pkgrel=2
pkgrel=3
pkgdesc="Kernel module support files for the Zettabyte File System."
depends=('spl=0.6.0_rc14_3.7.10' 'linux=3.7.10')
makedepends=('linux-headers=3.7.10')

@ -3,7 +3,7 @@
pkgname=('zfs')
pkgver=0.6.0_rc14_3.7.10
pkgrel=2
pkgrel=3
pkgdesc="Kernel modules for the Zettabyte File System."
depends=('spl=0.6.0_rc14_3.7.10' 'zfs-utils=0.6.0_rc14_3.7.10' 'linux=3.7.10')
makedepends=('linux-headers=3.7.10')

@ -1,5 +1,3 @@
KERNEL_VERSION=3.7.10-2-ARCH
post_install() {
check_initramfs
}
@ -14,7 +12,8 @@ post_upgrade() {
check_initramfs() {
echo ">>> Updating module dependencies. Please wait ..."
depmod ${KERNEL_VERSION}
KERNEL_VERSION=$(pacman -Qi linux | \grep Version | cut -d : -f 2)
depmod ${KERNEL_VERSION}-ARCH
MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
if [[ $MK_CONF == '0' ]]; then
if [[ $1 == 'remove' ]]; then

Loading…
Cancel
Save