kameleon-builder 2.2.2 → 2.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a2dd769a06842822d30b2bdbf697bafdac743992
+  data.tar.gz: 940236d90915c6cfbd083279268bb2ce32f8a2ba
+SHA512:
+  metadata.gz: 2870bb6011c52bca58978b58b5a1fb93314e7ef976bb8cc32d7b5a9042b11c33f36c9834e7cc949d1be4694fbcdec47c737d3c290b44c1dac2fb4885f3a1ea95
+  data.tar.gz: ad3aa91cee5f93ca7ae94d2651212ece607e1ca305083832023a76c99801d62da511da18692c9e258a8d72308d6202e50d97fe24ecb1bf431a673be586c5f2f4

data/CHANGELOG.rst

@@ -1,6 +1,12 @@
 Kameleon CHANGELOG
 ==================
 
+version 2.2.3
+-------------
+Released on Aug 19th 2014
+
+- [template] The extlinux MBR path has changed because jessie is not frozen (Fix #17)
+
 version 2.2.2
 -------------
 

data/README.rst

@@ -7,40 +7,44 @@ step by step your own distribution. At start Kameleon is used to create custom
 kvm, LXC, VirtualBox, iso images, ..., but as it is designed to be very generic
 you can probably do a lot more than that.
 
+.. _`installation`:
+
 ------------
 Installation
 ------------
 
-Gem package
------------
-
 To install the latest release from `RubyGems`_:
 
 .. _RubyGems: https://rubygems.org/gems/kameleon-builder
 
-::
+From RubyGems
+-------------
 
-    gem install kameleon-builder
+Debian/Ubuntu
+-------------
 
-Or from source::
+::
 
-    git clone https://github.com/oar-team/kameleon.git && cd kameleon
-    gem build kameleon-builder.gemspec
-    gem install kameleon-builder-*.gem
+    apt-get install ruby-childprocess
+    gem install --no-ri --no-rdoc kameleon-builder
 
-On debian based distribution be sure to install the ``ruby-dev`` package first
+Fedora
+------
 
+::
 
-Dist packages
--------------
+    yum install rubygem-childprocess
+    gem install --no-ri --no-rdoc kameleon-builder
 
-These packages contain Kameleon and all its dependencies (Ruby, polipo and all
-gems with their native extensions already compiled). These packages are made
-with `omnibus project`_.
 
-.. _`omnibus project`: https://github.com/opscode/omnibus-ruby
+From Source
+-----------
 
-Please download the package in the following `page <http://kameleon.imag.fr/installation.html#dist-packages>`_
+::
+
+    git clone https://github.com/oar-team/kameleon.git && cd kameleon
+    gem build kameleon-builder.gemspec
+    gem install kameleon-builder-*.gem
 
 -----
 Usage

data/lib/kameleon/persistent_cache.rb

@@ -99,7 +99,7 @@ module Kameleon
     end
 
     def start_web_proxy_in(directory)
-
+      sleep 2 # this is for assuring that the cache is correctly created
       ## setting current step dir
       @current_step_dir = directory
       ## This function assumes that the cache directory has already been created by the engine
@@ -125,7 +125,7 @@ module Kameleon
 
     def pack()
       Kameleon.ui.info("Packing up the generated cache in #{@cwd}/#{@name}-cache.tar")
-      execute("tar","-cf #{@name}-cache.tar -C cache/ .",@cwd)
+      execute("tar","-cf #{@name}-cache.tar -C #{@cache_dir} .",@cwd)
     end
 
     def unpack(cache_path)

data/templates/steps/bootstrap/switch_context_qemu.yaml

@@ -27,8 +27,27 @@
 - install_initial_bootloader:
   - exec_out: mkdir -p $$rootfs/boot/extlinux
   - exec_out: extlinux --install $$rootfs/boot/extlinux 2>&1
-  - exec_out: MBR_PATH="/usr/lib/extlinux/mbr.bin"
-  - exec_out: dd if="$MBR_PATH" of="$$disk_device" bs=440  2>&1
+  - exec_out: |
+      MBR_PATH=
+      PATHS=("/usr/share/syslinux/mbr.bin"
+             "/usr/lib/bios/syslinux/mbr.bin"
+             "/usr/lib/syslinux/bios/mbr.bin"
+             "/usr/lib/extlinux/mbr.bin"
+             "/usr/lib/syslinux/mbr.bin"
+             "/usr/lib/syslinux/mbr/mbr.bin"
+             "/usr/lib/EXTLINUX/mbr.bin")
+      for element in "${PATHS[@]}"
+      do
+        if [ -f "$element" ]; then
+          MBR_PATH="$element"
+          break
+        fi
+      done
+      if [ "$MBR_PATH" == "" ]; then
+        fail "unable to locate the extlinux mbr"
+      else
+        dd if="$MBR_PATH" of="$$disk_device" bs=440  2>&1
+      fi
   - write_out:
     - $$rootfs/boot/extlinux/extlinux.conf
     - |

data/templates/steps/bootstrap/switch_context_virtualbox.yaml

@@ -27,8 +27,27 @@
 - install_initial_bootloader:
   - exec_out: mkdir -p $$rootfs/boot/extlinux
   - exec_out: extlinux --install $$rootfs/boot/extlinux 2>&1
-  - exec_out: MBR_PATH="/usr/lib/extlinux/mbr.bin"
-  - exec_out: dd if="$MBR_PATH" of="$$disk_device" bs=440  2>&1
+  - exec_out: |
+      MBR_PATH=
+      PATHS=("/usr/share/syslinux/mbr.bin"
+             "/usr/lib/bios/syslinux/mbr.bin"
+             "/usr/lib/syslinux/bios/mbr.bin"
+             "/usr/lib/extlinux/mbr.bin"
+             "/usr/lib/syslinux/mbr.bin"
+             "/usr/lib/syslinux/mbr/mbr.bin"
+             "/usr/lib/EXTLINUX/mbr.bin")
+      for element in "${PATHS[@]}"
+      do
+        if [ -f "$element" ]; then
+          MBR_PATH="$element"
+          break
+        fi
+      done
+      if [ "$MBR_PATH" == "" ]; then
+        fail "unable to locate the extlinux mbr"
+      else
+        dd if="$MBR_PATH" of="$$disk_device" bs=440  2>&1
+      fi
   - write_out:
     - $$rootfs/boot/extlinux/extlinux.conf
     - |

data/version.txt

@@ -1 +1 @@
-2.2.2
+2.2.3

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kameleon-builder
 version: !ruby/object:Gem::Version
-  version: 2.2.2
-  prerelease: 
+  version: 2.2.3
 platform: ruby
 authors:
 - Salem Harrache
@@ -12,56 +11,51 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.3
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.19'
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,7 +63,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -268,27 +261,26 @@ files:
 homepage: http://kameleon.readthedocs.org/
 licenses:
 - GPL-2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Kameleon is a tool to build virtual machines from scratch
 test_files:
 - tests/helper.rb