xrootd · simonmichal · Nov 22, 2017 · Nov 19, 2017
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -27,6 +27,28 @@ stages:
   tags:
     - docker-ubuntu
 
+.template:deb_ubuntu_xenial: &deb_ubuntu_xenial_def
+  stage: build:rpm
+  image: ubuntu:xenial
+  script:
+    - apt-get update
+    - apt-get install -y git cmake g++ debhelper devscripts equivs gdebi-core
+    - cp -R packaging/debian/ .
+    - mk-build-deps --build-dep debian/control
+    - gdebi -n xrootd-build-deps-depends*.deb
+    - version=`./genversion.sh --print-only`
+    - dch --create -v `echo $version | sed 's/^v\(.*\)/\1/'` --package xrootd --urgency low --distribution artful -M "This package is built and released automatically. For important notices and releases subscribe to our maling lists or visit our website."
+    - dpkg-buildpackage -b -us -uc -tc --changes-option="-udeb_packages"
+    - mkdir xenial
+    - cp deb_packages/*.deb  xenial
+    - cp deb_packages/*.ddeb xenial
+  artifacts:
+    expire_in: 1 day
+    paths:
+    - xenial/
+  tags:
+- docker-ubuntu
+
 build:cc7:
   stage: build:rpm
   image: gitlab-registry.cern.ch/linuxsupport/cc7-base
@@ -222,6 +244,15 @@ build:deb_ubuntu_artful:
     - tags
     - schedules 
 
+build:deb_ubuntu_xenial:
+  <<: *deb_ubuntu_xenial_def
+  only:
+    - master
+    - /^stable-.*$/
+  except:
+    - tags
+    - schedules
+
 build:macosx:
   stage: build:rpm
   script:
@@ -343,6 +374,14 @@ release:deb_ubuntu_artful:
     - branches
     - /^(?!v[0-9]+).*/
 
+release:deb_ubuntu_xenial:
+  <<: *deb_ubuntu_xenial_def
+  only:
+    - web
+  except:
+    - branches
+    - /^(?!v[0-9]+).*/
+
 biweekly:cc7:
   stage: build:rpm
   image: gitlab-registry.cern.ch/linuxsupport/cc7-base
@@ -444,6 +483,7 @@ publish:debian:
     - docker-ubuntu
   dependencies:
     - build:deb_ubuntu_artful
+    - build:deb_ubuntu_xenial
   only:
     - master
     - /^stable-.*$/
@@ -491,6 +531,7 @@ publish:debian:release:
     - docker-ubuntu
   dependencies:
     - release:deb_ubuntu_artful
+    - release:deb_ubuntu_xenial
   only:
     - web
   except:

diff --git a/packaging/debian/control b/packaging/debian/control
@@ -3,7 +3,7 @@ Maintainer: Jozsef Makai <jozsef.makai@cern.ch>
 Section: misc
 Priority: optional
 Standards-Version: 3.9.3
-Build-Depends: debhelper (>= 10), cmake (>=3.3.0), zlib1g-dev, libfuse-dev, python-dev, libssl-dev, libxml2-dev, ncurses-dev, libkrb5-dev, libreadline-dev, libsystemd-dev, selinux-policy-dev, systemd
+Build-Depends: debhelper (>= 9), cmake (>=3.3.0), zlib1g-dev, libfuse-dev, python-dev, libssl-dev, libxml2-dev, ncurses-dev, libkrb5-dev, libreadline-dev, libsystemd-dev, selinux-policy-dev, systemd
 Homepage: https://github.com/xrootd/xrootd
 Vcs-Git: https://github.com/xrootd/xrootd.git
 Vcs-Browser: https://github.com/xrootd/xrootd

diff --git a/packaging/debian/rules b/packaging/debian/rules
@@ -3,6 +3,9 @@
 %:
 	dh $@ --builddirectory=build --destdir=deb_packages
 
+override_dh_auto_configure:
+	dh_auto_configure -- -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_INSTALL_LIBDIR=lib/$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 override_dh_install:
 	install -D -m 644 packaging/common/client.conf deb_packages/etc/xrootd/client.conf
 	install -D -m 644 packaging/common/client-plugin.conf.example deb_packages/etc/xrootd/client.plugins.d/client-plugin.conf.example

diff --git a/packaging/debian/xrootd-client-devel.install b/packaging/debian/xrootd-client-devel.install
@@ -1,8 +1,8 @@
 usr/bin/xrdgsitest
-usr/lib/libXrdCl.so
-usr/lib/libXrdClient.so
-usr/lib/libXrdFfs.so
-usr/lib/libXrdPosix.so
+usr/lib/*/libXrdCl.so
+usr/lib/*/libXrdClient.so
+usr/lib/*/libXrdFfs.so
+usr/lib/*/libXrdPosix.so
 usr/share/man/man1/xrdgsitest.1*
 usr/include/xrootd/XrdCl
 usr/include/xrootd/XrdClient

