From 05018f6e8b9b8cc8ea74425f2d59c57f6d81b469 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 25 Jan 2019 10:56:16 +0100 Subject: [PATCH] buildsys: build a dbgsym package don't forcefully strip debug components out of the firewall logger... Signed-off-by: Wolfgang Bumiller --- Makefile | 17 ++++++++++------- debian/control | 2 +- src/Makefile | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 87a7f89..9cd7891 100644 --- a/Makefile +++ b/Makefile @@ -15,17 +15,20 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH) GITVERSION:=$(shell git rev-parse HEAD) DEB=${PACKAGE}_${VERSION}-${PKGREL}_${ARCH}.deb +DEB2=${PACKAGE}-dbgsym_${VERSION}-${PKGREL}_${ARCH}.deb +DEBS=$(DEB) $(DEB2) -all: ${DEB} +all: $(DEBS) .PHONY: dinstall dinstall: deb - dpkg -i ${DEB} + dpkg -i $(DEBS) .PHONY: deb -deb: ${DEB} -${DEB}: src test debian +deb: $(DEBS) +$(DEB2): $(DEB) +$(DEB): src test debian make check rm -rf build rsync -a src/ build @@ -33,7 +36,7 @@ ${DEB}: src test debian echo "git clone git://git.proxmox.com/git/pve-firewall.git\\ngit checkout ${GITVERSION}" > build/debian/SOURCE # install cd build; dpkg-buildpackage -b -us -uc - lintian ${DEB} + lintian ${DEBS} .PHONY: check check: @@ -50,5 +53,5 @@ distclean: clean .PHONY: upload -upload: ${DEB} - tar cf - ${DEB} | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH} +upload: $(DEBS) + tar cf - $(DEBS) | ssh repoman@repo.proxmox.com -- upload --product pve --dist stretch --arch ${ARCH} diff --git a/debian/control b/debian/control index 2a92b16..a38250d 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: pve-firewall Section: admin Priority: extra Maintainer: Proxmox Support Team -Build-Depends: debhelper (>= 7.0.50~), +Build-Depends: debhelper (>= 10), dh-systemd, libglib2.0-dev, libnetfilter-conntrack-dev, diff --git a/src/Makefile b/src/Makefile index a35e53d..0183a61 100644 --- a/src/Makefile +++ b/src/Makefile @@ -32,7 +32,7 @@ install: pve-firewall pve-firewall.8 pve-firewall.bash-completion pvefw-logger make -C PVE install install -d -m 0755 ${DESTDIR}/${SBINDIR} install -m 0755 pve-firewall ${DESTDIR}/${SBINDIR} - install -m 0755 --strip pvefw-logger ${DESTDIR}/${SBINDIR} + install -m 0755 pvefw-logger ${DESTDIR}/${SBINDIR} install -d ${DESTDIR}/${MAN8DIR} install -m 0644 pve-firewall.8 ${DESTDIR}/${MAN8DIR} install -m 0644 -D pve-firewall.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/pve-firewall -- 2.39.2