system-builder 0.0.12 → 0.0.13

data/Manifest.txt

@@ -15,10 +15,13 @@ features/support/env.rb
 features/support/matchers.rb
 lib/system_builder.rb
 lib/system_builder/boot.rb
+lib/system_builder/box.rb
+lib/system_builder/box_tasks.rb
 lib/system_builder/cli.rb
 lib/system_builder/configurator.rb
 lib/system_builder/core_ext.rb
 lib/system_builder/disk_image.rb
+lib/system_builder/disk_nfsroot_image.rb
 lib/system_builder/disk_squashfs_image.rb
 lib/system_builder/init_ram_fs_configurator.rb
 lib/system_builder/iso_image.rb

data/lib/system_builder/boot.rb

@@ -46,10 +46,13 @@ class SystemBuilder::DebianBoot
     @cleaners = [ apt_cleaner, policyrc_cleaner ]
   end
 
-  def create
+  def create(force = false)
+    return if @creating and not force
+
     bootstrap
     configure
     clean
+    @creating = true
   end
 
   def bootstrap

data/lib/system_builder/box.rb

@@ -0,0 +1,95 @@
+class SystemBuilder::Box
+
+  attr_reader :name
+
+  def initialize(name)
+    @name = name
+  end
+
+  def release_number
+    @release_number ||= Time.now.strftime('%Y%m%d-%H%M')
+  end
+  
+  def release_name
+    @release_name ||= "streambox-#{release_number}"
+  end
+
+  def root_file
+    "build/root"
+  end
+
+  def boot
+    @boot ||= SystemBuilder::DebianBoot.new(root_file).tap do |boot|
+      boot.configurators << puppet_configurator
+    end
+
+    yield @boot if block_given?
+    @boot
+  end
+
+  def puppet_configurator
+    @puppet_configurator ||= SystemBuilder::PuppetConfigurator.new :release_name => release_name
+    yield @puppet_configurator if block_given?
+    @puppet_configurator
+  end
+
+  def disk_file
+    "dist/disk"
+  end
+
+  def disk_image
+    @disk_image ||= SystemBuilder::DiskSquashfsImage.new(disk_file).tap do |image|
+      image.boot = boot
+      image.size = 200.megabytes
+    end
+    yield @disk_image if block_given?
+    @disk_image
+  end
+
+  def iso_file
+    "dist/iso"
+  end
+
+  def iso_image
+    @iso_image ||= SystemBuilder::IsoSquashfsImage.new(iso_file).tap do |image|
+      image.boot = boot
+    end
+    yield @iso_image if block_given?
+    @iso_image
+  end
+
+  def nfs_file
+    "dist/nfs"
+  end
+
+  def nfs_image
+    @nfs_image ||= SystemBuilder::DiskNfsRootImage.new(nfs_file).tap do |image|
+      image.boot = boot
+    end
+    yield @nfs_image if block_given?
+    @nfs_image
+  end
+
+  def upgrade_directory
+    "build/upgrade"
+  end
+
+  def upgrade_file
+    "dist/upgrade.tar"
+  end
+
+  def upgrade_checksum
+    `sha256sum #{upgrade_file}`.split.first
+  end
+
+  def create_latest_file(latest_file)
+    File.open(latest_file, "w") do |f|
+      f.puts "name: #{release_name}"
+      f.puts "url: http://download.tryphon.eu/streambox/streambox-#{release_number}.tar"
+      f.puts "checksum: #{upgrade_checksum}"
+      f.puts "status_updated_at: #{Time.now}"
+      f.puts "description_url: http://www.tryphon.eu/release/#{release_name}"
+    end
+  end
+
+end

data/lib/system_builder/box_tasks.rb

