Update to 0.6.1_3.9.4-2

12 years ago · aa27d36e34
parent 474c2059a5
commit aa27d36e34
6 changed files with 51 additions and 47 deletions
--- a/spl-utils/PKGBUILD
+++ b/spl-utils/PKGBUILD
@ -2,30 +2,30 @@
 # Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>

 pkgname=("spl-utils")
-pkgver=_
-pkgrel=1
+pkgver=0.6.1_3.9.4
+pkgrel=2
 pkgdesc="Solaris Porting Layer kernel module support files."
-depends=("linux=-1")
-makedepends=("linux-headers=-1")
+depends=("linux=3.9.4-1")
+makedepends=("linux-headers=3.9.4-1")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-.tar.gz
+source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz
        spl-utils.hostid)
 groups=("archzfs")
-md5sums=("0f58806d9fd9cab900181b59b21bae50"
-         "a54f0041a9e15b050f25c463f1db7449")
+md5sums=('0f58806d9fd9cab900181b59b21bae50'
+         'a54f0041a9e15b050f25c463f1db7449')
 license=("GPL")

 build() {
-  cd "$srcdir/spl-"
+  cd "$srcdir/spl-0.6.1"
  ./autogen.sh
-  ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \
+  ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/bin \
              --with-config=user
  make
 }

 package() {
-  cd "$srcdir/spl-"
+  cd "$srcdir/spl-0.6.1"
  make DESTDIR=$pkgdir install

  install -D -m644 $srcdir/spl-utils.hostid $pkgdir/etc/hostid
--- a/spl/PKGBUILD
+++ b/spl/PKGBUILD
@ -2,34 +2,34 @@
 # Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>

 pkgname=("spl")
-pkgver=_
-pkgrel=1
+pkgver=0.6.1_3.9.4
+pkgrel=2
 pkgdesc="Solaris Porting Layer kernel modules."
-depends=("spl-utils=_-1" "linux=-1")
-makedepends=("linux-headers=-1")
+depends=("spl-utils=0.6.1_3.9.4-2" "linux=3.9.4-1")
+makedepends=("linux-headers=3.9.4-1")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-.tar.gz)
+source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.1.tar.gz)
 groups=("archzfs")
-md5sums=("0f58806d9fd9cab900181b59b21bae50")
+md5sums=('0f58806d9fd9cab900181b59b21bae50')
 license=("GPL")
 install=spl.install

 build() {
-  cd "$srcdir/spl-"
+  cd "$srcdir/spl-0.6.1"
  ./autogen.sh
  if [[ $CARCH == "i686" ]]; then
-    ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \
+    ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/bin \
                --with-config=kernel --enable-atomic-spinlocks
  else
-    ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/sbin \
+    ./configure --prefix=/usr --libdir=/usr/lib --sbindir=/usr/bin \
                --with-config=kernel
  fi
  make
 }

 package() {
-  cd "$srcdir/spl-"
+  cd "$srcdir/spl-0.6.1"
  make DESTDIR=$pkgdir install

  # move module tree /lib -> /usr/lib
--- a/spl/spl.install
+++ b/spl/spl.install
@ -33,5 +33,5 @@ run_depmod() {
    if [ $(grep -o "\." <<<"$LINUX_VER" | wc -l) -eq 1 ]; then
        KERNEL_VERSION="${LINUX_VER}.0-${KERNEL_VERSION:(-1)}"
    fi
-    depmod ${KERNEL_VERSION}-ARCH
+    depmod $(basename $(find /usr/lib/modules -type d -iname $KERNEL_VERSION\*))
 }
--- a/zfs-utils/PKGBUILD
+++ b/zfs-utils/PKGBUILD
@ -2,43 +2,43 @@
 # Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>

 pkgname=("zfs-utils")
-pkgver=_
-pkgrel=1
+pkgver=0.6.1_3.9.4
+pkgrel=2
 pkgdesc="Kernel module support files for the Zettabyte File System."
-depends=("spl=_-1" "linux=-1")
-makedepends=("linux-headers=-1")
+depends=("spl=0.6.1_3.9.4-2" "linux=3.9.4-1")
+makedepends=("linux-headers=3.9.4-1")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-.tar.gz
+source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz
        zfs-utils.bash-completion
        zfs-utils.initcpio.install
        zfs-utils.initcpio.hook
        zfs-utils.service)
 groups=("archzfs")
