[arch-commits] Commit in vagrant-substrate/repos (6 files)
Jonathan Steel
jsteel at archlinux.org
Tue Nov 8 19:15:32 UTC 2016
Date: Tuesday, November 8, 2016 @ 19:15:32
Author: jsteel
Revision: 195171
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
vagrant-substrate/repos/community-testing-i686/PKGBUILD
(from rev 195170, vagrant-substrate/trunk/PKGBUILD)
vagrant-substrate/repos/community-testing-x86_64/PKGBUILD
(from rev 195170, vagrant-substrate/trunk/PKGBUILD)
Deleted:
vagrant-substrate/repos/community-testing-i686/PKGBUILD
vagrant-substrate/repos/community-testing-i686/readline.patch
vagrant-substrate/repos/community-testing-x86_64/PKGBUILD
vagrant-substrate/repos/community-testing-x86_64/readline.patch
-----------------------------------------+
/PKGBUILD | 128 ++++++++++++++++++++++++++++++
community-testing-i686/PKGBUILD | 68 ---------------
community-testing-i686/readline.patch | 10 --
community-testing-x86_64/PKGBUILD | 68 ---------------
community-testing-x86_64/readline.patch | 10 --
5 files changed, 128 insertions(+), 156 deletions(-)
Deleted: community-testing-i686/PKGBUILD
===================================================================
--- community-testing-i686/PKGBUILD 2016-11-08 19:12:45 UTC (rev 195170)
+++ community-testing-i686/PKGBUILD 2016-11-08 19:15:32 UTC (rev 195171)
@@ -1,68 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-
-pkgname=vagrant-substrate
-_pkgname=vagrant-installers
-pkgver=554.9772186
-pkgrel=2
-pkgdesc="Substrate layer for Vagrant"
-arch=('i686' 'x86_64')
-url="http://vagrantup.com"
-license=('MIT')
-options=('!emptydirs' '!makeflags')
-makedepends=('git' 'puppet' 'chrpath' 'wget')
-depends=('lzo')
-source=(git://github.com/mitchellh/$_pkgname.git#commit=9772186
- readline.patch)
-md5sums=('SKIP'
- 'a4f87b2483c7bd724bb94a69aa5cf733')
-
-pkgver() {
- cd $_pkgname
-
- echo $(git rev-list --count HEAD).$(git describe --always)
-}
-
-prepare() {
- cd $_pkgname/substrate
-
- # Use $srcdir for the working directory
- sed -i "s:/vagrant-substrate:$srcdir/$_pkgname/vagrant-substrate:" \
- hiera/common.yaml
-
- # Use latest openssl
- sed -i 's/openssl-1.0.2e.tar.gz/openssl-1.0.2j.tar.gz/' \
- modules/openssl/manifests/init.pp
-
- # Don't create a zip of the substrate
- sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
-
- # Do not set file ownership
- find . -name *.pp -exec sed -i "/owner.*.=.*.root/d" {} +
- find . -name *.pp -exec sed -i "/group.*.=.*.root/d" {} +
-
- # Fix compile issues
- patch -Np0 -i "$srcdir"/readline.patch
-
- # https://github.com/mitchellh/vagrant-installers/issues/60
- sed -i 's/^ environment/# environment/' modules/ruby/manifests/source.pp
-}
-
-build() {
- cd $_pkgname/substrate
-
- FACTER_param_output_dir="$srcdir" puppet apply \
- --detailed-exitcodes \
- --hiera_config=config/hiera.yaml --confdir=config \
- --modulepath=modules manifests/init.pp || test $? -eq 2
-}
-
-package() {
- cd $_pkgname
-
- install -d "$pkgdir"/opt
-
- cp -r vagrant-substrate/staging "$pkgdir"/opt/vagrant
-
- install -Dm644 LICENSE.md \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: vagrant-substrate/repos/community-testing-i686/PKGBUILD (from rev 195170, vagrant-substrate/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2016-11-08 19:15:32 UTC (rev 195171)
@@ -0,0 +1,64 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=vagrant-substrate
+_pkgname=vagrant-installers
+pkgver=569.8bb245a
+pkgrel=1
+pkgdesc="Substrate layer for Vagrant"
+arch=('i686' 'x86_64')
+url="http://vagrantup.com"
+license=('MIT')
+options=('!emptydirs')
+makedepends=('git' 'puppet' 'chrpath' 'wget')
+depends=('lzo')
+source=(git://github.com/mitchellh/$_pkgname.git#commit=8bb245a)
+md5sums=('SKIP')
+
+pkgver() {
+ cd $_pkgname
+
+ echo $(git rev-list --count HEAD).$(git describe --always)
+}
+
+prepare() {
+ cd $_pkgname/substrate
+
+ # Use $srcdir for the working directory
+ sed -i "s:/vagrant-substrate:$srcdir/$_pkgname/vagrant-substrate:" \
+ hiera/common.yaml
+
+ # Use latest openssl
+ sed -i 's/openssl-1.0.2e.tar.gz/openssl-1.0.2j.tar.gz/' \
+ modules/openssl/manifests/init.pp
+
+ # Don't create a zip of the substrate
+ sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
+
+ # Do not set file ownership
+ find . -name *.pp -exec sed -i "/owner.*.=.*.root/d" {} +
+ find . -name *.pp -exec sed -i "/group.*.=.*.root/d" {} +
+
+ # Fix compile issues
+ # https://github.com/mitchellh/vagrant-installers/issues/60
+ sed -i 's/^ environment/# environment/' modules/ruby/manifests/source.pp
+}
+
+build() {
+ cd $_pkgname/substrate
+
+ FACTER_param_output_dir="$srcdir" puppet apply \
+ --detailed-exitcodes \
+ --hiera_config=config/hiera.yaml --confdir=config \
+ --modulepath=modules manifests/init.pp || test $? -eq 2
+}
+
+package() {
+ cd $_pkgname
+
+ install -d "$pkgdir"/opt
+
+ cp -r vagrant-substrate/staging "$pkgdir"/opt/vagrant
+
+ install -Dm644 LICENSE.md \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: community-testing-i686/readline.patch
===================================================================
--- community-testing-i686/readline.patch 2016-11-08 19:12:45 UTC (rev 195170)
+++ community-testing-i686/readline.patch 2016-11-08 19:15:32 UTC (rev 195171)
@@ -1,10 +0,0 @@
---- modules/readline/manifests/init.pp
-+++ modules/readline/manifests/init.pp
-@@ -61,6 +61,7 @@ class readline(
- cwd => $source_dir_path,
- environment => $real_autotools_environment,
- install_sentinel => "${prefix}/lib/libreadline.a",
-+ make_command => "make SHLIB_LIBS=-lncurses",
- make_notify => $make_notify,
- make_sentinel => "${source_dir_path}/libreadline.a",
- require => Exec["untar-readline"]
Deleted: community-testing-x86_64/PKGBUILD
===================================================================
--- community-testing-x86_64/PKGBUILD 2016-11-08 19:12:45 UTC (rev 195170)
+++ community-testing-x86_64/PKGBUILD 2016-11-08 19:15:32 UTC (rev 195171)
@@ -1,68 +0,0 @@
-# Maintainer: Jonathan Steel <jsteel at archlinux.org>
-
-pkgname=vagrant-substrate
-_pkgname=vagrant-installers
-pkgver=554.9772186
-pkgrel=2
-pkgdesc="Substrate layer for Vagrant"
-arch=('i686' 'x86_64')
-url="http://vagrantup.com"
-license=('MIT')
-options=('!emptydirs' '!makeflags')
-makedepends=('git' 'puppet' 'chrpath' 'wget')
-depends=('lzo')
-source=(git://github.com/mitchellh/$_pkgname.git#commit=9772186
- readline.patch)
-md5sums=('SKIP'
- 'a4f87b2483c7bd724bb94a69aa5cf733')
-
-pkgver() {
- cd $_pkgname
-
- echo $(git rev-list --count HEAD).$(git describe --always)
-}
-
-prepare() {
- cd $_pkgname/substrate
-
- # Use $srcdir for the working directory
- sed -i "s:/vagrant-substrate:$srcdir/$_pkgname/vagrant-substrate:" \
- hiera/common.yaml
-
- # Use latest openssl
- sed -i 's/openssl-1.0.2e.tar.gz/openssl-1.0.2j.tar.gz/' \
- modules/openssl/manifests/init.pp
-
- # Don't create a zip of the substrate
- sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
-
- # Do not set file ownership
- find . -name *.pp -exec sed -i "/owner.*.=.*.root/d" {} +
- find . -name *.pp -exec sed -i "/group.*.=.*.root/d" {} +
-
- # Fix compile issues
- patch -Np0 -i "$srcdir"/readline.patch
-
- # https://github.com/mitchellh/vagrant-installers/issues/60
- sed -i 's/^ environment/# environment/' modules/ruby/manifests/source.pp
-}
-
-build() {
- cd $_pkgname/substrate
-
- FACTER_param_output_dir="$srcdir" puppet apply \
- --detailed-exitcodes \
- --hiera_config=config/hiera.yaml --confdir=config \
- --modulepath=modules manifests/init.pp || test $? -eq 2
-}
-
-package() {
- cd $_pkgname
-
- install -d "$pkgdir"/opt
-
- cp -r vagrant-substrate/staging "$pkgdir"/opt/vagrant
-
- install -Dm644 LICENSE.md \
- "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
-}
Copied: vagrant-substrate/repos/community-testing-x86_64/PKGBUILD (from rev 195170, vagrant-substrate/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2016-11-08 19:15:32 UTC (rev 195171)
@@ -0,0 +1,64 @@
+# Maintainer: Jonathan Steel <jsteel at archlinux.org>
+
+pkgname=vagrant-substrate
+_pkgname=vagrant-installers
+pkgver=569.8bb245a
+pkgrel=1
+pkgdesc="Substrate layer for Vagrant"
+arch=('i686' 'x86_64')
+url="http://vagrantup.com"
+license=('MIT')
+options=('!emptydirs')
+makedepends=('git' 'puppet' 'chrpath' 'wget')
+depends=('lzo')
+source=(git://github.com/mitchellh/$_pkgname.git#commit=8bb245a)
+md5sums=('SKIP')
+
+pkgver() {
+ cd $_pkgname
+
+ echo $(git rev-list --count HEAD).$(git describe --always)
+}
+
+prepare() {
+ cd $_pkgname/substrate
+
+ # Use $srcdir for the working directory
+ sed -i "s:/vagrant-substrate:$srcdir/$_pkgname/vagrant-substrate:" \
+ hiera/common.yaml
+
+ # Use latest openssl
+ sed -i 's/openssl-1.0.2e.tar.gz/openssl-1.0.2j.tar.gz/' \
+ modules/openssl/manifests/init.pp
+
+ # Don't create a zip of the substrate
+ sed -i '48,50d' modules/vagrant_substrate/manifests/init.pp
+
+ # Do not set file ownership
+ find . -name *.pp -exec sed -i "/owner.*.=.*.root/d" {} +
+ find . -name *.pp -exec sed -i "/group.*.=.*.root/d" {} +
+
+ # Fix compile issues
+ # https://github.com/mitchellh/vagrant-installers/issues/60
+ sed -i 's/^ environment/# environment/' modules/ruby/manifests/source.pp
+}
+
+build() {
+ cd $_pkgname/substrate
+
+ FACTER_param_output_dir="$srcdir" puppet apply \
+ --detailed-exitcodes \
+ --hiera_config=config/hiera.yaml --confdir=config \
+ --modulepath=modules manifests/init.pp || test $? -eq 2
+}
+
+package() {
+ cd $_pkgname
+
+ install -d "$pkgdir"/opt
+
+ cp -r vagrant-substrate/staging "$pkgdir"/opt/vagrant
+
+ install -Dm644 LICENSE.md \
+ "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
Deleted: community-testing-x86_64/readline.patch
===================================================================
--- community-testing-x86_64/readline.patch 2016-11-08 19:12:45 UTC (rev 195170)
+++ community-testing-x86_64/readline.patch 2016-11-08 19:15:32 UTC (rev 195171)
@@ -1,10 +0,0 @@
---- modules/readline/manifests/init.pp
-+++ modules/readline/manifests/init.pp
-@@ -61,6 +61,7 @@ class readline(
- cwd => $source_dir_path,
- environment => $real_autotools_environment,
- install_sentinel => "${prefix}/lib/libreadline.a",
-+ make_command => "make SHLIB_LIBS=-lncurses",
- make_notify => $make_notify,
- make_sentinel => "${source_dir_path}/libreadline.a",
- require => Exec["untar-readline"]
More information about the arch-commits
mailing list