diff --git a/packaging/debian/xrootd-client-libs.install b/packaging/debian/xrootd-client-libs.install
@@ -1,8 +1,8 @@
-usr/lib/libXrdCl.so.2*
-usr/lib/libXrdClient.so.2*
-usr/lib/libXrdFfs.so.2*
-usr/lib/libXrdPosix.so.2*
-usr/lib/libXrdPosixPreload.so.1*
-usr/lib/libXrdPosixPreload.so
+usr/lib/*/libXrdCl.so.2*
+usr/lib/*/libXrdClient.so.2*
+usr/lib/*/libXrdFfs.so.2*
+usr/lib/*/libXrdPosix.so.2*
+usr/lib/*/libXrdPosixPreload.so.1*
+usr/lib/*/libXrdPosixPreload.so
 etc/xrootd/client.plugins.d/client-plugin.conf.example
 etc/xrootd/client.conf
diff --git a/packaging/debian/xrootd-devel.install b/packaging/debian/xrootd-devel.install
@@ -8,8 +8,8 @@ usr/include/xrootd/XrdSec
 usr/include/xrootd/XrdSys
 usr/include/xrootd/XrdVersion.hh
 usr/include/xrootd/XrdXml/XrdXmlReader.hh
-usr/lib/libXrdAppUtils.so
-usr/lib/libXrdCrypto.so
-usr/lib/libXrdCryptoLite.so
-usr/lib/libXrdUtils.so
-usr/lib/libXrdXml.so
+usr/lib/*/libXrdAppUtils.so
+usr/lib/*/libXrdCrypto.so
+usr/lib/*/libXrdCryptoLite.so
+usr/lib/*/libXrdUtils.so
+usr/lib/*/libXrdXml.so
diff --git a/packaging/debian/xrootd-libs.install b/packaging/debian/xrootd-libs.install
@@ -1,9 +1,9 @@
-usr/lib/libXrdAppUtils.so.1*
-usr/lib/libXrdClProxyPlugin-4.so
-usr/lib/libXrdCks*-4.so
-usr/lib/libXrdCrypto.so.1*
-usr/lib/libXrdCryptoLite.so.1*
-usr/lib/libXrdCryptossl-4.so
-usr/lib/libXrdSec*-4.so
-usr/lib/libXrdUtils.so.*
-usr/lib/libXrdXml.so.*
+usr/lib/*/libXrdAppUtils.so.1*
+usr/lib/*/libXrdClProxyPlugin-4.so
+usr/lib/*/libXrdCks*-4.so
+usr/lib/*/libXrdCrypto.so.1*
+usr/lib/*/libXrdCryptoLite.so.1*
+usr/lib/*/libXrdCryptossl-4.so
+usr/lib/*/libXrdSec*-4.so
+usr/lib/*/libXrdUtils.so.*
+usr/lib/*/libXrdXml.so.*
diff --git a/packaging/debian/xrootd-private-devel.install b/packaging/debian/xrootd-private-devel.install
@@ -1,3 +1,3 @@
 usr/include/xrootd/private
-usr/lib/libXrdSsiLib.so
-usr/lib/libXrdSsiShMap.so
+usr/lib/*/libXrdSsiLib.so
+usr/lib/*/libXrdSsiShMap.so
diff --git a/packaging/debian/xrootd-server-devel.install b/packaging/debian/xrootd-server-devel.install
@@ -5,4 +5,4 @@ usr/include/xrootd/XrdOss
 usr/include/xrootd/XrdSfs
 usr/include/xrootd/XrdXrootd
 usr/include/xrootd/XrdHttp
-usr/lib/libXrdServer.so
+usr/lib/*/libXrdServer.so
diff --git a/packaging/debian/xrootd-server-libs.install b/packaging/debian/xrootd-server-libs.install
@@ -1,14 +1,14 @@
-usr/lib/libXrdBwm-4.so
-usr/lib/libXrdPss-4.so
-usr/lib/libXrdXrootd-4.so
-usr/lib/libXrdFileCache-4.so
-usr/lib/libXrdBlacklistDecision-4.so
-usr/lib/libXrdHttp-4.so
-usr/lib/libXrdN2No2p-4.so
-usr/lib/libXrdOssSIgpfsT-4.so
-usr/lib/libXrdServer.so.*
-usr/lib/libXrdSsi-4.so
-usr/lib/libXrdSsiLib.so.*
-usr/lib/libXrdSsiLog-4.so
-usr/lib/libXrdSsiShMap.so.*
-usr/lib/libXrdThrottle-4.so
+usr/lib/*/libXrdBwm-4.so
+usr/lib/*/libXrdPss-4.so
+usr/lib/*/libXrdXrootd-4.so
+usr/lib/*/libXrdFileCache-4.so
+usr/lib/*/libXrdBlacklistDecision-4.so
+usr/lib/*/libXrdHttp-4.so
+usr/lib/*/libXrdN2No2p-4.so
+usr/lib/*/libXrdOssSIgpfsT-4.so
+usr/lib/*/libXrdServer.so.*
+usr/lib/*/libXrdSsi-4.so
+usr/lib/*/libXrdSsiLib.so.*
+usr/lib/*/libXrdSsiLog-4.so
+usr/lib/*/libXrdSsiShMap.so.*
+usr/lib/*/libXrdThrottle-4.so
diff --git a/packaging/debian_scripts/publish_debian_cern.sh b/packaging/debian_scripts/publish_debian_cern.sh
@@ -10,7 +10,7 @@ set -e
 comp=$1
 prefix=/eos/project/s/storage-ci/www/debian/xrootd
 
-for dist in artful; do
+for dist in artful xenial; do
   echo "Publishing for $dist";
   path=$prefix/pool/$dist/$comp/x/xrootd/;
   mkdir -p $path;