[arch-commits] Commit in vagrant/repos (6 files)
Jonathan Steel
jsteel at archlinux.org
Wed Jul 23 20:30:23 UTC 2014
Date: Wednesday, July 23, 2014 @ 22:30:23
Author: jsteel
Revision: 116187
archrelease: copy trunk to community-i686, community-x86_64
Added:
vagrant/repos/community-i686/PKGBUILD
(from rev 116186, vagrant/trunk/PKGBUILD)
vagrant/repos/community-i686/nfs.patch
(from rev 116186, vagrant/trunk/nfs.patch)
vagrant/repos/community-x86_64/PKGBUILD
(from rev 116186, vagrant/trunk/PKGBUILD)
vagrant/repos/community-x86_64/nfs.patch
(from rev 116186, vagrant/trunk/nfs.patch)
Deleted:
vagrant/repos/community-i686/PKGBUILD
vagrant/repos/community-x86_64/PKGBUILD
----------------------------+
/PKGBUILD | 124 +++++++++++++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 55 -------------------
community-i686/nfs.patch | 20 ++++++
community-x86_64/PKGBUILD | 55 -------------------
community-x86_64/nfs.patch | 20 ++++++
5 files changed, 164 insertions(+), 110 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-07-23 20:30:03 UTC (rev 116186)
+++ community-i686/PKGBUILD 2014-07-23 20:30:23 UTC (rev 116187)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
-# Contributor: Ido Rosen <ido at kernel.org>
-# Contributor: Brett Hoerner <brett at bretthoerner.com>
-# Contributor: Jochen Schalanda <jochen+aur at schalanda.name>
-# Contributor: Mathieu Clabaut <mathieu.clabaut at gmail.com>
-# Contributor: helios <aur at wiresphere.de>
-# Contributor: George Ornbo <gornbo at gmail.com>
-# Contributor: Niklas Heer <niklas.heer at me.com>
-# Contributor: Steven Nance <steven at devtrw.com>
-
-pkgname=vagrant
-pkgver=1.6.3
-pkgrel=1
-pkgdesc="Build and distribute virtualized development environments"
-arch=('i686' 'x86_64')
-url="http://vagrantup.com"
-license=('MIT')
-options=('!emptydirs')
-depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump')
-makedepends=('git')
-source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
- http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
-md5sums=('55a91a9d9cba7b8b9d126c75b114e510')
-[[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
-[[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
-
- EMBEDDED_DIR="$srcdir"/substrate/embedded
-
- echo -n $pkgver > "$srcdir"/substrate/${pkgname}_version
-
- "$EMBEDDED_DIR"/bin/gem build $pkgname.gemspec
-
- GEM_PATH="$EMBEDDED_DIR"/gems GEM_HOME="$GEM_PATH" \
- GEMRC="$EMBEDDED_DIR"/etc/gemrc CPPFLAGS="-I$EMBEDDED_DIR"/include \
- LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \
- "$EMBEDDED_DIR"/bin/gem install $pkgname-$pkgver.gem --no-ri --no-rdoc
-}
-
-package() {
- install -d "$pkgdir"/{opt/,usr/bin/,usr/share/bash-completion/completions/}
-
- cp -r "$srcdir"/substrate/ "$pkgdir"/opt/$pkgname/
-
- ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
-
- ln -s /opt/$pkgname/embedded/gems/gems/$pkgname-$pkgver/contrib/bash/completion.sh \
- "$pkgdir"/usr/share/bash-completion/completions/$pkgname
-
- install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: vagrant/repos/community-i686/PKGBUILD (from rev 116186, vagrant/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-07-23 20:30:23 UTC (rev 116187)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
+# Contributor: Ido Rosen <ido at kernel.org>
+# Contributor: Brett Hoerner <brett at bretthoerner.com>
+# Contributor: Jochen Schalanda <jochen+aur at schalanda.name>
+# Contributor: Mathieu Clabaut <mathieu.clabaut at gmail.com>
+# Contributor: helios <aur at wiresphere.de>
+# Contributor: George Ornbo <gornbo at gmail.com>
+# Contributor: Niklas Heer <niklas.heer at me.com>
+# Contributor: Steven Nance <steven at devtrw.com>
+
+pkgname=vagrant
+pkgver=1.6.3
+pkgrel=2
+pkgdesc="Build and distribute virtualized development environments"
+arch=('i686' 'x86_64')
+url="http://vagrantup.com"
+license=('MIT')
+options=('!emptydirs')
+depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump')
+makedepends=('git')
+source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
+ nfs.patch
+ http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
+md5sums=('55a91a9d9cba7b8b9d126c75b114e510' 'a670dd93057fbd782176e0275b034bee')
+[[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
+[[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ patch -Np0 -i "$srcdir"/nfs.patch
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ EMBEDDED_DIR="$srcdir"/substrate/embedded
+
+ echo -n $pkgver > "$srcdir"/substrate/${pkgname}_version
+
+ "$EMBEDDED_DIR"/bin/gem build $pkgname.gemspec
+
+ GEM_PATH="$EMBEDDED_DIR"/gems GEM_HOME="$GEM_PATH" \
+ GEMRC="$EMBEDDED_DIR"/etc/gemrc CPPFLAGS="-I$EMBEDDED_DIR"/include \
+ LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \
+ "$EMBEDDED_DIR"/bin/gem install $pkgname-$pkgver.gem --no-ri --no-rdoc
+}
+
+package() {
+ install -d "$pkgdir"/{opt/,usr/bin/,usr/share/bash-completion/completions/}
+
+ cp -r "$srcdir"/substrate/ "$pkgdir"/opt/$pkgname/
+
+ ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
+
+ ln -s /opt/$pkgname/embedded/gems/gems/$pkgname-$pkgver/contrib/bash/completion.sh \
+ "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: vagrant/repos/community-i686/nfs.patch (from rev 116186, vagrant/trunk/nfs.patch)
===================================================================
--- community-i686/nfs.patch (rev 0)
+++ community-i686/nfs.patch 2014-07-23 20:30:23 UTC (rev 116187)
@@ -0,0 +1,20 @@
+--- plugins/hosts/arch/cap/nfs.rb.orig 2014-07-23 21:02:12.794095252 +0100
++++ plugins/hosts/arch/cap/nfs.rb 2014-07-23 21:06:54.738384725 +0100
+@@ -4,7 +4,7 @@
+ class NFS
+ def self.nfs_check_command(env)
+ if systemd?
+- return "/usr/sbin/systemctl status nfsd"
++ return "/usr/sbin/systemctl status nfs-server"
+ else
+ return "/etc/rc.d/nfs-server status"
+ end
+@@ -12,7 +12,7 @@
+
+ def self.nfs_start_command(env)
+ if systemd?
+- return "/usr/sbin/systemctl start nfsd rpc-idmapd rpc-mountd rpcbind"
++ return "/usr/sbin/systemctl start nfs-server nfs-idmapd nfs-mountd rpcbind"
+ else
+ return "sh -c 'for s in {rpcbind,nfs-common,nfs-server}; do /etc/rc.d/$s start; done'"
+ end
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-07-23 20:30:03 UTC (rev 116186)
+++ community-x86_64/PKGBUILD 2014-07-23 20:30:23 UTC (rev 116187)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
-# Contributor: Ido Rosen <ido at kernel.org>
-# Contributor: Brett Hoerner <brett at bretthoerner.com>
-# Contributor: Jochen Schalanda <jochen+aur at schalanda.name>
-# Contributor: Mathieu Clabaut <mathieu.clabaut at gmail.com>
-# Contributor: helios <aur at wiresphere.de>
-# Contributor: George Ornbo <gornbo at gmail.com>
-# Contributor: Niklas Heer <niklas.heer at me.com>
-# Contributor: Steven Nance <steven at devtrw.com>
-
-pkgname=vagrant
-pkgver=1.6.3
-pkgrel=1
-pkgdesc="Build and distribute virtualized development environments"
-arch=('i686' 'x86_64')
-url="http://vagrantup.com"
-license=('MIT')
-options=('!emptydirs')
-depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump')
-makedepends=('git')
-source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
- http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
-md5sums=('55a91a9d9cba7b8b9d126c75b114e510')
-[[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
-[[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
-
-build() {
- cd "$srcdir"/$pkgname-$pkgver
-
- EMBEDDED_DIR="$srcdir"/substrate/embedded
-
- echo -n $pkgver > "$srcdir"/substrate/${pkgname}_version
-
- "$EMBEDDED_DIR"/bin/gem build $pkgname.gemspec
-
- GEM_PATH="$EMBEDDED_DIR"/gems GEM_HOME="$GEM_PATH" \
- GEMRC="$EMBEDDED_DIR"/etc/gemrc CPPFLAGS="-I$EMBEDDED_DIR"/include \
- LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \
- "$EMBEDDED_DIR"/bin/gem install $pkgname-$pkgver.gem --no-ri --no-rdoc
-}
-
-package() {
- install -d "$pkgdir"/{opt/,usr/bin/,usr/share/bash-completion/completions/}
-
- cp -r "$srcdir"/substrate/ "$pkgdir"/opt/$pkgname/
-
- ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
-
- ln -s /opt/$pkgname/embedded/gems/gems/$pkgname-$pkgver/contrib/bash/completion.sh \
- "$pkgdir"/usr/share/bash-completion/completions/$pkgname
-
- install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: vagrant/repos/community-x86_64/PKGBUILD (from rev 116186, vagrant/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-07-23 20:30:23 UTC (rev 116187)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Jonathan Steel <jsteel at aur.archlinux.org>
+# Contributor: Ido Rosen <ido at kernel.org>
+# Contributor: Brett Hoerner <brett at bretthoerner.com>
+# Contributor: Jochen Schalanda <jochen+aur at schalanda.name>
+# Contributor: Mathieu Clabaut <mathieu.clabaut at gmail.com>
+# Contributor: helios <aur at wiresphere.de>
+# Contributor: George Ornbo <gornbo at gmail.com>
+# Contributor: Niklas Heer <niklas.heer at me.com>
+# Contributor: Steven Nance <steven at devtrw.com>
+
+pkgname=vagrant
+pkgver=1.6.3
+pkgrel=2
+pkgdesc="Build and distribute virtualized development environments"
+arch=('i686' 'x86_64')
+url="http://vagrantup.com"
+license=('MIT')
+options=('!emptydirs')
+depends=('ruby' 'curl' 'lzo2' 'libidn' 'rtmpdump')
+makedepends=('git')
+source=(http://github.com/mitchellh/$pkgname/archive/v$pkgver.tar.gz
+ nfs.patch
+ http://pkgbuild.com/~jsteel/aur/$pkgname/substrate_archlinux_$CARCH.zip)
+md5sums=('55a91a9d9cba7b8b9d126c75b114e510' 'a670dd93057fbd782176e0275b034bee')
+[[ $CARCH == i686 ]] && md5sums[3]='c04042b24de56d18a041bc005e5ecaa4'
+[[ $CARCH == x86_64 ]] && md5sums[3]='53d8a137e0b50fee8509a7d1c15fd33b'
+
+prepare() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ patch -Np0 -i "$srcdir"/nfs.patch
+}
+
+build() {
+ cd "$srcdir"/$pkgname-$pkgver
+
+ EMBEDDED_DIR="$srcdir"/substrate/embedded
+
+ echo -n $pkgver > "$srcdir"/substrate/${pkgname}_version
+
+ "$EMBEDDED_DIR"/bin/gem build $pkgname.gemspec
+
+ GEM_PATH="$EMBEDDED_DIR"/gems GEM_HOME="$GEM_PATH" \
+ GEMRC="$EMBEDDED_DIR"/etc/gemrc CPPFLAGS="-I$EMBEDDED_DIR"/include \
+ LDFLAGS="-L$EMBEDDED_DIR"/lib PATH="$EMBEDDED_DIR/bin:$PATH" \
+ "$EMBEDDED_DIR"/bin/gem install $pkgname-$pkgver.gem --no-ri --no-rdoc
+}
+
+package() {
+ install -d "$pkgdir"/{opt/,usr/bin/,usr/share/bash-completion/completions/}
+
+ cp -r "$srcdir"/substrate/ "$pkgdir"/opt/$pkgname/
+
+ ln -s /opt/$pkgname/bin/$pkgname "$pkgdir"/usr/bin/$pkgname
+
+ ln -s /opt/$pkgname/embedded/gems/gems/$pkgname-$pkgver/contrib/bash/completion.sh \
+ "$pkgdir"/usr/share/bash-completion/completions/$pkgname
+
+ install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Copied: vagrant/repos/community-x86_64/nfs.patch (from rev 116186, vagrant/trunk/nfs.patch)
===================================================================
--- community-x86_64/nfs.patch (rev 0)
+++ community-x86_64/nfs.patch 2014-07-23 20:30:23 UTC (rev 116187)
@@ -0,0 +1,20 @@
+--- plugins/hosts/arch/cap/nfs.rb.orig 2014-07-23 21:02:12.794095252 +0100
++++ plugins/hosts/arch/cap/nfs.rb 2014-07-23 21:06:54.738384725 +0100
+@@ -4,7 +4,7 @@
+ class NFS
+ def self.nfs_check_command(env)
+ if systemd?
+- return "/usr/sbin/systemctl status nfsd"
++ return "/usr/sbin/systemctl status nfs-server"
+ else
+ return "/etc/rc.d/nfs-server status"
+ end
+@@ -12,7 +12,7 @@
+
+ def self.nfs_start_command(env)
+ if systemd?
+- return "/usr/sbin/systemctl start nfsd rpc-idmapd rpc-mountd rpcbind"
++ return "/usr/sbin/systemctl start nfs-server nfs-idmapd nfs-mountd rpcbind"
+ else
+ return "sh -c 'for s in {rpcbind,nfs-common,nfs-server}; do /etc/rc.d/$s start; done'"
+ end
More information about the arch-commits
mailing list