diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-25 20:26:25 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-02-25 20:26:25 +0000 |
| commit | e4ff365eb44fcbf6363c835247103a38a0818768 (patch) | |
| tree | 0914dd02621477ae4d63f3403d6d9c4bf0a40267 | |
| parent | b4bee8caf5a282cae972c5b25eea05b00fb31253 (diff) | |
| download | nixpkgs-e4ff365eb44fcbf6363c835247103a38a0818768.tar nixpkgs-e4ff365eb44fcbf6363c835247103a38a0818768.tar.gz nixpkgs-e4ff365eb44fcbf6363c835247103a38a0818768.tar.bz2 nixpkgs-e4ff365eb44fcbf6363c835247103a38a0818768.tar.lz nixpkgs-e4ff365eb44fcbf6363c835247103a38a0818768.tar.xz nixpkgs-e4ff365eb44fcbf6363c835247103a38a0818768.tar.zst nixpkgs-e4ff365eb44fcbf6363c835247103a38a0818768.zip | |
* EC2 AMI tools updated to 1.4.0.5.
svn path=/nixpkgs/trunk/; revision=32568
| -rw-r--r-- | pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch | 56 |
2 files changed, 25 insertions, 35 deletions
diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix index f6f32a7c5b7..36dc77bcd2d 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, unzip, ruby, openssl, makeWrapper }: stdenv.mkDerivation { - name = "ec2-ami-tools-1.4.0.1"; + name = "ec2-ami-tools-1.4.0.5"; buildInputs = [ unzip makeWrapper ]; src = fetchurl { 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 diff --git a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch index c8d0597b479..54c2228911e 100644 --- a/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch +++ b/pkgs/tools/virtualization/amazon-ec2-ami-tools/writable.patch @@ -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 -*** ec2-ami-tools-1.3-45758-orig/lib/ec2/amitools/bundle.rb 2009-12-02 22:28:44.000000000 +0100 ---- ec2-ami-tools-1.3-45758/lib/ec2/amitools/bundle.rb 2010-01-22 16:16:13.000000000 +0100 -*************** -*** 80,86 **** - # piped via several processes. The tee is used to allow a - # digest of the file to be calculated without having to re-read - # it from disk. -! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse - tar.add(File::basename( image_file ), File::dirname( image_file )) - openssl = EC2::Platform::Current::Constants::Utility::OPENSSL - pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug) ---- 80,86 ---- - # piped via several processes. The tee is used to allow a - # digest of the file to be calculated without having to re-read - # it from disk. -! tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable - tar.add(File::basename( image_file ), File::dirname( image_file )) - openssl = EC2::Platform::Current::Constants::Utility::OPENSSL - pipeline = EC2::Platform::Current::Pipeline.new('image-bundle-pipeline', debug) -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 ---- ec2-ami-tools-1.3-45758/lib/ec2/platform/linux/tar.rb 2010-01-22 16:16:11.000000000 +0100 -*************** -*** 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? +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.4.0.5-orig/lib/ec2/amitools/bundle.rb 2011-12-06 14:57:28.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 @@ + # piped via several processes. The tee is used to allow a + # digest of the file to be calculated without having to re-read + # it from disk. +- tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse ++ tar = EC2::Platform::Current::Tar::Command.new.create.dereference.sparse.writable + tar.owner(0).group(0) + tar.add(File::basename( image_file ), File::dirname( image_file )) + openssl = EC2::Platform::Current::Constants::Utility::OPENSSL +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 +--- ec2-ami-tools-1.4.0.5-orig/lib/ec2/platform/linux/tar.rb 2011-12-06 14:57:28.000000000 +0100 ++++ ec2-ami-tools-1.4.0.5/lib/ec2/platform/linux/tar.rb 2012-02-25 21:23:36.342716403 +0100 +@@ -31,6 +31,7 @@ + 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? |