From 47b9268d4f2ceff98cae474790ca9cd9fe02ec0b Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 6 Feb 2018 03:26:03 +0000 Subject: [PATCH 1/2] dpkg: Enable stripping of binary and compression of manual pages git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7365 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- Makefile | 7 ++----- debian/rules | 12 ++++++------ 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index bff8fc4bb..8e150cf69 100644 --- a/Makefile +++ b/Makefile @@ -501,16 +501,13 @@ dpkg: ../scst_$(VERSION).orig.tar.xz sed 's/%{scst_version}/$(VERSION)/' \ debian/scst.dkms && \ output_files=( \ - ../iscsi-scst_$(VERSION)-$(DEBIAN_REVISION)_amd64.deb \ - ../scst-dev_$(VERSION)-$(DEBIAN_REVISION)_all.deb \ - ../scst-dkms_$(VERSION)-$(DEBIAN_REVISION)_all.deb \ + ../*_$(VERSION)-$(DEBIAN_REVISION)_*.deb \ + ../*_$(VERSION)-$(DEBIAN_REVISION)_*.ddeb \ ../scst_$(VERSION)-$(DEBIAN_REVISION).debian.tar.xz \ ../scst_$(VERSION)-$(DEBIAN_REVISION).dsc \ ../scst_$(VERSION)-$(DEBIAN_REVISION)_amd64.build \ ../scst_$(VERSION)-$(DEBIAN_REVISION)_amd64.buildinfo \ ../scst_$(VERSION)-$(DEBIAN_REVISION)_amd64.changes \ - ../scst_$(VERSION)-$(DEBIAN_REVISION)_amd64.deb \ - ../scstadmin_$(VERSION)-$(DEBIAN_REVISION)_amd64.deb \ ) && \ rm -f "$${output_files[@]}" && \ if false; then \ diff --git a/debian/rules b/debian/rules index e7db5e4ab..798406392 100755 --- a/debian/rules +++ b/debian/rules @@ -73,17 +73,17 @@ install: chmod -R 0644 $(DESTDIR)/usr/src/scst-$(VERSION) && \ chmod 0644 "$(DESTDIR)"/usr/lib/*/perl/*/auto/SCST_SCST/.packlist "$(DESTDIR)"/usr/share/perl/*/SCST/SCST.pm && \ chmod 0755 "$(DESTDIR)"/usr/lib/*/perl/*/auto/SCST_SCST && \ - mkdir -p "$(DESTDIR)"/usr/share/man && \ - { tar -C "$(DESTDIR)"/usr/man -cf- . | \ - tar -C "$(DESTDIR)"/usr/share/man -xf-; } && \ + mv "$(DESTDIR)"/usr/man "$(DESTDIR)"/usr/share/man && \ rm -rf "$(DESTDIR)"/usr/man && \ - dh_strip && \ - dh_compress && \ dh_install && \ - dh_installdeb && \ dh_installman && \ dh_installchangelogs && \ + dh_compress && \ + dh_fixperms && \ + dh_strip && \ + dh_makeshlibs && \ dh_shlibdeps && \ + dh_installdeb && \ dh_gencontrol && \ dh_md5sums && \ dh_builddeb From 1aa2453addaef746f8be7b701c1ffd4a01d9c0d2 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Tue, 6 Feb 2018 03:26:33 +0000 Subject: [PATCH 2/2] dpkg: Build in release mode git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@7366 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- debian/rules | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/rules b/debian/rules index 798406392..c2591379c 100755 --- a/debian/rules +++ b/debian/rules @@ -28,6 +28,7 @@ clean: rm -f scstadmin/scstadmin build: + make 2release && \ export BUILD_2X_MODULE=y && \ export CONFIG_SCSI_QLA_FC=y CONFIG_SCSI_QLA2XXX_TARGET=y && \ for d in $(SUBDIRS); do $(MAKE) -C $$d; done && \ @@ -58,6 +59,7 @@ install: break; \ fi; \ done && \ + make 2debug && \ rm -f "$(DESTDIR)"/lib/modules/*/[Mm]odule* && \ mkdir -p $(DESTDIR)/usr/src/scst-$(VERSION) && \ for f in scst.dkms scst-dkms.postinst scst-dkms.prerm; do \