From a10d8458abe56919e27c08809b22442a29b07de6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 9 Mar 2024 14:10:23 +0100 Subject: Tidying up debian packaging. Signed-off-by: Daniel Baumann --- debian/netdata-core.install | 2 +- debian/netdata-core.postinst | 2 +- debian/rules | 53 ++++++++++++++++++++++---------------------- 3 files changed, 29 insertions(+), 28 deletions(-) (limited to 'debian') diff --git a/debian/netdata-core.install b/debian/netdata-core.install index 8cc93043b..5fc10116f 100644 --- a/debian/netdata-core.install +++ b/debian/netdata-core.install @@ -2,7 +2,7 @@ etc/netdata/edit-config etc/netdata/health.d etc/netdata/statsd.d usr/lib/netdata/conf.d/apps_groups.conf -usr/lib/netdata/conf.d/ebpf* +usr/lib/netdata/conf.d/ebpf.d* usr/lib/netdata/conf.d/exporting.conf usr/lib/netdata/conf.d/health.d usr/lib/netdata/conf.d/health_alarm_notify.conf diff --git a/debian/netdata-core.postinst b/debian/netdata-core.postinst index 8ddec2b79..7f6b8402b 100755 --- a/debian/netdata-core.postinst +++ b/debian/netdata-core.postinst @@ -17,7 +17,7 @@ case "${1}" in mkdir -p /var/lib/netdata fi - # in some plugins netdata must be able to read logfiles + # some netdata plugins must be able to read logfiles usermod -G adm netdata # creating directory overrides diff --git a/debian/rules b/debian/rules index 314b00c81..818783a8b 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,15 @@ #!/usr/bin/make -f -TOP = $(CURDIR)/debian/netdata +export DEB_BUILD_MAINT_OPTIONS = hardening=+all -VERSION := $(shell dpkg-parsechangelog -SVersion) -VERSION_MAJOR := $(word 1, $(subst ., ,$(VERSION))) -VERSION_MINOR := $(word 2, $(subst ., ,$(VERSION))) -VERSION_FIX := $(word 3, $(subst -, ,$(subst ., ,$(VERSION)))) -VERSION_SUFFIX := -$(word 4, $(subst -, ,$(subst ., ,$(VERSION)))) +VERSION := $(shell dpkg-parsechangelog -SVersion) -include /usr/share/dpkg/architecture.mk +VERSION_MAJOR := $(word 1, $(subst ., ,$(VERSION))) +VERSION_MINOR := $(word 2, $(subst ., ,$(VERSION))) +VERSION_FIX := $(word 3, $(subst -, ,$(subst ., ,$(VERSION)))) +VERSION_SUFFIX := -$(word 4, $(subst -, ,$(subst ., ,$(VERSION)))) -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +include /usr/share/dpkg/architecture.mk ifeq ($(DEB_HOST_ARCH),s390x) export DEB_CFLAGS_MAINT_APPEND = -Wall -O2 @@ -41,7 +40,9 @@ execute_before_dh_autoreconf_clean: fi override_dh_auto_configure: - dh_auto_configure -- --libdir=/usr/lib --libexecdir=/usr/lib \ + dh_auto_configure -- \ + --libdir=/usr/lib \ + --libexecdir=/usr/lib \ --disable-cloud \ --disable-exporting-prometheus-remote-write \ --enable-dbengine \ @@ -65,15 +66,15 @@ override_dh_install-arch: find debian/tmp -name .keep -delete # Copy architecture dependent plugins - mkdir -p $(TOP)-core/etc/netdata - cp debian/local/netdata/netdata.conf $(TOP)-core/etc/netdata - touch $(TOP)-core/etc/netdata/.opt-out-from-anonymous-statistics + mkdir -p debian/netdata-core/etc/netdata + cp debian/local/netdata/netdata.conf debian/netdata-core/etc/netdata + touch debian/netdata-core/etc/netdata/.opt-out-from-anonymous-statistics - mkdir -p $(TOP)-core/usr/lib/netdata/plugins.d + mkdir -p debian/netdata-core/usr/lib/netdata/plugins.d for plugin in cgroup-network apps.plugin nfacct.plugin perf.plugin slabinfo.plugin; \ do \ cp debian/tmp/usr/lib/netdata/plugins.d/$${plugin} \ - $(TOP)-core/usr/lib/netdata/plugins.d; \ + debian/netdata-core/usr/lib/netdata/plugins.d; \ done dh_install -a @@ -84,36 +85,36 @@ override_dh_install-indep: dh_install -i # Move architecture dependent plugins - mkdir -p $(TOP)-core/usr/lib/netdata/plugins.d + mkdir -p debian/netdata-core/usr/lib/netdata/plugins.d for plugin in cgroup-network apps.plugin nfacct.plugin perf.plugin slabinfo.plugin; \ do \ - mv -f $(TOP)-plugins-bash/usr/lib/netdata/plugins.d/$${plugin} \ - $(TOP)-core/usr/lib/netdata/plugins.d; \ + mv -f debian/netdata-plugins-bash/usr/lib/netdata/plugins.d/$${plugin} \ + debian/netdata-core/usr/lib/netdata/plugins.d; \ done - mkdir -p $(TOP)-plugins-python/usr/lib/netdata/plugins.d + mkdir -p debian/netdata-plugins-python/usr/lib/netdata/plugins.d for plugin in python.d.plugin; \ do \ - mv $(TOP)-plugins-bash/usr/lib/netdata/plugins.d/$${plugin} \ - $(TOP)-plugins-python/usr/lib/netdata/plugins.d; \ + mv debian/netdata-plugins-bash/usr/lib/netdata/plugins.d/$${plugin} \ + debian/netdata-plugins-python/usr/lib/netdata/plugins.d; \ done # Setting package version (update check) - echo $(VERSION) > $(TOP)-web/usr/share/netdata/web/version.txt + echo $(VERSION) > debian/netdata-web/usr/share/netdata/web/version.txt override_dh_fixperms-arch: dh_fixperms -a # apps.plugin should only be runnable by the netdata user. It will be # given extra capabilities in the postinst script. - chmod 0754 $(TOP)-core/usr/lib/netdata/plugins.d/apps.plugin - chmod 4754 $(TOP)-core/usr/lib/netdata/plugins.d/perf.plugin + chmod 0754 debian/netdata-core/usr/lib/netdata/plugins.d/apps.plugin + chmod 4754 debian/netdata-core/usr/lib/netdata/plugins.d/perf.plugin override_dh_fixperms-indep: dh_fixperms -i # apps.plugin should only be runnable by the netdata user. It will be # given extra capabilities in the postinst script. - chmod 0644 $(TOP)-plugins-bash/usr/lib/netdata/charts.d/*.sh - chmod 0644 $(TOP)-plugins-bash/usr/lib/netdata/plugins.d/*.sh.inc - chmod 0644 $(TOP)-plugins-python/usr/lib/netdata/python.d/*.py + chmod 0644 debian/netdata-plugins-bash/usr/lib/netdata/charts.d/*.sh + chmod 0644 debian/netdata-plugins-bash/usr/lib/netdata/plugins.d/*.sh.inc + chmod 0644 debian/netdata-plugins-python/usr/lib/netdata/python.d/*.py -- cgit v1.2.3