On 07/19/2015 09:37 AM, intrigeri wrote: > Adam Burns wrote (18 Jul 2015 21:31:55 GMT) : >> Bingo. Build now completes from current devel branch and generates iso file! > > Yay :) > > May you please share the changes that allowed you to build with > Vagrant 1.7+?
Tested and working under Fedora 21 with vagrant RPM installed from https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.4_x86_64.rpm Did I mention a) I'm learning rake, ruby and rvm? b) this is ugly? ] $ git diff ] diff --git a/Rakefile b/Rakefile ] index 0eeba39..5fe6112 100644 ] --- a/Rakefile ] +++ b/Rakefile ] @@ -18,6 +18,12 @@ ] # You should have received a copy of the GNU General Public License ] # along with this program. If not, see <http://www.gnu.org/licenses/>. ] ] +$LOAD_PATH.unshift File.expand_path('/opt/vagrant/embedded/gems/gems/vagrant-1.7.3/lib/', __FILE__) ] +$LOAD_PATH.unshift File.expand_path('/opt/vagrant/embedded/gems/gems/hashicorp-checkpoint-0.1.4/lib', __FILE__) ] +$LOAD_PATH.unshift File.expand_path('/opt/vagrant/embedded/gems/gems/log4r-1.1.10/lib', __FILE__) ] +$LOAD_PATH.unshift File.expand_path('/opt/vagrant/embedded/gems/gems/childprocess-0.5.5/lib', __FILE__) ] +$LOAD_PATH.unshift File.expand_path('/opt/vagrant/embedded/gems/gems/erubis-2.7.0/lib', __FILE__) ] + ] require 'rbconfig' ] require 'rubygems' ] require 'vagrant' Apparently there are a few methods of elegant recursive require path setting that may or may not depend on different ruby versions. Given that most tails developers are likely building under a Debian based host and a) above, perhaps below will help. Firstly, I can confirm the .DEB file also installs vagrant under /opt, so the same paths should hold. Below is further info on the build ruby / rvm environment: ] $rvm -v ] rvm 1.26.11 (latest) by Wayne E. Seguin <wayneeseg...@gmail.com>, ] Michal Papis <mpa...@gmail.com> [https://rvm.io/] ] $ rvm list rubies ] ] rvm rubies ] ] =* ruby-2.2.1 [ x86_64 ] ] ] # => - current ] # =* - current && default ] # * - default ] ] $ rvm info ] ] ruby-2.2.1: ] ] system: ] uname: "Linux cephalo13 4.0.7-200.fc21.x86_64 #1 SMP Mon Jun 29 22:11:52 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux" ] system: "fedora/21/x86_64" ] bash: "/bin/bash = GNU bash, version 4.3.39(1)-release (x86_64-redhat-linux-gnu)" ] zsh: " => not installed" ] ] rvm: ] version: "rvm 1.26.11 (latest) by Wayne E. Seguin <wayneeseg...@gmail.com>, Michal Papis <mpa...@gmail.com> [https://rvm.io/]"; ] updated: "6 days 18 hours 31 minutes 4 seconds ago" ] path: "/home/operations/.rvm" ] ] ruby: ] interpreter: "ruby" ] version: "2.2.1p85" ] date: "2015-02-26" ] platform: "x86_64-linux" ] patchlevel: "2015-02-26 revision 49769" ] full_version: "ruby 2.2.1p85 (2015-02-26 revision 49769) [x86_64-linux]" ] ] homes: ] gem: "/home/operations/.rvm/gems/ruby-2.2.1" ] ruby: "/home/operations/.rvm/rubies/ruby-2.2.1" ] ] binaries: ] ruby: "/home/operations/.rvm/rubies/ruby-2.2.1/bin/ruby" ] irb: "/home/operations/.rvm/rubies/ruby-2.2.1/bin/irb" ] gem: "/home/operations/.rvm/rubies/ruby-2.2.1/bin/gem" ] rake: "/home/operations/.rvm/gems/ruby-2.2.1/bin/rake" ] ] environment: ] PATH: "/home/operations/.rvm/gems/ruby-2.2.1/bin:/home/operations/.rvm/gems/ruby-2.2.1@global/bin:/home/operations/.rvm/rubies/ruby-2.2.1/bin:/usr/lib64/qt-3.3/bin:/usr/local/bin:/bin:/usr/bin:/usr/local/sbin:/usr/sbin:/home/operations/.rvm/bin:/home/operations/.local/bin:/home/operations/bin" ] GEM_HOME: "/home/operations/.rvm/gems/ruby-2.2.1" ] GEM_PATH: "/home/operations/.rvm/gems/ruby-2.2.1:/home/operations/.rvm/gems/ruby-2.2.1@global" ] MY_RUBY_HOME: "/home/operations/.rvm/rubies/ruby-2.2.1" ] IRBRC: "/home/operations/.rvm/rubies/ruby-2.2.1/.irbrc" ] RUBYOPT: "" ] gemset: "" This version of vagrant allows for plugins for libvirt and indeed docker so may offer an easier/interesting way to build for all ... Hope this helps, Shine.
signature.asc
Description: OpenPGP digital signature
_______________________________________________ Tails-dev mailing list Tails-dev@boum.org https://mailman.boum.org/listinfo/tails-dev To unsubscribe from this list, send an empty email to tails-dev-unsubscr...@boum.org.
