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

[Rohan Garg]

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

The following commit has been merged in the master branch:
commit e8778d9b3cefa5f5e9ba7f34dc58b816c3a6d93b
Author: Rohan Garg <rohan at kde.org>
Date:   Thu Jan 8 22:13:33 2015 +0100

    Pass -sa to include orig tar explicitly
---
 dci/build.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dci/build.rb b/dci/build.rb
index 8d2ae04..67a3631 100644
--- a/dci/build.rb
+++ b/dci/build.rb
@@ -25,6 +25,10 @@ end.parse!
 
 logger = new_logger
 
+dpkg_buildopts = %w(-us -uc -sa)
+dpkg_buildopts << "-A" unless RbConfig::CONFIG['host_cpu'] == 'x86_64'
+
+
 if not ARGV[1].end_with? '.changes'
     logger.fatal("#{ARGV[1]} is not an actual changes file. Abort!")
 else
@@ -58,7 +62,7 @@ else
 
     logger.info("Updating chroot")
     system("apt-get update && apt-get -y dist-upgrade")
-    
+
     logger.info("Installing some extra tools")
     system("apt-get -y install devscripts ubuntu-dev-tools libdistro-info-perl")
 
@@ -83,7 +87,7 @@ else
               logger.info("Finished installing build deps")
 
               logger.info("Start building the package")
-              system("dpkg-buildpackage -j`nproc` -us -uc")
+              system("dpkg-buildpackage -j`nproc` #{dpkg_buildopts.join(' ')}")
               system("dh_install --fail-missing")
               logger.error("Not all files have been installed!") unless $?.success?
           }

-- 
ci-tooling packaging