[SCM] ci-tooling packaging branch, master, updated. f0d05ca459aa07da55b45b1fe0fdbd8b04f4902b

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=f0d05ca

The following commit has been merged in the master branch:
commit f0d05ca459aa07da55b45b1fe0fdbd8b04f4902b
Author: Rohan Garg <rohan at garg.io>
Date:   Sat Mar 28 03:45:26 2015 +0100

    Add target for armhf
---
 dci/imager.rb | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 54d1c5e..60a05f4 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -77,21 +77,9 @@ Dir.chdir('build') do
   dci_run_cmd('apt-get update')
   system('apt-get -y install live-images live-build live-tools')
   system('lb clean --purge')
-  system("lb config --config kde-desktop \
-  --distribution #{RELEASE} \
-  -m #{MIRROR} \
-  --mirror-bootstrap #{CLOUDFRONT_MIRROR} \
-  --mirror-chroot #{CLOUDFRONT_MIRROR} \
-  --mirror-binary #{CLOUDFRONT_MIRROR} \
-  --debian-installer false \
-  --source false \
-  --security false \
-  --archive-areas 'main contrib non-free' \
-  --updates false")
-  FileUtils.mkdir_p('config/archives')
-  workarounds
-  packages = []
-  repos = []
+
+  extra_opts = []
+
   case FLAVOR
   when /.*netrunner.*desktop/
     repos = %w(qt5 frameworks plasma netrunner calamares)
@@ -106,11 +94,33 @@ Dir.chdir('build') do
   when /.*maui.*/
     repos = %w(qt5 frameworks plasma maui calamares)
     packages = %w(hawaii-shell)
+
+  when /.*netrunner.*armhf/
+    extra_opts << '-b tar'
   else
     logger.error("Don't understand the flavor #{FLAVOR}")
     exit 1
   end
 
+
+  system("lb config --config kde-desktop \
+  --distribution #{RELEASE} \
+  -m #{MIRROR} \
+  --mirror-bootstrap #{CLOUDFRONT_MIRROR} \
+  --mirror-chroot #{CLOUDFRONT_MIRROR} \
+  --mirror-binary #{CLOUDFRONT_MIRROR} \
+  --debian-installer false \
+  --source false \
+  --security false \
+  --archive-areas 'main contrib non-free' \
+  --updates false \
+  #{extra_opts.join(' ')}")
+
+  FileUtils.mkdir_p('config/archives')
+  workarounds
+  packages = []
+  repos = []
+
   packages.each do |package|
     File.write('config/package-lists/netrunner.list.chroot',
                package + "
", mode: 'a')

-- 
ci-tooling packaging