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.lampre...@proxmox.com> --- Makefile | 2 +- debian/control.in | 8 -------- debian/install | 1 + debian/rules | 12 +----------- 4 files changed, 3 insertions(+), 20 deletions(-) create mode 100644 debian/install diff --git a/Makefile b/Makefile index 9b75e81..364b968 100644 --- 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 06aaa6a..e6ccc90 100644 --- 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 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 5358206..aaeda94 100755 --- 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: -- 2.11.0 _______________________________________________ pve-devel mailing list pve-devel@pve.proxmox.com https://pve.proxmox.com/cgi-bin/mailman/listinfo/pve-devel