@@ -0,0 +1,132 @@
+require 'rake/tasklib'
+
+class SystemBuilder::BoxTasks < Rake::TaskLib
+
+  attr_reader :box
+
+  def initialize(box, &block)
+    init
+
+    @box = 
+      if Symbol === box
+        SystemBuilder::Box.new(box) 
+      else
+        box
+      end
+
+    yield @box if block_given?
+
+    define
+  end
+
+  def init
+    ["#{ENV['HOME']}/.system_builder.rc", "./local.rb"].each do |conf|
+      load conf if File.exists?(conf)
+    end
+
+    Dir['tasks/**/*.rake'].each { |t| load t }
+  end
+
+  def define
+    namespace box.name do
+      desc "Create disk/iso images"
+
+      desc "Shortcut for dist:disk task"
+      task :dist => "dist:disk"
+
+      namespace :dist do
+        desc "Create disk image in #{box.disk_file}"
+        task :disk do
+          box.disk_image.create
+        end
+
+        desc "Create iso image in #{@iso_file}"
+        task :iso do
+          box.iso_image.create
+        end
+
+        desc "Create NFS image in #{@nfs_file}"
+        task :nfs do
+          box.nfs_image.create
+        end
+
+        desc "Create upgrade files"
+        task :upgrade do
+          rm_rf box.upgrade_directory
+          mkdir_p box.upgrade_directory
+          ln_s File.expand_path("build/filesystem.squashfs"), "#{box.upgrade_directory}/filesystem-#{box.release_name}.squashfs"
+          ln_s File.expand_path("#{box.root_file}/vmlinuz"), "#{box.upgrade_directory}/vmlinuz-#{box.release_name}"
+          ln_s File.expand_path("#{box.root_file}/initrd.img"), "#{box.upgrade_directory}/initrd-#{box.release_name}.img"
+          sh "tar -cf #{box.upgrade_file} --dereference -C #{box.upgrade_directory} ."
+
+          box.create_latest_file "dist/latest.yml"
+        end
+
+        desc "Create all images (disk, iso and upgrade)"
+        task :all => [:disk, :iso, :upgrade]
+      end
+
+      namespace :build do
+        desc "Configure the image system"
+        task :configure do
+          box.boot.configure
+          box.boot.clean
+        end
+
+        desc "Clean the image system"
+        task :clean do
+          box.boot.clean
+        end
+      end
+
+      desc "Clean build and dist directories"
+      task :clean do
+        unless File.exists?(box.root_file) and system "sudo fuser $PWD/#{box.root_file}"
+          sh "sudo rm -rf #{box.root_file}"
+        end
+        sh "rm -rf build/upgrade"
+        sh "rm -f build/*"
+        sh "rm -rf dist/*"
+      end
+
+      task :buildbot => [:clean, "dist:all", "buildbot:dist"] do
+        # clean in dependencies is executed only once
+        Rake::Task["#{box.name}:clean"].invoke
+      end
+
+      def latest_release_number
+        YAML.load(IO.read("dist/latest.yml"))["name"].gsub("#{box.name}-","") if File.exists?("dist/latest.yml")
+      end
+
+      namespace :buildbot do
+        task :dist do
+          target_directory = ENV['DIST'] or "#{ENV['HOME']}/dist/#{box.name}"
+          release_number = (latest_release_number or box.release_number)
+
+          mkdir_p target_directory
+          sh "gzip --fast --stdout #{box.disk_file} > #{target_directory}/#{box.name}-#{release_number}.disk.gz"
+          cp box.iso_file, "#{target_directory}/#{box.name}-#{release_number}.iso"
+          cp box.upgrade_file, "#{target_directory}/#{box.name}-#{release_number}.tar"
+
+          cp "dist/latest.yml", "#{target_directory}/latest.yml"
+        end
+      end
+
+      desc "Setup your environment to build an image"
+      task :setup do
+        if ENV['WORKING_DIR']
+          %w{build dist}.each do |subdir|
+            working_subdir = File.join ENV['WORKING_DIR'], subdir
+            unless File.exists?(working_subdir)
+              puts "* create and link #{working_subdir}"
+              mkdir_p working_subdir
+            end
+            ln_sf working_subdir, subdir unless File.exists?(subdir)
+          end
+        end
+      end
+
+    end
+  end
+
+end

data/lib/system_builder/disk_nfsroot_image.rb

