Update git packages to pkgrel=2

Remove custom created patches and defer to makepkg for git source retrieval.
11 years ago · 4b6f934c12
parent ea05db990c
commit 4b6f934c12
5 changed files with 22 additions and 57 deletions
--- a/conf.sh
+++ b/conf.sh
@ -2,7 +2,9 @@
 AZB_ZOL_VERSION="0.6.2"

 # Kernel version for GIT packages
-AZB_GIT_PKGREL="1"
+AZB_GIT_SPL_COMMIT="89aa970"
+AZB_GIT_ZFS_COMMIT="4fd762f"
+AZB_GIT_PKGREL="2"
 AZB_GIT_KERNEL_VERSION="3.14.1"
 AZB_GIT_KERNEL_X32_PKGREL="1"
 AZB_GIT_KERNEL_X64_PKGREL="1"
@ -31,10 +33,6 @@ AZB_KERNEL_ARCHISO_PKGREL="1"
 # AZB_KERNEL_TEST_PKG_VERSION="${AZB_ZOL_VERSION}_${AZB_KERNEL_TEST_VERSION}"
 # AZB_KERNEL_TEST_FULL_VERSION="${AZB_KERNEL_TEST_PKG_VERSION}-${AZB_GIT_PKGREL}"

-# The paths to the ZOL git repos
-AZB_ZFS_GIT_PATH="/home/demizer/src/c/zfs"
-AZB_SPL_GIT_PATH="/home/demizer/src/c/spl"
-
 # Notification address
 AZB_EMAIL="jeezusjr@gmail.com"

--- a/spl-git/PKGBUILD
+++ b/spl-git/PKGBUILD
@ -29,29 +29,20 @@ fi

 pkgdesc="Solaris Porting Layer kernel modules."
 depends=("spl-utils-git" "linux=${_kernel_version}")
-makedepends=("linux-headers=${_kernel_version}")
+makedepends=("git" "linux-headers=${_kernel_version}")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz"
-        "http://demizerone.com/patches/spl-0.6.2-r33-g89aa970.patch.tar.xz")
+source=("git+https://github.com/zfsonlinux/spl.git#commit=4444111")
 groups=("archzfs-git")
-md5sums=('f00535bf89a7fde0e08f44a14a1f1e03'
-         '47996445b30f932c3bc516f0e3d43ef2')
+md5sums=('SKIP')
 license=("GPL")
 install=spl.install
 replaces=("spl")
 provides=("spl")
 conflicts=("spl" "spl-lts")

