From 77a10aa23fefd492f3a8ad6f752d53dbd8398dd7 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sat, 9 Mar 2024 14:37:05 +0100 Subject: Removing i386-only netdata-core-no-sse binary package to reduce packaging complexity. Signed-off-by: Daniel Baumann --- debian/control | 46 ++++------------ debian/netdata-core-no-sse.README.Debian | 1 - debian/netdata-core-no-sse.dirs | 1 - debian/netdata-core-no-sse.docs | 1 - debian/netdata-core-no-sse.install | 1 - debian/netdata-core-no-sse.lintian-overrides | 10 ---- debian/netdata-core-no-sse.maintscript | 1 - debian/netdata-core-no-sse.manpages | 1 - debian/netdata-core-no-sse.netdata.logrotate | 1 - debian/netdata-core-no-sse.netdata.service | 1 - debian/netdata-core-no-sse.postinst | 1 - debian/netdata-core-no-sse.postrm | 1 - debian/rules | 82 +--------------------------- 13 files changed, 15 insertions(+), 133 deletions(-) delete mode 120000 debian/netdata-core-no-sse.README.Debian delete mode 120000 debian/netdata-core-no-sse.dirs delete mode 120000 debian/netdata-core-no-sse.docs delete mode 120000 debian/netdata-core-no-sse.install delete mode 100644 debian/netdata-core-no-sse.lintian-overrides delete mode 120000 debian/netdata-core-no-sse.maintscript delete mode 120000 debian/netdata-core-no-sse.manpages delete mode 120000 debian/netdata-core-no-sse.netdata.logrotate delete mode 120000 debian/netdata-core-no-sse.netdata.service delete mode 120000 debian/netdata-core-no-sse.postinst delete mode 120000 debian/netdata-core-no-sse.postrm diff --git a/debian/control b/debian/control index 6e26b6fc2..fc52b2c2b 100644 --- a/debian/control +++ b/debian/control @@ -35,7 +35,7 @@ Package: netdata Section: net Architecture: all Depends: - netdata-core | netdata-core-no-sse, + netdata-core, netdata-plugins-bash, netdata-web, ${misc:Depends}, @@ -57,12 +57,11 @@ Section: net Architecture: all Depends: apache2, - netdata-core (>= ${source:Version}) | netdata-core-no-sse (>= ${source:Version}), + netdata-core (>= ${source:Version}), netdata-web (>= ${source:Version}), ${misc:Depends}, Enhances: netdata-core, - netdata-core-no-sse, Description: real-time performance monitoring (apache integration) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the @@ -94,8 +93,8 @@ Suggests: iw, lm-sensors, nc, -Conflicts: - netdata-core-no-sse, +Breaks: + netdata-core-no-sse (<< 1.44), Replaces: netdata-core-no-sse, Description: real-time performance monitoring (core) @@ -112,38 +111,20 @@ Architecture: i386 Pre-Depends: ${misc:Pre-Depends}, Depends: - libcap2-bin, - lsb-base, - passwd, ${misc:Depends}, - ${shlibs:Depends}, -Conflicts: - netdata-core, -Replaces: - netdata-plugins-bash (<< 1.19.0-2~), - netdata-plugins-python (<< 1.17.0-1~), -Recommends: - curl, -Suggests: - apcupsd, - iproute2, - iw, - lm-sensors, - nc, -Description: real-time performance monitoring (core, no-sse build) - Netdata is distributed, real-time, performance and health monitoring for - systems and applications. It provides insights of everything happening on the - systems it runs using interactive web dashboards. +Description: real-time performance monitoring (transitional package) + Package to ease upgrading from older netdata-core-no-sse package to the new + netdata-core package. . - This package contains the minimal core build without SSE2 optimizations for - old systems. If unsure, use netdata-core instead. + This package can be purged at anytime once the netdata-core package has been + installed. Package: netdata-plugins-bash Section: net Architecture: all Multi-Arch: foreign Depends: - netdata-core (>= ${source:Version}) | netdata-core-no-sse (>= ${source:Version}), + netdata-core (>= ${source:Version}), ${misc:Depends}, Suggests: fping, @@ -151,7 +132,6 @@ Provides: netdata-plugins, Enhances: netdata-core, - netdata-core-no-sse, Description: real-time performance monitoring (bash plugins) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the @@ -164,7 +144,7 @@ Section: net Architecture: all Multi-Arch: foreign Depends: - netdata-core (>= ${source:Version}) | netdata-core-no-sse (>= ${source:Version}), + netdata-core (>= ${source:Version}), python3, python3-six, python3-urllib3 (>= 1.22), @@ -178,7 +158,6 @@ Provides: netdata-plugins, Enhances: netdata-core, - netdata-core-no-sse, Description: real-time performance monitoring (python plugins) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the @@ -192,11 +171,10 @@ Architecture: all Depends: fonts-font-awesome, libjs-bootstrap, - netdata-core (>= ${source:Version}) | netdata-core-no-sse (>= ${source:Version}), + netdata-core (>= ${source:Version}), ${misc:Depends}, Enhances: netdata-core, - netdata-core-no-sse, Description: real-time performance monitoring (web) Netdata is distributed, real-time, performance and health monitoring for systems and applications. It provides insights of everything happening on the diff --git a/debian/netdata-core-no-sse.README.Debian b/debian/netdata-core-no-sse.README.Debian deleted file mode 120000 index bbb6e37e3..000000000 --- a/debian/netdata-core-no-sse.README.Debian +++ /dev/null @@ -1 +0,0 @@ -netdata-core.README.Debian \ No newline at end of file diff --git a/debian/netdata-core-no-sse.dirs b/debian/netdata-core-no-sse.dirs deleted file mode 120000 index 05b68142c..000000000 --- a/debian/netdata-core-no-sse.dirs +++ /dev/null @@ -1 +0,0 @@ -netdata-core.dirs \ No newline at end of file diff --git a/debian/netdata-core-no-sse.docs b/debian/netdata-core-no-sse.docs deleted file mode 120000 index 543b6cb1a..000000000 --- a/debian/netdata-core-no-sse.docs +++ /dev/null @@ -1 +0,0 @@ -netdata-core.docs \ No newline at end of file diff --git a/debian/netdata-core-no-sse.install b/debian/netdata-core-no-sse.install deleted file mode 120000 index 0392bb314..000000000 --- a/debian/netdata-core-no-sse.install +++ /dev/null @@ -1 +0,0 @@ -netdata-core.install \ No newline at end of file diff --git a/debian/netdata-core-no-sse.lintian-overrides b/debian/netdata-core-no-sse.lintian-overrides deleted file mode 100644 index c5b056ebc..000000000 --- a/debian/netdata-core-no-sse.lintian-overrides +++ /dev/null @@ -1,10 +0,0 @@ -# See Debian policy 10.9. apps.plugin has extra capabilities, so don't let -# normal users run it. -netdata-core-no-sse: non-standard-executable-perm usr/lib/netdata/plugins.d/apps.plugin 0754 != 0755 - -# user created during install -netdata-core-no-sse: maintainer-script-should-not-use-recursive-chown-or-chmod - -# plugins that require root access -netdata-core-no-sse: setuid-binary usr/lib/netdata/plugins.d/freeipmi.plugin 4754 root/root -netdata-core-no-sse: setuid-binary usr/lib/netdata/plugins.d/perf.plugin 4754 root/root diff --git a/debian/netdata-core-no-sse.maintscript b/debian/netdata-core-no-sse.maintscript deleted file mode 120000 index 172440be6..000000000 --- a/debian/netdata-core-no-sse.maintscript +++ /dev/null @@ -1 +0,0 @@ -netdata-core.maintscript \ No newline at end of file diff --git a/debian/netdata-core-no-sse.manpages b/debian/netdata-core-no-sse.manpages deleted file mode 120000 index a1bcd67c9..000000000 --- a/debian/netdata-core-no-sse.manpages +++ /dev/null @@ -1 +0,0 @@ -netdata-core.manpages \ No newline at end of file diff --git a/debian/netdata-core-no-sse.netdata.logrotate b/debian/netdata-core-no-sse.netdata.logrotate deleted file mode 120000 index c3eda3bf7..000000000 --- a/debian/netdata-core-no-sse.netdata.logrotate +++ /dev/null @@ -1 +0,0 @@ -netdata-core.netdata.logrotate \ No newline at end of file diff --git a/debian/netdata-core-no-sse.netdata.service b/debian/netdata-core-no-sse.netdata.service deleted file mode 120000 index d1c2116e0..000000000 --- a/debian/netdata-core-no-sse.netdata.service +++ /dev/null @@ -1 +0,0 @@ -netdata-core.netdata.service \ No newline at end of file diff --git a/debian/netdata-core-no-sse.postinst b/debian/netdata-core-no-sse.postinst deleted file mode 120000 index 1199fe923..000000000 --- a/debian/netdata-core-no-sse.postinst +++ /dev/null @@ -1 +0,0 @@ -netdata-core.postinst \ No newline at end of file diff --git a/debian/netdata-core-no-sse.postrm b/debian/netdata-core-no-sse.postrm deleted file mode 120000 index 6f58bdaff..000000000 --- a/debian/netdata-core-no-sse.postrm +++ /dev/null @@ -1 +0,0 @@ -netdata-core.postrm \ No newline at end of file diff --git a/debian/rules b/debian/rules index cd01812b3..314b00c81 100755 --- a/debian/rules +++ b/debian/rules @@ -2,8 +2,6 @@ TOP = $(CURDIR)/debian/netdata -PACKAGES := $(shell dh_listpackages -a) - VERSION := $(shell dpkg-parsechangelog -SVersion) VERSION_MAJOR := $(word 1, $(subst ., ,$(VERSION))) VERSION_MINOR := $(word 2, $(subst ., ,$(VERSION))) @@ -26,8 +24,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed dh ${@} --with apache2 execute_before_dh_autoreconf: - mkdir -p web/server/h2o/libh2o mqtt_websockets - rm -f debian/configure.ac.orig cp configure.ac debian/configure.ac.orig @@ -44,54 +40,18 @@ execute_before_dh_autoreconf_clean: mv debian/configure.ac.orig configure.ac; \ fi -execute_after_dh_auto_clean: - rm -rf build-core - rm -rf build-core-no-sse debian/tmp-core-no-sse - - for FILE in $$(find tests -type f -name "*.in"); \ - do \ - rm -f $$(dirname $${FILE})/$$(basename $${FILE} .in); \ - done - override_dh_auto_configure: - mkdir -p build-core - dh_auto_configure -B build-core -- --libdir=/usr/lib --libexecdir=/usr/lib \ + dh_auto_configure -- --libdir=/usr/lib --libexecdir=/usr/lib \ --disable-cloud \ - --enable-x86-sse \ - --disable-exporting-prometheus-remote-write \ - --enable-dbengine \ - --enable-https \ - --enable-plugin-cups \ - --enable-plugin-nfacct \ - --with-math - cp -a mqtt_websockets system tests build-core - cp -a web/gui/src build-core/web/gui - -ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) - mkdir -p build-core-no-sse - dh_auto_configure -B build-core-no-sse -- --libdir=/usr/lib --libexecdir=/usr/lib \ - --disable-cloud \ - --disable-x86-sse \ --disable-exporting-prometheus-remote-write \ --enable-dbengine \ --enable-https \ --enable-plugin-cups \ --enable-plugin-nfacct \ + --enable-x86-sse \ --with-math - cp -a mqtt_websockets system tests build-core-no-sse - cp -a web/gui/src build-core-no-sse/web/gui -endif - -override_dh_auto_build: - dh_auto_build -B build-core - -ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) - dh_auto_build -B build-core-no-sse -endif - -override_dh_auto_install: - dh_auto_install -B build-core -- DESTDIR=$(CURDIR)/debian/tmp +execute_after_dh_auto_install: # Removing unused files rm -f debian/tmp/etc/netdata/.install-type rm -f debian/tmp/etc/netdata/netdata-updater.conf @@ -101,10 +61,6 @@ override_dh_auto_install: # Building without aws kinesis backend (needs aws sdk) rm -f debian/tmp/usr/lib/netdata/conf.d/aws_kinesis.conf -ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) - dh_auto_install -B build-core-no-sse -- DESTDIR=$(CURDIR)/debian/tmp-core-no-sse -endif - override_dh_install-arch: find debian/tmp -name .keep -delete @@ -120,25 +76,7 @@ override_dh_install-arch: $(TOP)-core/usr/lib/netdata/plugins.d; \ done -ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) - find debian/tmp-core-no-sse -name .keep -delete - dh_install -p netdata-core-no-sse --sourcedir=debian/tmp-core-no-sse - - mkdir -p $(TOP)-core-no-sse/etc/netdata - cp debian/local/netdata/netdata.conf $(TOP)-core-no-sse/etc/netdata - touch $(TOP)-core-no-sse/etc/netdata/.opt-out-from-anonymous-statistics - - mkdir -p $(TOP)-core-no-sse/usr/lib/netdata/plugins.d - for plugin in cgroup-network apps.plugin nfacct.plugin perf.plugin slabinfo.plugin; \ - do \ - cp debian/tmp-core-no-sse/usr/lib/netdata/plugins.d/$${plugin} \ - $(TOP)-core-no-sse/usr/lib/netdata/plugins.d; \ - done - - dh_install -a --remaining-packages -else dh_install -a -endif override_dh_install-indep: find debian/tmp -name .keep -delete @@ -163,16 +101,6 @@ override_dh_install-indep: # Setting package version (update check) echo $(VERSION) > $(TOP)-web/usr/share/netdata/web/version.txt -override_dh_installsystemd: - dh_installsystemd -p netdata-core --name=netdata - dh_installsystemd -p netdata-core-no-sse --name=netdata - dh_installsystemd --remaining-packages - -override_dh_installlogrotate: - dh_installlogrotate -p netdata-core --name=netdata - dh_installlogrotate -p netdata-core-no-sse --name=netdata - dh_installlogrotate --remaining-packages - override_dh_fixperms-arch: dh_fixperms -a @@ -180,10 +108,6 @@ override_dh_fixperms-arch: # 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 -ifeq (netdata-core-no-sse,$(findstring netdata-core-no-sse,$(PACKAGES))) - chmod 0754 $(TOP)-core-no-sse/usr/lib/netdata/plugins.d/apps.plugin - chmod 4754 $(TOP)-core-no-sse/usr/lib/netdata/plugins.d/perf.plugin -endif override_dh_fixperms-indep: dh_fixperms -i -- cgit v1.2.3