@@ -0,0 +1,121 @@
+require 'tempfile'
+
+class SystemBuilder::DiskNfsRootImage
+
+  attr_accessor :boot, :size
+  attr_reader :file
+
+  def initialize(file)
+    @file = file
+    @size = 40.megabytes
+  end
+
+  def create
+    boot.configurators << SystemBuilder::InitRamFsConfigurator.new
+    boot.create
+
+    file_creation = (not File.exists?(file))
+    if file_creation
+      create_file
+      create_partition_table
+
+      format_boot_fs
+    end
+
+    sync_boot_fs
+    install_extlinux_files
+    install_extlinux
+
+    self
+  end
+
+  def create_file
+    FileUtils::sh "dd if=/dev/zero of=#{file} count=#{size.in_megabytes.to_i} bs=1M"
+  end
+
+  def create_partition_table
+    # Partition must be bootable for syslinux
+    FileUtils::sh "echo '#{free_sectors},,L,*' | /sbin/sfdisk --force --no-reread -uS -H16 -S63 #{file}"
+  end
+ 
+  def format_boot_fs
+    loop_device = "/dev/loop0"
+    begin
+      FileUtils::sudo "losetup -o #{boot_fs_offset} #{loop_device} #{file}"
+      FileUtils::sudo "mke2fs -L #{fs_label} -jqF #{loop_device} #{boot_fs_block_size}"
+    ensure
+      FileUtils::sudo "losetup -d #{loop_device}"
+    end
+  end
+
+  def mount_boot_fs(mount_dir = "/tmp/mount_boot_fs", &block)
+    FileUtils::mkdir_p mount_dir
+
+    begin
+      FileUtils::sudo "mount -o loop,offset=#{boot_fs_offset} #{file} #{mount_dir}"
+      yield mount_dir
+    ensure
+      FileUtils::sudo "umount #{mount_dir}"
+    end
+  end
+  
+  def sync_boot_fs
+    mount_boot_fs do |mount_dir|
+      FileUtils::sudo "rsync -a --delete #{boot.root}/boot/ #{mount_dir}/"
+      FileUtils::sudo "ln -s #{readlink_boot_file('initrd.img')} #{mount_dir}/initrd.img"
+      FileUtils::sudo "ln -s #{readlink_boot_file('vmlinuz')} #{mount_dir}/vmlinuz.img"
+    end
+    FileUtils.touch file
+  end
+
+  def install_extlinux_files(options = {})
+    root = (options[:root] or "LABEL=#{fs_label}")
+    version = (options[:version] or Time.now.strftime("%Y%m%d%H%M"))
+    nfssvr = %x{/sbin/ip link show|grep -e "eth.:"|cut -d' ' -f 2|cut -d':' -f 1|xargs ip addr show|grep "inet "|cut -d' ' -f 6|cut -d'/' -f 1}.strip
+    nfsroot = %x{readlink -f build/root}.strip
+    nfsopt = (options[:nfsroot] or "#{nfssvr}:#{nfsroot}")
+
+    mount_boot_fs do |mount_dir|
+      SystemBuilder::DebianBoot::Image.new(mount_dir).tap do |image|
+        image.open("extlinux.conf") do |f|
+          f.puts "DEFAULT linux"
+          f.puts "LABEL linux"
+          f.puts "SAY Now booting #{version} from syslinux ..."
+          f.puts "KERNEL /vmlinuz"
+          f.puts "APPEND ro initrd=/initrd.img boot=nfs nfsroot=#{nfsopt}"
+        end
+      end
+    end
+  end
+
+  def install_extlinux
+    mount_boot_fs("#{boot.root}/boot") do 
+      boot.chroot do |chroot|
+        chroot.sudo "extlinux --install -H16 -S63 /boot"
+      end
+    end
+    FileUtils::sh "dd if=#{boot.root}/usr/lib/syslinux/mbr.bin of=#{file} conv=notrunc"
+  end
+
+  def fs_label
+    "boot"
+  end
+
+  def readlink_boot_file(boot_file)
+    File.basename(%x{readlink #{boot.root}/#{boot_file}}.strip)
+  end
+
+  def free_sectors
+    64
+  end
+
+  def boot_fs_offset
+    free_sectors * 512
+  end
+
+  def boot_fs_block_size
+    linux_partition_info = `/sbin/sfdisk -l #{file}`.scan(%r{#{file}.*Linux}).first
+    linux_partition_info.split[5].to_i
+  end
+
+end

data/lib/system_builder/iso_squashfs_image.rb

@@ -21,7 +21,10 @@ class SystemBuilder::IsoSquashfsImage
   end
 
   def compress_root_fs
-    FileUtils::sudo "mksquashfs #{boot.root}/ build/filesystem.squashfs -noappend -e /boot"
+    unless File.exists?("build/filesystem.squashfs")
+      FileUtils::sudo "mksquashfs #{boot.root}/ build/filesystem.squashfs -noappend -e /boot"
+      FileUtils::sudo "chown #{ENV['USER']} build/filesystem.squashfs && chmod +r build/filesystem.squashfs"
+    end
   end
 
   def install_isolinux_files(options = {})

data/lib/system_builder/task.rb

@@ -60,7 +60,7 @@ class SystemBuilder::Task < Rake::TaskLib
         required_packages << "rsync"
         required_packages << "dosfstools"
         required_packages << "syslinux"
-	required_packages << "squashfs-tools"
+        required_packages << "squashfs-tools"
         
         FileUtils.sudo "apt-get install #{required_packages.join(' ')}"
       end

data/lib/system_builder.rb

@@ -2,7 +2,7 @@ $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module SystemBuilder
-  VERSION = '0.0.12'
+  VERSION = '0.0.13'
 
   @@configurations = {}
   
@@ -24,6 +24,8 @@ require 'system_builder/iso_image'
 require 'system_builder/live_image'
 require 'system_builder/init_ram_fs_configurator'
 require 'system_builder/disk_squashfs_image'
+require 'system_builder/disk_nfsroot_image'
 require 'system_builder/iso_squashfs_image'
 require 'system_builder/boot'
 require 'system_builder/configurator'
+require 'system_builder/box'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: system-builder
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Alban Peignier
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-30 00:00:00 +02:00
+date: 2010-09-11 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,12 +42,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 19
         segments: 
         - 2
         - 6
-        - 1
-        version: 2.6.1
+        - 2
+        version: 2.6.2
   type: :development
   version_requirements: *id002
 description: FIX (describe your package)
@@ -79,10 +79,13 @@ files:
 - features/support/matchers.rb
 - lib/system_builder.rb
 - lib/system_builder/boot.rb
+- lib/system_builder/box.rb
+- lib/system_builder/box_tasks.rb
 - lib/system_builder/cli.rb
 - lib/system_builder/configurator.rb
 - lib/system_builder/core_ext.rb
 - lib/system_builder/disk_image.rb
+- lib/system_builder/disk_nfsroot_image.rb
 - lib/system_builder/disk_squashfs_image.rb
 - lib/system_builder/init_ram_fs_configurator.rb
 - lib/system_builder/iso_image.rb