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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit cd82063b6dcbd1f6ca5ab75d3171ea05bca92252
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Apr 29 16:25:38 2015 +0200

    There is no --syslinux-theme option anymore :(
---
 dci/imager.rb | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 29ac2b5..cc0211f 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -48,7 +48,7 @@ a4hw1LvfpbOxVBwDdqEFgH6LQI5eXNGwR9Ps3F1KA3yNVI2FKbArVPQ=
 -----END PGP PUBLIC KEY BLOCK-----'
 
 def workarounds
-  system('rm -rf config/bootloaders')
+  system('rm -rf config/bootloaders/*')
 
   File.open('config/package-lists/live.list.chroot', 'a') do |f|
     f.puts('live-config')
@@ -115,7 +115,6 @@ Dir.chdir('build') do
 
     # Install the netrunner-syslinux-theme
     system('apt-get install syslinux-themes-netrunner')
-    extra_opts << '--syslinux-theme netrunner'
     extra_opts << '--debian-installer-gui false'
 
   when /.*netrunner.*cloud/
@@ -160,6 +159,14 @@ Dir.chdir('build') do
   FileUtils.mkdir_p('config/archives')
   workarounds
 
+  # Copy over bootloader modifications post config
+  case FLAVOR
+  when /.*netrunner.*desktop/
+    FileUtils.mkdir_p('config/bootloaders/syslinux/') unless Dir.exist?('config/bootloaders/syslinux/')
+    system('cp -aR /usr/share/syslinux/themes/netrunner/syslinux-live config/bootloaders/syslinux/')
+  end
+
+
   packages.each do |package|
     File.write('config/package-lists/netrunner.list.chroot',
                package + "
", mode: 'a')

-- 
ci-tooling packaging