@cryptotaxi247 / netdata-1 / commits / b887379e5

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>

Paul Emm. Katsoulakis committed Jan 22, 2020 at 20:53 UTC b887379e5a600f20f73b1914ad653b0d18a9cbf6
7 files changed +64 -7
contrib/debian/control
+9 -1
@@ -43,7 +43,6 @@ Depends: adduser,
43 openssl,
44 libmnl0,
45 libjson-c3,
46 - freeipmi,
46 libnetfilter-acct1,
47 libprotobuf-c1,
48 libsnappy1v5,
@@ -62,3 +61,12 @@ Architecture: any
61 Depends: cups,
62 netdata (>= ${source:Version})
63 Description: The Common Unix Printing System plugin for metrics collection from cupsd
64 +
65 +Package: netdata-plugin-freeipmi
66 +Architecture: any
67 +Depends: freeipmi,
68 + netdata (= ${source:Version})
69 +Description: FreeIPMI - The Intelligent Platform Management System.
70 + The IPMI specification defines a set of interfaces for platform management.
71 + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in
72 + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL).
contrib/debian/control.buster
+9 -1
@@ -43,7 +43,6 @@ Depends: adduser,
43 openssl,
44 libmnl0,
45 libjson-c3,
46 - freeipmi,
46 libnetfilter-acct1,
47 libprotobuf-c1,
48 libsnappy1v5,
@@ -62,3 +61,12 @@ Architecture: any
61 Depends: cups,
62 netdata (>= ${source:Version})
63 Description: The Common Unix Printing System plugin for metrics collection from cupsd
64 +
65 +Package: netdata-plugin-freeipmi
66 +Architecture: any
67 +Depends: freeipmi,
68 + netdata (= ${source:Version})
69 +Description: FreeIPMI - The Intelligent Platform Management System.
70 + The IPMI specification defines a set of interfaces for platform management.
71 + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in
72 + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL).
contrib/debian/control.jessie
+10 -2
@@ -40,8 +40,7 @@ Depends: adduser,
40 libjudydebian1,
41 openssl,
42 libmnl0,
43 - libjson-c2,
44 - freeipmi,
43 + libjson-c3,
44 libnetfilter-acct1,
45 libprotobuf-c1,
46 libsnappy1,
@@ -60,3 +59,12 @@ Architecture: any
59 Depends: cups,
60 netdata (>= ${source:Version})
61 Description: The Common Unix Printing System plugin for metrics collection from cupsd
62 +
63 +Package: netdata-plugin-freeipmi
64 +Architecture: any
65 +Depends: freeipmi,
66 + netdata (= ${source:Version})
67 +Description: FreeIPMI - The Intelligent Platform Management System.
68 + The IPMI specification defines a set of interfaces for platform management.
69 + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in
70 + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL).
contrib/debian/control.trusty
+9 -1
@@ -41,7 +41,6 @@ Depends: adduser,
41 openssl,
42 libmnl0,
43 libjson-c2,
44 - freeipmi,
44 libnetfilter-acct1,
45 libprotobuf-c0,
46 libsnappy1,
@@ -60,3 +59,12 @@ Architecture: any
59 Depends: cups,
60 netdata (>= ${source:Version})
61 Description: The Common Unix Printing System plugin for metrics collection from cupsd
62 +
63 +Package: netdata-plugin-freeipmi
64 +Architecture: any
65 +Depends: freeipmi,
66 + netdata (= ${source:Version})
67 +Description: FreeIPMI - The Intelligent Platform Management System.
68 + The IPMI specification defines a set of interfaces for platform management.
69 + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in
70 + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL).
contrib/debian/control.wheezy
+9
@@ -29,3 +29,12 @@ Architecture: any
29 Depends: cups,
30 netdata (>= ${source:Version})
31 Description: The Common Unix Printing System plugin for metrics collection from cupsd
32 +
33 +Package: netdata-plugin-freeipmi
34 +Architecture: any
35 +Depends: freeipmi,
36 + netdata (= ${source:Version})
37 +Description: FreeIPMI - The Intelligent Platform Management System.
38 + The IPMI specification defines a set of interfaces for platform management.
39 + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in
40 + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL).
contrib/debian/control.xenial
+9 -1
@@ -43,7 +43,6 @@ Depends: adduser,
43 openssl,
44 libmnl0,
45 libjson-c2,
46 - freeipmi,
46 libnetfilter-acct1,
47 libprotobuf-c1,
48 libsnappy1v5,
@@ -62,3 +61,12 @@ Architecture: any
61 Depends: cups,
62 netdata (>= ${source:Version})
63 Description: The Common Unix Printing System plugin for metrics collection from cupsd
64 +
65 +Package: netdata-plugin-freeipmi
66 +Architecture: any
67 +Depends: freeipmi,
68 + netdata (= ${source:Version})
69 +Description: FreeIPMI - The Intelligent Platform Management System.
70 + The IPMI specification defines a set of interfaces for platform management.
71 + It is implemented by a number vendors for system management. The features of IPMI that most users will be interested in
72 + are sensor monitoring, system event monitoring, power control, and serial-over-LAN (SOL).
contrib/debian/rules
+9 -1
@@ -34,6 +34,12 @@ override_dh_install: debian/netdata.postinst
34 mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/cups.plugin \
35 $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin
36
37 + # Add free IPMI plugin install rules
38 + #
39 + mkdir -p $(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d
40 + mv -f $(TEMPTOP)/usr/libexec/netdata/plugins.d/freeipmi.plugin \
41 + $(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d/freeipmi.plugin
42 +
43 # Set the rest of the software in the main package
44 #
45 cp -rp $(TEMPTOP)/usr $(TOP)
@@ -86,7 +92,6 @@ override_dh_fixperms:
92 # given extra capabilities in the postinst script.
93 #
94 chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/apps.plugin
89 - chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/freeipmi.plugin
95 chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/perf.plugin
96 chmod 0754 $(TOP)/usr/libexec/netdata/plugins.d/slabinfo.plugin
97 chmod 0750 $(TOP)/usr/libexec/netdata/plugins.d/go.d.plugin
@@ -94,6 +99,9 @@ override_dh_fixperms:
99 # CUPS plugin package
100 chmod 0750 $(TOP)-plugin-cups/usr/libexec/netdata/plugins.d/cups.plugin
101
102 + # freeIPMI plugin package
103 + chmod 0754 $(TOP)-plugin-freeipmi/usr/libexec/netdata/plugins.d/freeipmi.plugin
104 +
105 override_dh_installlogrotate:
106 cp system/netdata.logrotate debian/netdata.logrotate
107 dh_installlogrotate