[SCM] ci-tooling packaging branch, master, updated. d907f6520074de4a8f58fa4a1e3cf71baba28f23
Rohan Garg
rohangarg-guest at moszumanska.debian.org
Thu Apr 9 14:52:09 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/ci-tooling.git;a=commitdiff;h=e026d68
The following commit has been merged in the master branch:
commit e026d68d265d005883e274e4d13515d1641fb995
Author: Rohan Garg <rohan at garg.io>
Date: Thu Apr 9 14:49:58 2015 +0200
Add support for armhf images
---
dci/imager.rb | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/dci/imager.rb b/dci/imager.rb
index caaa96a..1fbc810 100644
--- a/dci/imager.rb
+++ b/dci/imager.rb
@@ -98,7 +98,12 @@ Dir.chdir('build') do
packages = %w(hawaii-shell)
when /.*netrunner.*armhf/
+ repos = %w(qt5 frameworks plasma netrunner calamares)
+ packages = %w(netrunner-desktop calamares)
extra_opts << '-b tar'
+ # Don't need no kernels in my rootfs
+ extra_opts << '--linux-flavours none'
+ extra_opts << '--linux-packages none'
else
logger.error("Don't understand the flavor #{FLAVOR}")
exit 1
@@ -156,11 +161,12 @@ Dir.chdir('build') do
new_files << new_name
end
- md5sum = `md5sum *.iso`
- File.write('MD5SUM', md5sum)
-
- sha256sum = `sha256sum *.iso`
- File.write('SHA256SUM', sha256sum)
+ if Dir.glob('*.iso').size > 0
+ md5sum = `md5sum *.iso`
+ File.write('MD5SUM', md5sum)
+ sha256sum = `sha256sum *.iso`
+ File.write('SHA256SUM', sha256sum)
+ end
FileUtils.chown_R('jenkins-slave',
'jenkins-slave',
--
ci-tooling packaging
More information about the pkg-kde-commits
mailing list