ports/contrib (3.1): {spl, zfs}-git: Fixed package names, pinned revisions and used archived tarballs
commit 5348da32ca8682d2c49fc7c125581d556b4ca4bd Author: James Mills <prologic@shortcircuit.net.au> Date: Wed Apr 1 20:13:34 2015 +1000 {spl,zfs}-git: Fixed package names, pinned revisions and used archived tarballs diff --git a/spl-git/.md5sum b/spl-git/.md5sum index e69de29..b09f422 100644 --- a/spl-git/.md5sum +++ b/spl-git/.md5sum @@ -0,0 +1 @@ +1165da923bab457b85c304839ef451b6 spl-git-fade6b00b6.tar.gz diff --git a/spl-git/Pkgfile b/spl-git/Pkgfile index 09f4dd6..d5f45ac 100644 --- a/spl-git/Pkgfile +++ b/spl-git/Pkgfile @@ -4,18 +4,12 @@ # # Depends on: -name=spl -version=HEAD +name=spl-git +version=fade6b00b6 release=1 -source=() +source=(http://shortcircuit.net.au/~prologic/distfiles/${name}-${version}.tar.gz) build() { - if [ ! -d $PKGMK_SOURCE_DIR/${name}.git ]; then - git clone https://github.com/zfsonlinux/${name}.git $PKGMK_SOURCE_DIR/${name}.git - else - cp -a $PKGMK_SOURCE_DIR/${name}.git $SRC/$name-$version - fi - cd $name-$version ./autogen.sh diff --git a/zfs-git/.footprint b/zfs-git/.footprint index 07a75eb..21ceae7 100644 --- a/zfs-git/.footprint +++ b/zfs-git/.footprint @@ -23,10 +23,9 @@ drwxr-xr-x root/root lib/udev/rules.d/ -rw-r--r-- root/root lib/udev/rules.d/90-zfs.rules -rwxr-xr-x root/root lib/udev/vdev_id -rwxr-xr-x root/root lib/udev/zvol_id -drwxr-xr-x root/root sbin/ --rwxr-xr-x root/root sbin/mount.zfs drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ +-rwxr-xr-x root/root usr/bin/arc_summary.py -rwxr-xr-x root/root usr/bin/arcstat.py -rwxr-xr-x root/root usr/bin/dbufstat.py drwxr-xr-x root/root usr/etc/ @@ -108,7 +107,6 @@ drwxr-xr-x root/root usr/include/libspl/sys/dktp/ -rw-r--r-- root/root usr/include/libspl/sys/param.h -rw-r--r-- root/root usr/include/libspl/sys/priv.h -rw-r--r-- root/root usr/include/libspl/sys/processor.h --rw-r--r-- root/root usr/include/libspl/sys/sdt.h -rw-r--r-- root/root usr/include/libspl/sys/stack.h -rw-r--r-- root/root usr/include/libspl/sys/stat.h -rw-r--r-- root/root usr/include/libspl/sys/stropts.h @@ -124,7 +122,6 @@ drwxr-xr-x root/root usr/include/libspl/sys/sysevent/ -rw-r--r-- root/root usr/include/libspl/sys/types32.h -rw-r--r-- root/root usr/include/libspl/sys/tzfile.h -rw-r--r-- root/root usr/include/libspl/sys/uio.h --rw-r--r-- root/root usr/include/libspl/sys/utsname.h -rw-r--r-- root/root usr/include/libspl/sys/va_list.h -rw-r--r-- root/root usr/include/libspl/sys/varargs.h -rw-r--r-- root/root usr/include/libspl/sys/vnode.h @@ -147,8 +144,10 @@ drwxr-xr-x root/root usr/include/libzfs/ drwxr-xr-x root/root usr/include/libzfs/linux/ drwxr-xr-x root/root usr/include/libzfs/sys/ -rw-r--r-- root/root usr/include/libzfs/sys/arc.h +-rw-r--r-- root/root usr/include/libzfs/sys/arc_impl.h -rw-r--r-- root/root usr/include/libzfs/sys/avl.h -rw-r--r-- root/root usr/include/libzfs/sys/avl_impl.h +-rw-r--r-- root/root usr/include/libzfs/sys/blkptr.h -rw-r--r-- root/root usr/include/libzfs/sys/bplist.h -rw-r--r-- root/root usr/include/libzfs/sys/bpobj.h -rw-r--r-- root/root usr/include/libzfs/sys/bptree.h @@ -162,6 +161,7 @@ drwxr-xr-x root/root usr/include/libzfs/sys/ -rw-r--r-- root/root usr/include/libzfs/sys/dmu_tx.h -rw-r--r-- root/root usr/include/libzfs/sys/dmu_zfetch.h -rw-r--r-- root/root usr/include/libzfs/sys/dnode.h +-rw-r--r-- root/root usr/include/libzfs/sys/dsl_bookmark.h -rw-r--r-- root/root usr/include/libzfs/sys/dsl_dataset.h -rw-r--r-- root/root usr/include/libzfs/sys/dsl_deadlist.h -rw-r--r-- root/root usr/include/libzfs/sys/dsl_deleg.h @@ -184,14 +184,27 @@ drwxr-xr-x root/root usr/include/libzfs/sys/fs/ -rw-r--r-- root/root usr/include/libzfs/sys/metaslab_impl.h -rw-r--r-- root/root usr/include/libzfs/sys/nvpair.h -rw-r--r-- root/root usr/include/libzfs/sys/nvpair_impl.h +-rw-r--r-- root/root usr/include/libzfs/sys/range_tree.h -rw-r--r-- root/root usr/include/libzfs/sys/refcount.h -rw-r--r-- root/root usr/include/libzfs/sys/rrwlock.h -rw-r--r-- root/root usr/include/libzfs/sys/sa.h -rw-r--r-- root/root usr/include/libzfs/sys/sa_impl.h +-rw-r--r-- root/root usr/include/libzfs/sys/sdt.h -rw-r--r-- root/root usr/include/libzfs/sys/spa.h -rw-r--r-- root/root usr/include/libzfs/sys/spa_boot.h -rw-r--r-- root/root usr/include/libzfs/sys/spa_impl.h -rw-r--r-- root/root usr/include/libzfs/sys/space_map.h +-rw-r--r-- root/root usr/include/libzfs/sys/space_reftree.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_acl.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_arc.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_dbgmsg.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_dbuf.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_dmu.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_dnode.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_txg.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_zil.h +-rw-r--r-- root/root usr/include/libzfs/sys/trace_zrlock.h -rw-r--r-- root/root usr/include/libzfs/sys/txg.h -rw-r--r-- root/root usr/include/libzfs/sys/txg_impl.h -rw-r--r-- root/root usr/include/libzfs/sys/u8_textprep.h @@ -238,20 +251,23 @@ drwxr-xr-x root/root usr/include/libzfs/sys/fs/ -rw-r--r-- root/root usr/include/libzfs/zfs_prop.h -rw-r--r-- root/root usr/include/libzfs/zpios-ctl.h drwxr-xr-x root/root usr/include/zfs/ -drwxr-xr-x root/root usr/include/zfs/3.12.17/ --rw-r--r-- root/root usr/include/zfs/3.12.17/Module.symvers --rw-r--r-- root/root usr/include/zfs/3.12.17/zfs.release --rw-r--r-- root/root usr/include/zfs/3.12.17/zfs_config.h +drwxr-xr-x root/root usr/include/zfs/3.12.24/ +-rw-r--r-- root/root usr/include/zfs/3.12.24/Module.symvers +-rw-r--r-- root/root usr/include/zfs/3.12.24/zfs.release +-rw-r--r-- root/root usr/include/zfs/3.12.24/zfs_config.h drwxr-xr-x root/root usr/include/zfs/include/ drwxr-xr-x root/root usr/include/zfs/include/linux/ -rw-r--r-- root/root usr/include/zfs/include/linux/blkdev_compat.h -rw-r--r-- root/root usr/include/zfs/include/linux/dcache_compat.h +-rw-r--r-- root/root usr/include/zfs/include/linux/utsname_compat.h -rw-r--r-- root/root usr/include/zfs/include/linux/vfs_compat.h -rw-r--r-- root/root usr/include/zfs/include/linux/xattr_compat.h drwxr-xr-x root/root usr/include/zfs/include/sys/ -rw-r--r-- root/root usr/include/zfs/include/sys/arc.h +-rw-r--r-- root/root usr/include/zfs/include/sys/arc_impl.h -rw-r--r-- root/root usr/include/zfs/include/sys/avl.h -rw-r--r-- root/root usr/include/zfs/include/sys/avl_impl.h +-rw-r--r-- root/root usr/include/zfs/include/sys/blkptr.h -rw-r--r-- root/root usr/include/zfs/include/sys/bplist.h -rw-r--r-- root/root usr/include/zfs/include/sys/bpobj.h -rw-r--r-- root/root usr/include/zfs/include/sys/bptree.h @@ -265,6 +281,7 @@ drwxr-xr-x root/root usr/include/zfs/include/sys/ -rw-r--r-- root/root usr/include/zfs/include/sys/dmu_tx.h -rw-r--r-- root/root usr/include/zfs/include/sys/dmu_zfetch.h -rw-r--r-- root/root usr/include/zfs/include/sys/dnode.h +-rw-r--r-- root/root usr/include/zfs/include/sys/dsl_bookmark.h -rw-r--r-- root/root usr/include/zfs/include/sys/dsl_dataset.h -rw-r--r-- root/root usr/include/zfs/include/sys/dsl_deadlist.h -rw-r--r-- root/root usr/include/zfs/include/sys/dsl_deleg.h @@ -287,14 +304,27 @@ drwxr-xr-x root/root usr/include/zfs/include/sys/fs/ -rw-r--r-- root/root usr/include/zfs/include/sys/metaslab_impl.h -rw-r--r-- root/root usr/include/zfs/include/sys/nvpair.h -rw-r--r-- root/root usr/include/zfs/include/sys/nvpair_impl.h +-rw-r--r-- root/root usr/include/zfs/include/sys/range_tree.h -rw-r--r-- root/root usr/include/zfs/include/sys/refcount.h -rw-r--r-- root/root usr/include/zfs/include/sys/rrwlock.h -rw-r--r-- root/root usr/include/zfs/include/sys/sa.h -rw-r--r-- root/root usr/include/zfs/include/sys/sa_impl.h +-rw-r--r-- root/root usr/include/zfs/include/sys/sdt.h -rw-r--r-- root/root usr/include/zfs/include/sys/spa.h -rw-r--r-- root/root usr/include/zfs/include/sys/spa_boot.h -rw-r--r-- root/root usr/include/zfs/include/sys/spa_impl.h -rw-r--r-- root/root usr/include/zfs/include/sys/space_map.h +-rw-r--r-- root/root usr/include/zfs/include/sys/space_reftree.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_acl.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_arc.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_dbgmsg.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_dbuf.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_dmu.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_dnode.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_txg.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_zil.h +-rw-r--r-- root/root usr/include/zfs/include/sys/trace_zrlock.h -rw-r--r-- root/root usr/include/zfs/include/sys/txg.h -rw-r--r-- root/root usr/include/zfs/include/sys/txg_impl.h -rw-r--r-- root/root usr/include/zfs/include/sys/u8_textprep.h @@ -351,6 +381,7 @@ drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/dracut/ drwxr-xr-x root/root usr/lib/dracut/modules.d/ drwxr-xr-x root/root usr/lib/dracut/modules.d/90zfs/ +-rwxr-xr-x root/root usr/lib/dracut/modules.d/90zfs/export-zfs.sh -rwxr-xr-x root/root usr/lib/dracut/modules.d/90zfs/module-setup.sh -rwxr-xr-x root/root usr/lib/dracut/modules.d/90zfs/mount-zfs.sh -rwxr-xr-x root/root usr/lib/dracut/modules.d/90zfs/parse-zfs.sh @@ -411,6 +442,7 @@ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/ztest.1.gz drwxr-xr-x root/root usr/man/man5/ -rw-r--r-- root/root usr/man/man5/vdev_id.conf.5.gz +-rw-r--r-- root/root usr/man/man5/zfs-events.5.gz -rw-r--r-- root/root usr/man/man5/zfs-module-parameters.5.gz -rw-r--r-- root/root usr/man/man5/zpool-features.5.gz drwxr-xr-x root/root usr/man/man8/ @@ -425,6 +457,7 @@ drwxr-xr-x root/root usr/man/man8/ -rw-r--r-- root/root usr/man/man8/zstreamdump.8.gz drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/fsck.zfs +-rwxr-xr-x root/root usr/sbin/mount.zfs -rwxr-xr-x root/root usr/sbin/zdb -rwxr-xr-x root/root usr/sbin/zed -rwxr-xr-x root/root usr/sbin/zfs @@ -435,6 +468,9 @@ drwxr-xr-x root/root usr/sbin/ -rwxr-xr-x root/root usr/sbin/zstreamdump -rwxr-xr-x root/root usr/sbin/ztest drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/pkgconfig/ +-rw-r--r-- root/root usr/share/pkgconfig/libzfs.pc +-rw-r--r-- root/root usr/share/pkgconfig/libzfs_core.pc drwxr-xr-x root/root usr/share/zfs/ -rwxr-xr-x root/root usr/share/zfs/common.sh -rwxr-xr-x root/root usr/share/zfs/smb.sh diff --git a/zfs-git/.md5sum b/zfs-git/.md5sum index e69de29..a239be5 100644 --- a/zfs-git/.md5sum +++ b/zfs-git/.md5sum @@ -0,0 +1 @@ +1c648556460768c012b7da81a94adb7d zfs-git-0f7d2a4b3d.tar.gz diff --git a/zfs-git/Pkgfile b/zfs-git/Pkgfile index ed8e74a..e6bfcc5 100644 --- a/zfs-git/Pkgfile +++ b/zfs-git/Pkgfile @@ -4,26 +4,19 @@ # Depends on: spl-git -name=zfs -version=HEAD -release=2 -source=() +name=zfs-git +version=0f7d2a4b3d +release=1 +source=(http://shortcircuit.net.au/~prologic/distfiles/${name}-${version}.tar.gz) build() { - if [ ! -d $PKGMK_SOURCE_DIR/${name}.git ]; then - git clone https://github.com/zfsonlinux/${name}.git $PKGMK_SOURCE_DIR/${name}.git - cp -a $PKGMK_SOURCE_DIR/${name}.git $SRC/$name-$version - else - cp -a $PKGMK_SOURCE_DIR/${name}.git $SRC/$name-$version - fi - cd $name-$version ./autogen.sh # Configure ./configure --prefix=/usr \ - --libexecdir=/usr/lib/$name \ + --libexecdir=/usr/lib/zfs \ --mandir=/usr/man \ --with-spl=/usr/include/spl @@ -36,5 +29,5 @@ build() { # Package make DESTDIR=$PKG install - mkdir -p $PKG/etc/zfs + install -d -D -m 755 $PKG/etc/zfs }
participants (1)
-
crux@crux.nu