buildsys: autogen debug package and cleanup unecessary rules

don't do manually what the deb helpers do automatically and better.

Autogenerate the debug package, it includes now only the debugsymbols
without effectively duplicating all executables and libraries.
In the same step add a install file which installs our sysctl
settings, this is done together as it allows to skip some
intermediate steps, also the change is not to big, so it should be
possible to see whats going on.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/Makefile b/Makefile
index 9b75e81bfdbfaaf8588abbb5bbc3220369090970..364b9681a86fc08fd21e7b09d67b580888524b56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@ ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 GITVERSION:=$(shell cat .git/refs/heads/master)
 
 DEB=${PACKAGE}_${PKGVER}-${PKGREL}_${ARCH}.deb
-DBG_DEB=${PACKAGE}-dbg_${PKGVER}-${PKGREL}_${ARCH}.deb
+DBG_DEB=${PACKAGE}-dbgsym_${PKGVER}-${PKGREL}_${ARCH}.deb
 
 PERL_APIVER := `perl -MConfig -e 'print $$Config{debian_abi}//$$Config{version};'`
 

diff --git a/debian/control.in b/debian/control.in
index 06aaa6af1f699387614a17147fa2cb43a13a1b0b..e6ccc902fddaabd2a470aa669f58d14da936745d 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -53,11 +53,3 @@ Description: Cluster Infrastructure for Proxmox Virtual Environment
  This package contains the Cluster Infrastructure for the Proxmox
  Virtual Environment, namely a distributed filesystem to store
  configuration data on all nodes.
-
-Package: pve-cluster-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: pve-cluster (= ${binary:Version})
-Description: debug Cluster Infrastructure for Proxmox Virtual Environment
- This package contains the debug symbols.

diff --git a/debian/install b/debian/install
new file mode 100644 (file)
index 0000000..6498f69
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+debian/sysctl.conf etc/sysctl.d/pve.conf

diff --git a/debian/rules b/debian/rules
index 5358206668c4e836e830e7d3eaf6392364474319..aaeda94af9bfe1d603f6c7a39854ced00c0ee0e2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,19 +8,9 @@
        dh $@ --with=systemd --with=autoreconf
 
 override_dh_strip:
-       dh_strip --dbg-package=pve-cluster-dbg
+       dh_strip --dbgsym-migration='pve-cluster-dbg (<< 5.0-16)'
 
 override_dh_systemd_start:
        dh_systemd_start --restart-after-upgrade
 
-override_dh_auto_install:
-
-       make -j1 install DESTDIR=../debian/pve-cluster
-
-override_dh_install:
-
-       dh_install
-
-       install -m 0644 -D debian/sysctl.conf debian/pve-cluster/etc/sysctl.d/pve.conf
-
 override_dh_installinit: