From 78f7790a1b07f81cdb7e14b07919c73392854956 Mon Sep 17 00:00:00 2001 From: Jozsef Makai Date: Mon, 15 Jan 2018 16:32:19 +0000 Subject: [PATCH 1/3] [Packaging] Debian debug packages --- packaging/debian/control | 56 ++++++++++++++++++++++++++++++++++++++++ packaging/debian/rules | 10 +++++++ 2 files changed, 66 insertions(+) diff --git a/packaging/debian/control b/packaging/debian/control index 86b8341286f..e53c4458f40 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -46,3 +46,59 @@ Package: xrootd-server-devel Architecture: any Depends: ${shlibs:Depends}, xrootd-devel (=${binary:Version}), xrootd-client-devel (=${binary:Version}), xrootd-server-libs (=${binary:Version}) Description: This package contains header files and development libraries for xrootd server development. + +Package: xrootd-libs-dbg +Architecture: any +Section: debug +Priority: extra +Depends: xrootd-libs (= ${binary:Version}) +Description: debugging symbols for xrootd-libs + +Package: xrootd-devel-dbg +Architecture: any +Section: debug +Priority: extra +Depends: xrootd-devel (= ${binary:Version}) +Description: debugging symbols for xrootd-devel + +Package: xrootd-client-libs-dbg +Architecture: any +Section: debug +Priority: extra +Depends: xrootd-client-libs (= ${binary:Version}) +Description: debugging symbols for xrootd-client-libs + +Package: xrootd-client-devel-dbg +Architecture: any +Section: debug +Priority: extra +Depends: xrootd-client-devel (= ${binary:Version}) +Description: debugging symbols for xrootd-client-devel + +Package: xrootd-client-dbg +Architecture: any +Section: debug +Priority: extra +Depends: xrootd-client (= ${binary:Version}) +Description: debugging symbols for xrootd-client + +Package: xrootd-private-devel-dbg +Architecture: any +Section: debug +Priority: extra +Depends: xrootd-private-devel (= ${binary:Version}) +Description: debugging symbols for xrootd-private-devel + +Package: xrootd-server-libs-dbg +Architecture: any +Section: debug +Priority: extra +Depends: xrootd-server-libs (= ${binary:Version}) +Description: debugging symbols for xrootd-server-libs + +Package: xrootd-server-devel-dbg +Architecture: any +Section: debug +Priority: extra +Depends: xrootd-server-devel (= ${binary:Version}) +Description: debugging symbols for xrootd-server-devel diff --git a/packaging/debian/rules b/packaging/debian/rules index a89c9970c54..cba6bea0e6f 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -6,6 +6,16 @@ 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_strip: + dh_strip -pxrootd-libs --dbg-package=xrootd-libs-dbg + dh_strip -pxrootd-devel --dbg-package=xrootd-devel-dbg + dh_strip -pxrootd-client-libs --dbg-package=xrootd-client-libs-dbg + dh_strip -pxrootd-client --dbg-package=xrootd-client-dbg + dh_strip -pxrootd-client-devel --dbg-package=xrootd-client-devel-dbg + dh_strip -pxrootd-private-devel --dbg-package=xrootd-private-devel-dbg + dh_strip -pxrootd-server-libs --dbg-package=xrootd-server-libs-dbg + dh_strip -pxrootd-server-devel --dbg-package=xrootd-server-devel-dbg + 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 From 34128512ec247866a3bd7215f4befc37234b4a8d Mon Sep 17 00:00:00 2001 From: Jozsef Makai Date: Wed, 17 Jan 2018 14:33:46 +0000 Subject: [PATCH 2/3] [Packaging] Reverting dbgsym stripping, doing it other way --- packaging/debian/control | 56 ---------------------------------------- packaging/debian/rules | 10 ------- 2 files changed, 66 deletions(-) diff --git a/packaging/debian/control b/packaging/debian/control index e53c4458f40..86b8341286f 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -46,59 +46,3 @@ Package: xrootd-server-devel Architecture: any Depends: ${shlibs:Depends}, xrootd-devel (=${binary:Version}), xrootd-client-devel (=${binary:Version}), xrootd-server-libs (=${binary:Version}) Description: This package contains header files and development libraries for xrootd server development. - -Package: xrootd-libs-dbg -Architecture: any -Section: debug -Priority: extra -Depends: xrootd-libs (= ${binary:Version}) -Description: debugging symbols for xrootd-libs - -Package: xrootd-devel-dbg -Architecture: any -Section: debug -Priority: extra -Depends: xrootd-devel (= ${binary:Version}) -Description: debugging symbols for xrootd-devel - -Package: xrootd-client-libs-dbg -Architecture: any -Section: debug -Priority: extra -Depends: xrootd-client-libs (= ${binary:Version}) -Description: debugging symbols for xrootd-client-libs - -Package: xrootd-client-devel-dbg -Architecture: any -Section: debug -Priority: extra -Depends: xrootd-client-devel (= ${binary:Version}) -Description: debugging symbols for xrootd-client-devel - -Package: xrootd-client-dbg -Architecture: any -Section: debug -Priority: extra -Depends: xrootd-client (= ${binary:Version}) -Description: debugging symbols for xrootd-client - -Package: xrootd-private-devel-dbg -Architecture: any -Section: debug -Priority: extra -Depends: xrootd-private-devel (= ${binary:Version}) -Description: debugging symbols for xrootd-private-devel - -Package: xrootd-server-libs-dbg -Architecture: any -Section: debug -Priority: extra -Depends: xrootd-server-libs (= ${binary:Version}) -Description: debugging symbols for xrootd-server-libs - -Package: xrootd-server-devel-dbg -Architecture: any -Section: debug -Priority: extra -Depends: xrootd-server-devel (= ${binary:Version}) -Description: debugging symbols for xrootd-server-devel diff --git a/packaging/debian/rules b/packaging/debian/rules index cba6bea0e6f..a89c9970c54 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -6,16 +6,6 @@ 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_strip: - dh_strip -pxrootd-libs --dbg-package=xrootd-libs-dbg - dh_strip -pxrootd-devel --dbg-package=xrootd-devel-dbg - dh_strip -pxrootd-client-libs --dbg-package=xrootd-client-libs-dbg - dh_strip -pxrootd-client --dbg-package=xrootd-client-dbg - dh_strip -pxrootd-client-devel --dbg-package=xrootd-client-devel-dbg - dh_strip -pxrootd-private-devel --dbg-package=xrootd-private-devel-dbg - dh_strip -pxrootd-server-libs --dbg-package=xrootd-server-libs-dbg - dh_strip -pxrootd-server-devel --dbg-package=xrootd-server-devel-dbg - 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 From 74ebb3521dacfd952d9b6b44e2be29f1444472f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B3zsef=20Makai?= Date: Wed, 17 Jan 2018 15:36:50 +0100 Subject: [PATCH 3/3] [CI] Installing package to create debug symbols on xenial --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 012515d4046..3ff7010feb9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -32,7 +32,7 @@ stages: image: ubuntu:xenial script: - apt-get update - - apt-get install -y git cmake g++ debhelper devscripts equivs gdebi-core + - apt-get install -y git cmake g++ debhelper devscripts equivs gdebi-core pkg-create-dbgsym - cp -R packaging/debian/ . - mk-build-deps --build-dep debian/control - gdebi -n xrootd-build-deps-depends*.deb @@ -41,6 +41,7 @@ stages: - dpkg-buildpackage -b -us -uc -tc --changes-option="-udeb_packages" - mkdir xenial - cp deb_packages/*.deb xenial + - cp ../*.ddeb xenial artifacts: expire_in: 1 day paths: