diff options
author | Paul Emm. Katsoulakis <34388743+paulkatsoulakis@users.noreply.github.com> | 2020-01-22 20:53:39 +0100 |
---|---|---|
committer | Austin S. Hemmelgarn <austin@netdata.cloud> | 2020-01-22 14:53:39 -0500 |
commit | b887379e5a600f20f73b1914ad653b0d18a9cbf6 (patch) | |
tree | 269a60eed5647ba4351c9651b91ad7e522bb44db | |
parent | b93aaad43c5861d1ba47df62cd07ca0e3223455a (diff) |
netdata/packaging: following the pattern from CUPS, separate freeIPMI (#6939)
1) side fix: correction of wording in CUPS description
2) Create subpackage for free IPMI
3) Settle the rules for populating the new package and removing freeipmi from core package
Note: We use strict version matching, once this works fine we need to go back and fix this for CUPS as well
Co-authored-by: Austin S. Hemmelgarn <ahferroin7@gmail.com>
-rw-r--r-- | contrib/debian/control | 10 | ||||
-rw-r--r-- | contrib/debian/control.buster | 10 | ||||
-rw-r--r-- | contrib/debian/control.jessie | 12 | ||||
-rw-r--r-- | contrib/debian/control.trusty | 10 | ||||
-rw-r--r-- | contrib/debian/control.wheezy | 9 | ||||
-rw-r--r-- | contrib/debian/control.xenial | 10 | ||||
-rwxr-xr-x | contrib/debian/rules | 10 |
7 files changed, 64 insertions, 7 deletions
diff --git a/contrib/debian/control b/contrib/debian/control index a06f293768..e6d6a958bd 100644 --- a/contrib/debian/control +++ b/contrib/debian/control @@ -43,7 +43,6 @@ Depends: adduser, openssl, libmnl0, libjson-c3, - freeipmi, libnetfilter-acct1, libprotobuf-c1, libsnappy1v5, @@ -62,3 +61,12 @@ Architecture: any Depends: cups, netdata (>= ${source:Version}) Description: The Common Unix Printing System plugin for metrics collection from cupsd + +Package: netdata-plugin-freeipmi +Architecture: any +Depends: freeipmi, + netdata (= ${source:Version}) +Description: FreeIPMI - The Intelligent Platform Management System. + The IPMI specification defines a set of interfaces for platform management. + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL). diff --git a/contrib/debian/control.buster b/contrib/debian/control.buster index 7c4d6e8923..2ba868454e 100644 --- a/contrib/debian/control.buster +++ b/contrib/debian/control.buster @@ -43,7 +43,6 @@ Depends: adduser, openssl, libmnl0, libjson-c3, - freeipmi, libnetfilter-acct1, libprotobuf-c1, libsnappy1v5, @@ -62,3 +61,12 @@ Architecture: any Depends: cups, netdata (>= ${source:Version}) Description: The Common Unix Printing System plugin for metrics collection from cupsd + +Package: netdata-plugin-freeipmi +Architecture: any +Depends: freeipmi, + netdata (= ${source:Version}) +Description: FreeIPMI - The Intelligent Platform Management System. + The IPMI specification defines a set of interfaces for platform management. + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL). diff --git a/contrib/debian/control.jessie b/contrib/debian/control.jessie index 15e0d1335a..295788a5a8 100644 --- a/contrib/debian/control.jessie +++ b/contrib/debian/control.jessie @@ -40,8 +40,7 @@ Depends: adduser, libjudydebian1, openssl, libmnl0, - libjson-c2, - freeipmi, + libjson-c3, libnetfilter-acct1, libprotobuf-c1, libsnappy1, @@ -60,3 +59,12 @@ Architecture: any Depends: cups, netdata (>= ${source:Version}) Description: The Common Unix Printing System plugin for metrics collection from cupsd + +Package: netdata-plugin-freeipmi +Architecture: any +Depends: freeipmi, + netdata (= ${source:Version}) +Description: FreeIPMI - The Intelligent Platform Management System. + The IPMI specification defines a set of interfaces for platform management. + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL). diff --git a/contrib/debian/control.trusty b/contrib/debian/control.trusty index 9e4e43b8f2..9aa3660f12 100644 --- a/contrib/debian/control.trusty +++ b/contrib/debian/control.trusty @@ -41,7 +41,6 @@ Depends: adduser, openssl, libmnl0, libjson-c2, - freeipmi, libnetfilter-acct1, libprotobuf-c0, libsnappy1, @@ -60,3 +59,12 @@ Architecture: any Depends: cups, netdata (>= ${source:Version}) Description: The Common Unix Printing System plugin for metrics collection from cupsd + +Package: netdata-plugin-freeipmi +Architecture: any +Depends: freeipmi, + netdata (= ${source:Version}) +Description: FreeIPMI - The Intelligent Platform Management System. + The IPMI specification defines a set of interfaces for platform management. + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL). diff --git a/contrib/debian/control.wheezy b/contrib/debian/control.wheezy index cc725c04ca..b647a88f45 100644 --- a/contrib/debian/control.wheezy +++ b/contrib/debian/control.wheezy @@ -29,3 +29,12 @@ Architecture: any Depends: cups, netdata (>= ${source:Version}) Description: The Common Unix Printing System plugin for metrics collection from cupsd + +Package: netdata-plugin-freeipmi +Architecture: any +Depends: freeipmi, + netdata (= ${source:Version}) +Description: FreeIPMI - The Intelligent Platform Management System. + The IPMI specification defines a set of interfaces for platform management. + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL). diff --git a/contrib/debian/control.xenial b/contrib/debian/control.xenial index 2d986d5e54..bd3e79ba33 100644 --- a/contrib/debian/control.xenial +++ b/contrib/debian/control.xenial @@ -43,7 +43,6 @@ Depends: adduser, openssl, libmnl0, libjson-c2, - freeipmi, libnetfilter-acct1, libprotobuf-c1, libsnappy1v5, @@ -62,3 +61,12 @@ Architecture: any Depends: cups, netdata (>= ${source:Version}) Description: The Common Unix Printing System plugin for metrics collection from cupsd + +Package: netdata-plugin-freeipmi +Architecture: any +Depends: freeipmi, + netdata (= ${source:Version}) +Description: FreeIPMI - The Intelligent Platform Management System. + The IPMI specification defines a set of interfaces for platform management. + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL). diff --git a/contrib/debian/rules b/contrib/debian/rules index 56d346aeb7..9c756aaabc 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -34,6 +34,12 @@ override_dh_install: debian/netdata.postinst mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/cups.plugin \ $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin + # Add free IPMI plugin install rules + # + mkdir -p $(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d + mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/freeipmi.plugin \ + $(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d/freeipmi.plugin + # Set the rest of the software in the main package # cp -rp $(TEMPTOP)/usr $(TOP) @@ -86,7 +92,6 @@ override_dh_fixperms: # given extra capabilities in the postinst script. # chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/apps.plugin - chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/freeipmi.plugin chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/perf.plugin chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/slabinfo.plugin chmod 0750 $(TOP)/usr/libexec/netdata/plugins.d/go.d.plugin @@ -94,6 +99,9 @@ override_dh_fixperms: # CUPS plugin package chmod 0750 $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin + # freeIPMI plugin package + chmod 0754 $(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d/freeipmi.plugin + override_dh_installlogrotate: cp system/netdata.logrotate debian/netdata.logrotate dh_installlogrotate |