-prepare() {
-    cd "${srcdir}"
-    tar --xz -xf spl-0.6.2-r33-g89aa970.patch.tar.xz
-    cd "${srcdir}/spl-0.6.2"
-    patch -Np1 < ../spl-0.6.2-r33-g89aa970.patch
-}
-
 build() {
-    cd "${srcdir}/spl-0.6.2"
+    cd "${srcdir}/spl"
    ./autogen.sh

    _at_enable=""
@ -68,7 +59,7 @@ build() {
 }

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

    mv "${pkgdir}/lib" "${pkgdir}/usr/"
--- a/spl-utils-git/PKGBUILD
+++ b/spl-utils-git/PKGBUILD
@ -11,29 +11,21 @@ pkgname="spl-utils-git"
 pkgver=0.6.2_r33_g89aa970_3.14.1_1
 pkgrel=1
 pkgdesc="Solaris Porting Layer kernel module support files."
+makedepends=("git")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.2.tar.gz"
-        "http://demizerone.com/patches/spl-0.6.2-r33-g89aa970.patch.tar.xz"
+source=("git+https://github.com/zfsonlinux/spl.git#commit=4444111"
        "spl-utils.hostid")
 groups=("archzfs-git")
 md5sums=('f00535bf89a7fde0e08f44a14a1f1e03'
-         '47996445b30f932c3bc516f0e3d43ef2'
         'a54f0041a9e15b050f25c463f1db7449')
 license=("GPL")
 replaces=("spl-utils")
 provides=("spl-utils")
 conflicts=("spl-utils" "spl-utils-lts")

-prepare() {
-    cd "${srcdir}"
-    tar --xz -xf spl-0.6.2-r33-g89aa970.patch.tar.xz
-    cd "${srcdir}/spl-0.6.2"
-    patch -Np1 < ../spl-0.6.2-r33-g89aa970.patch
-}
-
 build() {
-    cd "${srcdir}/spl-0.6.2"
+    cd "${srcdir}/spl"
    ./autogen.sh

    _at_enable=""
@ -49,7 +41,7 @@ build() {
 }

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

    install -D -m644 "${srcdir}"/spl-utils.hostid "${pkgdir}"/etc/hostid
--- a/zfs-git/PKGBUILD
+++ b/zfs-git/PKGBUILD
@ -29,11 +29,10 @@ fi

 pkgdesc="Kernel modules for the Zettabyte File System."
 depends=("spl-git" "zfs-utils-git" "linux=${_kernel_version}")
-makedepends=("linux-headers=${_kernel_version}")
+makedepends=("git" "linux-headers=${_kernel_version}")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz"
-        "http://demizerone.com/patches/zfs-0.6.2-r258-g4fd762f.patch.tar.xz")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=4444111")
 groups=("archzfs-git")
 md5sums=('0b183b0abdd5be287046ad9ce4f899fd'
         '577cc119618ad580d87b470463c1ef55')
@ -43,15 +42,8 @@ replaces=("zfs")
 provides=("zfs")
 conflicts=("zfs" "zfs-lts")

-prepare() {
-    cd "${srcdir}"
-    tar --xz -xf zfs-0.6.2-r258-g4fd762f.patch.tar.xz
-    cd "${srcdir}/zfs-0.6.2"
-    patch -Np1 < ../zfs-0.6.2-r258-g4fd762f.patch
-}
-
 build() {
-    cd "${srcdir}/zfs-0.6.2"
+    cd "${srcdir}/zfs"
    ./autogen.sh

    ./configure --prefix=/usr \
@ -61,7 +53,7 @@ build() {
                --datadir=/usr/share \
                --includedir=/usr/include \
                --with-udevdir=/lib/udev \
-                --libexecdir=/usr/lib/zfs-0.6.2 \
+                --libexecdir=/usr/lib/zfs \
                --with-config=kernel \
                --with-linux=/usr/lib/modules/${_kernel_version_full}-ARCH/build

@ -69,7 +61,7 @@ build() {
 }

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

    cp -r "$pkgdir"/{lib,usr}
--- a/zfs-utils-git/PKGBUILD
+++ b/zfs-utils-git/PKGBUILD
@ -12,16 +12,15 @@ pkgver=0.6.2_r258_g4fd762f_3.14.1_1
 pkgrel=1
 pkgdesc="Kernel module support files for the Zettabyte File System."
 depends=("spl-git")
+makedepends=("git")
 arch=("i686" "x86_64")
 url="http://zfsonlinux.org/"
-source=("http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.2.tar.gz"
-        "http://demizerone.com/patches/zfs-0.6.2-r258-g4fd762f.patch.tar.xz"
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=4444111"
        "zfs-utils.bash-completion-r1"
        "zfs-utils.initcpio.install"
        "zfs-utils.initcpio.hook")
 groups=("archzfs-git")
 md5sums=('0b183b0abdd5be287046ad9ce4f899fd'
-         '577cc119618ad580d87b470463c1ef55'
         '9ddb0c8a94861f929d0fa741fdc49950'
         'ebea2b1e593a9a19efa0f7ae7451bbc7'
         'b567a95a34759f196bf4be8061a895e5')
@ -30,15 +29,8 @@ replaces=("zfs-utils")
 provides=("zfs-utils")
 conflicts=("zfs-utils" "zfs-utils-lts")

-prepare() {
-    cd "${srcdir}"
-    tar --xz -xf zfs-0.6.2-r258-g4fd762f.patch.tar.xz
-    cd "${srcdir}/zfs-0.6.2"
-    patch -Np1 < ../zfs-0.6.2-r258-g4fd762f.patch
-}
-
 build() {
-    cd "${srcdir}/zfs-0.6.2"
+    cd "${srcdir}/zfs"
    ./autogen.sh

    ./configure --prefix=/usr \
@ -48,13 +40,13 @@ build() {
                --datadir=/usr/share \
                --includedir=/usr/include \
                --with-udevdir=/lib/udev \
-                --libexecdir=/usr/lib/zfs-0.6.2 \
+                --libexecdir=/usr/lib/zfs \
                --with-config=user
    make
 }

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

    # Remove uneeded files