public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* EC2 AMI tools updated to 1.4.0.5.

Browse Source 
svn path=/nixpkgs/trunk/; revision=32568
This commit is contained in:
Eelco Dolstra 2012-02-25 20:26:25 +00:00
parent b4bee8caf5
commit e4ff365eb4
2 changed files with 25 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ec2-ami-tools-1.4.0.1"; name = "ec2-ami-tools-1.4.0.5";
buildInputs = [ unzip makeWrapper ]; buildInputs = [ unzip makeWrapper ];
src = fetchurl { src = fetchurl {
url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip; url = http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.zip;
sha256 = "1fjg3gx5k0z8r4apg5whz3yxc3xnz7z5g6j93hf765lfriz1rccz"; sha256 = "0vhdqmi076ipqj05dd7fn0drbhcvzccdcdhy8br9sp684scg9a75";
}; };
# Amazon EC2 requires that disk images are writable. If they're # Amazon EC2 requires that disk images are writable. If they're

56
pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch
View File

@ -1,33 +1,23 @@
diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb diff -ru ec2-ami-tools-1.4.0.5-orig/lib/ec2/amitools/bundle.rb ec2-ami-tools-1.4.0.5/lib/ec2/amitools/bundle.rb
*** ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb 2009-12-02 22:28:44.000000000 +0100 --- ec2-ami-tools-1.4.0.5-orig/lib/ec2/amitools/bundle.rb 2011-12-06 14:57:28.000000000 +0100
--- ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb 2010-01-22 16:16:13.000000000 +0100 +++ ec2-ami-tools-1.4.0.5/lib/ec2/amitools/bundle.rb 2012-02-25 21:24:57.682427268 +0100
*************** @@ -80,7 +80,7 @@
*** 80,86 **** # piped via several processes. The tee is used to allow a
# piped via several processes. The tee is used to allow a # digest of the file to be calculated without having to re-read
# digest of the file to be calculated without having to re-read # it from disk.
# it from disk. - tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse
! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse + tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable
tar.add(File::basename( image_file ), File::dirname( image_file )) tar.owner(0).group(0)
openssl = EC2::Platform::Current::Constants::Utility::OPENSSL tar.add(File::basename( image_file ), File::dirname( image_file ))
pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug) openssl = EC2::Platform::Current::Constants::Utility::OPENSSL
--- 80,86 ---- diff -ru ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb
# piped via several processes. The tee is used to allow a --- ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb 2011-12-06 14:57:28.000000000 +0100
# digest of the file to be calculated without having to re-read +++ ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb 2012-02-25 21:23:36.342716403 +0100
# it from disk. @@ -31,6 +31,7 @@
! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable def update; @options << '-u'; self; end
tar.add(File::basename( image_file ), File::dirname( image_file )) def sparse; @options << '-S'; self; end
openssl = EC2::Platform::Current::Constants::Utility::OPENSSL def dereference; @options << '-h'; self; end
pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug) + def writable; @options << '--mode=0755'; self; end
diff -rc --exclude '*~' ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb
*** ec2-ami-tools-1.3-45758-orig/lib/ec2/platform/linux/tar.rb 2009-12-02 22:28:44.000000000 +0100 def archive(filename)
--- ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb 2010-01-22 16:16:11.000000000 +0100 filename = '-' if filename.nil?
***************
*** 31,36 ****
--- 31,37 ----
def update; @options << '-u'; self; end
def sparse; @options << '-S'; self; end
def dereference; @options << '-h'; self; end
+ def writable; @options << '--mode=0755'; self; end
def archive(filename)
filename = '-' if filename.nil?