-md5sums=("822cd73c139d89369d6c3944f8afe659"
-         "3e1c4a29c4f7d590e6a3041f2c61d6ff"
-         "ebea2b1e593a9a19efa0f7ae7451bbc7"
-         "8eec7f96316c7a1b6eeda8d56266a935"
-         "161e6a5f5f314c9308b4a4565c01fe45")
+md5sums=('822cd73c139d89369d6c3944f8afe659'
+         '3e1c4a29c4f7d590e6a3041f2c61d6ff'
+         'ebea2b1e593a9a19efa0f7ae7451bbc7'
+         '8eec7f96316c7a1b6eeda8d56266a935'
+         '161e6a5f5f314c9308b4a4565c01fe45')
 license=("CDDL")

 build() {
-  cd "$srcdir/zfs-"
+  cd "$srcdir/zfs-0.6.1"
  ./autogen.sh
  ./configure --prefix=/usr \
              --sysconfdir=/etc \
-              --sbindir=/usr/sbin \
+              --sbindir=/usr/bin \
              --libdir=/usr/lib \
              --datadir=/usr/share \
              --includedir=/usr/include \
              --with-udevdir=/lib/udev \
-              --libexecdir=/usr/lib/zfs- \
+              --libexecdir=/usr/lib/zfs-0.6.1 \
              --with-config=user
  make
 }

 package() {
-  cd "$srcdir/zfs-"
+  cd "$srcdir/zfs-0.6.1"
  make DESTDIR="$pkgdir" install

  # Remove uneeded files
@ -49,6 +49,10 @@ package() {
  cp -r $pkgdir/{lib,usr}
  rm -r $pkgdir/lib

+  # Fixup path
+  mv $pkgdir/sbin/mount.zfs $pkgdir/usr/bin/
+  rm -r $pkgdir/sbin
+
  install -D -m644 $srcdir/zfs-utils.initcpio.hook $pkgdir/usr/lib/initcpio/hooks/zfs
  install -D -m644 $srcdir/zfs-utils.initcpio.install $pkgdir/usr/lib/initcpio/install/zfs
  install -D -m644 $srcdir/zfs-utils.service $pkgdir/usr/lib/systemd/system/zfs.service
--- a/zfs/PKGBUILD
+++ b/zfs/PKGBUILD
@ -2,36 +2,36 @@
 # Contributor: Kyle Fuller <inbox at kylefuller dot co dot uk>

 pkgname=("zfs")
-pkgver=_
-pkgrel=1
+pkgver=0.6.1_3.9.4
+pkgrel=2
 pkgdesc="Kernel modules for the Zettabyte File System."
-depends=("spl=_-1" "zfs-utils=_-1" "linux=-1")
-makedepends=("linux-headers=-1")
+depends=("spl=0.6.1_3.9.4-2" "zfs-utils=0.6.1_3.9.4-2" "linux=3.9.4-1")
+makedepends=("linux-headers=3.9.4-1")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-.tar.gz)
+source=(http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.1.tar.gz)
 groups=("archzfs")
-md5sums=("822cd73c139d89369d6c3944f8afe659")
+md5sums=('822cd73c139d89369d6c3944f8afe659')
 license=("CDDL")
 install=zfs.install

 build() {
-  cd "$srcdir/zfs-"
+  cd "$srcdir/zfs-0.6.1"
  ./autogen.sh
  ./configure --prefix=/usr \
              --sysconfdir=/etc \
-              --sbindir=/usr/sbin \
+              --sbindir=/usr/bin \
              --libdir=/usr/lib \
              --datadir=/usr/share \
              --includedir=/usr/include \
              --with-udevdir=/lib/udev \
-              --libexecdir=/usr/lib/zfs- \
+              --libexecdir=/usr/lib/zfs-0.6.1 \
              --with-config=kernel
  make
 }

 package() {
-  cd "$srcdir/zfs-"
+  cd "$srcdir/zfs-0.6.1"
  make DESTDIR="$pkgdir" install

  # move module tree /lib -> /usr/lib
--- a/zfs/zfs.install
+++ b/zfs/zfs.install
@ -12,13 +12,13 @@ post_upgrade() {

 check_initramfs() {
    echo ">>> Updating module dependencies. Please wait ..."
-    KERNEL_VERSION=$(pacman -Qi linux | sed -n 2p | cut -d : -f 2)
+    KERNEL_VERSION=$(pacman -Qi linux | sed -n 2p | cut -d: -f2)
    # For cases when the kernel version is 3.8, 3.9
    LINUX_VER=$(echo $KERNEL_VERSION | cut -d- -f1)
    if [ $(grep -o "\." <<<"$LINUX_VER" | wc -l) -eq 1 ]; then
        KERNEL_VERSION="${LINUX_VER}.0-${KERNEL_VERSION:(-1)}"
    fi
-    depmod ${KERNEL_VERSION}-ARCH
+    depmod $(basename $(find /usr/lib/modules -type d -iname $KERNEL_VERSION\*))
    MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
    if [[ $MK_CONF == '0' ]]; then
        if [[ $1 == 'remove' ]]; then