buildsys: build a dbgsym package

don't forcefully strip debug components out of the firewall
logger...

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/Makefile b/Makefile
index 87a7f899a9bd6246ae72550814c3f3fcfae62d59..9cd78913f47fe80f07e95b6b87824317d3e8854f 100644 (file)
--- 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
 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
 
 .PHONY: dinstall
 dinstall: deb

-       dpkg -i ${DEB}
+       dpkg -i $(DEBS)

 
 
 .PHONY: deb
 
 
 .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
        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
        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: 
 
 .PHONY: check
 check: 


@@ -50,5 +53,5 @@ distclean: clean
 
 
 .PHONY: upload
 
 
 .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 2a92b16b6d5f11d881e1c575b721b76063991dec..a38250d1ce29a86f766f59b8cbf810c8ea11ea1e 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: pve-firewall
 Section: admin
 Priority: extra
 Maintainer: Proxmox Support Team <support@proxmox.com>
 Section: admin
 Priority: extra
 Maintainer: Proxmox Support Team <support@proxmox.com>

-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 10),

                dh-systemd,
                libglib2.0-dev,
                libnetfilter-conntrack-dev,
                dh-systemd,
                libglib2.0-dev,
                libnetfilter-conntrack-dev,

diff --git a/src/Makefile b/src/Makefile
index a35e53d59c74a3bde1afa2595818df83141c4d49..0183a61ab12e1606f82b485cd49f6a97538e8d28 100644 (file)
--- 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}
        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
        install -d ${DESTDIR}/${MAN8DIR}
        install -m 0644 pve-firewall.8 ${DESTDIR}/${MAN8DIR}
        install -m 0644 -D pve-firewall.bash-completion ${DESTDIR}/${BASHCOMPLDIR}/pve-firewall