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

Rohan Garg rohangarg-guest at moszumanska.debian.org
Wed Apr 29 15:53:56 UTC 2015


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

The following commit has been merged in the master branch:
commit 39bbcaf36229a39a5c8d29768ad0bf53640db525
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Apr 29 17:53:06 2015 +0200

    Don't pull in proprietary drivers
---
 dci/imager.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dci/imager.rb b/dci/imager.rb
index 6e95be9..9250f89 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -65,12 +65,12 @@ def workarounds
   end
   puts `grep -iR plymouth-drm config/package-lists`
 
+  Dir.glob('config/package-lists/dkms.list.*').each do |f|
+    File.delete(f)
+  end
+
   # Workarounds for ARM
   if RbConfig::CONFIG['host_cpu'] == 'arm'
-    Dir.glob('config/package-lists/dkms.list.*').each do |f|
-      File.delete(f)
-    end
-
     Dir.glob('config/package-lists/memtest.list.*').each do |f|
       File.delete(f)
     end

-- 
ci-tooling packaging



More information about the pkg-kde-commits mailing list