Permalink
Browse files

Use `--xz` in pacman's tar, update Vagrantfile

  • Loading branch information...
1 parent 5d17bbd commit 29280b56ae46d5cffd65a5b941c115b80f06f2d0 @djhaskin987 djhaskin987 committed Oct 10, 2015
Showing with 19 additions and 25 deletions.
  1. +11 −17 Vagrantfile
  2. +7 −7 lib/fpm/package/pacman.rb
  3. +1 −1 test/vagrant.pp
View
@@ -1,47 +1,41 @@
# -*- mode: ruby -*-
# vi: set ft=ruby :
-$arch_install_puppet_script = <<EOF
-yaourt --sucre
-yaourt -S --noconfirm --needed puppet
-EOF
-
Vagrant.configure("2") do |config|
# All Vagrant configuration is done here. The most common configuration
# options are documented and commented below. For a complete reference,
# please see the online documentation at vagrantup.com.
config.vm.define "centos6" do |centos6|
- centos6.vm.box = "centos6"
- centos6.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-puppet.box"
+ centos6.vm.box = "puppetlabs/centos-6.6-64-puppet"
+ end
+
+ config.vm.define "centos7" do |centos7|
+ centos7.vm.box = "puppetlabs/centos-7.0-64-puppet"
end
config.vm.define "debian6" do |debian6|
- debian6.vm.box = "debian6"
- debian6.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210.box"
+ debian6.vm.box = "puppetlabs/debian-6.0.10-64-puppet"
end
config.vm.define "debian7" do |debian7|
- debian7.vm.box = "debian7"
- debian7.vm.box_url = "http://puppet-vagrant-boxes.puppetlabs.com/debian-73-x64-virtualbox-puppet.box"
+ debian7.vm.box = "puppetlabs/centos-7.0-64-puppet"
end
config.vm.define "arch" do |arch|
arch.vm.box = "jfredett/arch-puppet"
end
+ config.vm.define "freebsd10" do |freebsd10|
+ freebsd10.vm.box = "tjay/freebsd-10.1"
+ end
+
config.vm.define :smartos do |smartos|
smartos.vm.box = "smartos-base1310-64-virtualbox-20130806.box"
smartos.vm.box_url = "http://dlc-int.openindiana.org/aszeszo/vagrant/smartos-base1310-64-virtualbox-20130806.box"
end
- config.vm.define "arch" do |arch|
- arch.vm.box = "arch64"
- arch.vm.box_url = "http://cloud.terry.im/vagrant/archlinux-x86_64.box"
- arch.vm.provision "shell", inline: $arch_install_puppet_script
- end
-
config.vm.provision :puppet do |puppet|
puppet.manifests_path = "test"
puppet.manifest_file = "vagrant.pp"
@@ -205,15 +205,15 @@ def input(pacman_pkg_path)
def compression_option
case self.attributes[:pacman_compression]
when nil, "xz"
- return "J"
+ return "--xz"
when "none"
return ""
when "gz"
- return "z"
+ return "-z"
when "bzip2"
- return "j"
+ return "-j"
else
- return "J"
+ return "--xz"
end
end
@@ -262,11 +262,11 @@ def output(output_path)
generate_mtree
- tar_options = "c#{compression_option}f"
-
with(File.expand_path(output_path)) do |path|
::Dir.chdir(build_path) do
- safesystem(*(["tar", tar_options,
+ safesystem(*(["tar",
+ compression_option,
+ "-cf",
path] + data_tar_flags + \
::Dir.entries(".").reject{|entry| entry =~ /^\.{1,2}$/ }))
end
View
@@ -29,4 +29,4 @@
"ruby$devsuffix": ensure => latest;
}
-Exec["update-packages"] -> Package <| |>
+Exec["update-packages"] -> Package <| |>

0 comments on commit 29280b5

Please sign in to comment.