dr 0.1.1 → 0.1.2

data/lib/dr/buildroot.rb

@@ -10,9 +10,34 @@ module Dr
     def initialize(arch, br_archive=nil)
       @location = br_archive
 
-      @extra_pkgs = "sudo,vim,ca-certificates,fakeroot,build-essential," +
+      @extra_pkgs = "sudo,vim,ca-certificates,fakeroot,build-essential,curl," +
                     "devscripts,debhelper,git,bc,locales,equivs,pkg-config"
-      @repo = "http://mirrordirector.raspbian.org/raspbian/"
+      @repos = {
+        :raspbian => {
+          :url => "http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian/",
+          :key => "http://mirror.ox.ac.uk/sites/archive.raspbian.org/archive/raspbian.public.key",
+          :src => true,
+          :codename => "wheezy",
+          :components => "main contrib non-free rpi"
+        },
+
+        :raspi_foundation => {
+          :url => "http://archive.raspberrypi.org/debian/",
+          :key => "http://archive.raspberrypi.org/debian/raspberrypi.gpg.key",
+          :src => false,
+          :codename => "wheezy",
+          :components => "main"
+        },
+
+        :kano => {
+          :url => "http://dev.kano.me/archive/",
+          :key => "http://dev.kano.me/archive/repo.gpg.key",
+          :src => false,
+          :codename => "release",
+          :components => "main"
+        }
+      }
+      @base_repo = :raspbian
 
       if br_archive == nil || !File.exists?(br_archive)
         setup arch
@@ -24,8 +49,15 @@ module Dr
         log :info, "Preparing the build root"
         ShellCmd.new "sudo tar xz -C #{tmp} -f #{@location}", :tag => "tar"
         begin
+          log :info, "Mounting the /proc file system"
+          mnt_cmd = "sudo chroot #{tmp} mount -t proc none /proc"
+          ShellCmd.new mnt_cmd, :tag => "mount"
           yield tmp
         ensure
+          log :info, "Unmounting the /proc file system"
+          umnt_cmd = "sudo chroot #{tmp} umount -f /proc"
+          ShellCmd.new umnt_cmd, :tag => "umount"
+
           log :info, "Cleaning up the buildroot"
           ShellCmd.new "sudo rm -rf #{tmp}/*", :tag => "rm"
         end
@@ -44,7 +76,8 @@ module Dr
           log :info, "Bootstrapping Raspian (first stage)"
 
           cmd = "sudo debootstrap --foreign --variant=buildd --no-check-gpg " +
-                "--include=#{@extra_pkgs} --arch=#{arch} wheezy #{broot} #{@repo}"
+                "--include=#{@extra_pkgs} --arch=#{arch} wheezy #{broot} " +
+                "#{@repos[@base_repo][:url]}"
           debootsrap = ShellCmd.new cmd, {
             :tag => "debootstrap",
             :show_out => true
@@ -65,9 +98,25 @@ module Dr
           }
 
           log :info, "Configuring the build root"
+
+          repo_setup_sequences = @repos.map do |name, repo|
+            seq = "echo 'deb #{repo[:url]} #{repo[:codename]} " +
+                  "#{repo[:components]}' >> /etc/apt/sources.list\n"
+
+            if repo.has_key?(:src) && repo[:src]
+              seq += "echo 'deb-src #{repo[:url]} #{repo[:codename]} " +
+                     "#{repo[:components]}' >> /etc/apt/sources.list\n"
+            end
+
+            if repo.has_key?(:key) && repo[:key]
+              seq += "curl --retry 5 '#{repo[:key]}' | apt-key add -\n"
+            end
+
+            seq
+          end
+
           cmd = "sudo chroot #{broot} <<EOF
-            echo 'deb #{@repo} wheezy main contrib non-free rpi' >> /etc/apt/sources.list
-            echo 'deb-src #{@repo} wheezy main contrib non-free rpi' >> /etc/apt/sources.list
+            #{repo_setup_sequences.join "\n\n"}
 
             echo 'en_US.UTF-8 UTF-8' >/etc/locale.gen
             locale-gen en_US.UTF-8

data/lib/dr/version.rb

@@ -1,3 +1,3 @@
 module Dr
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dr
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-12 00:00:00.000000000 Z
+date: 2014-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor