Message ID | 20180905161049.13809-1-a.filippov@yadro.com |
---|---|
State | Not Applicable, archived |
Headers | show |
Series | [sumo,meta-networking] split net-snmp-libs into smaller packages | expand |
On 09/05/2018 09:10 AM, Alexander Filippov wrote: > By default `net-snmp-libs` contains all compiled libs. > This commit splits `net-snmp-libs` into subpackages for each library. > > This allows for smaller resulting image due to finer packaging. > > Signed-off-by: Alexander Filippov <a.filippov@yadro.com> Please submit for master. > --- > .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 23 ++++++++++++++++++---- > 1 file changed, 19 insertions(+), 4 deletions(-) > > diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb > index faf73a563..4ea0a5915 100644 > --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb > +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb > @@ -173,17 +173,21 @@ net_snmp_sysroot_preprocess () { > fi > } > > -PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client ${PN}-server-snmpd ${PN}-server-snmptrapd" > +PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client \ > + ${PN}-server-snmpd ${PN}-server-snmptrapd \ > + ${PN}-lib-netsnmp ${PN}-lib-agent ${PN}-lib-helpers \ > + ${PN}-lib-mibs ${PN}-lib-trapd" > > # perl module > PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl-modules', '', d)}" > > ALLOW_EMPTY_${PN} = "1" > ALLOW_EMPTY_${PN}-server = "1" > +ALLOW_EMPTY_${PN}-libs = "1" > > FILES_${PN}-perl-modules = "${libdir}/perl/*" > > -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" > +FILES_${PN}-libs = "" > FILES_${PN}-mibs = "${datadir}/snmp/mibs" > FILES_${PN}-server-snmpd = "${sbindir}/snmpd \ > ${sysconfdir}/snmp/snmpd.conf \ > @@ -196,6 +200,12 @@ FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ > ${systemd_unitdir}/system/snmptrapd.service \ > " > > +FILES_${PN}-lib-netsnmp = "${libdir}/libnetsnmp${SOLIBS}" > +FILES_${PN}-lib-agent = "${libdir}/libnetsnmpagent${SOLIBS}" > +FILES_${PN}-lib-helpers = "${libdir}/libnetsnmphelpers${SOLIBS}" > +FILES_${PN}-lib-mibs = "${libdir}/libnetsnmpmibs${SOLIBS}" > +FILES_${PN}-lib-trapd = "${libdir}/libnetsnmptrapd${SOLIBS}" > + > FILES_${PN} = "" > FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" > FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" > @@ -219,10 +229,15 @@ SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service" > RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'net-snmp-perl-modules', '', d)}" > RDEPENDS_${PN} += "net-snmp-client" > RDEPENDS_${PN}-server-snmpd += "net-snmp-mibs" > -RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd" > +RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd ${PN}-lib-trapd" > RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd" > RDEPENDS_${PN}-client += "net-snmp-mibs net-snmp-libs" > -RDEPENDS_${PN}-libs += "libpci" > +RDEPENDS_${PN}-libs += "libpci \ > + ${PN}-lib-netsnmp \ > + ${PN}-lib-agent \ > + ${PN}-lib-helpers \ > + ${PN}-lib-mibs \ > +" > RDEPENDS_${PN}-ptest += "perl \ > perl-module-test \ > perl-module-file-basename \
diff --git a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb index faf73a563..4ea0a5915 100644 --- a/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb +++ b/meta-networking/recipes-protocols/net-snmp/net-snmp_5.7.3.bb @@ -173,17 +173,21 @@ net_snmp_sysroot_preprocess () { fi } -PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client ${PN}-server-snmpd ${PN}-server-snmptrapd" +PACKAGES += "${PN}-libs ${PN}-mibs ${PN}-server ${PN}-client \ + ${PN}-server-snmpd ${PN}-server-snmptrapd \ + ${PN}-lib-netsnmp ${PN}-lib-agent ${PN}-lib-helpers \ + ${PN}-lib-mibs ${PN}-lib-trapd" # perl module PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'perl', '${PN}-perl-modules', '', d)}" ALLOW_EMPTY_${PN} = "1" ALLOW_EMPTY_${PN}-server = "1" +ALLOW_EMPTY_${PN}-libs = "1" FILES_${PN}-perl-modules = "${libdir}/perl/*" -FILES_${PN}-libs = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-libs = "" FILES_${PN}-mibs = "${datadir}/snmp/mibs" FILES_${PN}-server-snmpd = "${sbindir}/snmpd \ ${sysconfdir}/snmp/snmpd.conf \ @@ -196,6 +200,12 @@ FILES_${PN}-server-snmptrapd = "${sbindir}/snmptrapd \ ${systemd_unitdir}/system/snmptrapd.service \ " +FILES_${PN}-lib-netsnmp = "${libdir}/libnetsnmp${SOLIBS}" +FILES_${PN}-lib-agent = "${libdir}/libnetsnmpagent${SOLIBS}" +FILES_${PN}-lib-helpers = "${libdir}/libnetsnmphelpers${SOLIBS}" +FILES_${PN}-lib-mibs = "${libdir}/libnetsnmpmibs${SOLIBS}" +FILES_${PN}-lib-trapd = "${libdir}/libnetsnmptrapd${SOLIBS}" + FILES_${PN} = "" FILES_${PN}-client = "${bindir}/* ${datadir}/snmp/" FILES_${PN}-dbg += "${libdir}/.debug/ ${sbindir}/.debug/ ${bindir}/.debug/" @@ -219,10 +229,15 @@ SYSTEMD_SERVICE_${PN}-server-snmptrapd = "snmptrapd.service" RDEPENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'net-snmp-perl-modules', '', d)}" RDEPENDS_${PN} += "net-snmp-client" RDEPENDS_${PN}-server-snmpd += "net-snmp-mibs" -RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd" +RDEPENDS_${PN}-server-snmptrapd += "net-snmp-server-snmpd ${PN}-lib-trapd" RDEPENDS_${PN}-server += "net-snmp-server-snmpd net-snmp-server-snmptrapd" RDEPENDS_${PN}-client += "net-snmp-mibs net-snmp-libs" -RDEPENDS_${PN}-libs += "libpci" +RDEPENDS_${PN}-libs += "libpci \ + ${PN}-lib-netsnmp \ + ${PN}-lib-agent \ + ${PN}-lib-helpers \ + ${PN}-lib-mibs \ +" RDEPENDS_${PN}-ptest += "perl \ perl-module-test \ perl-module-file-basename \
By default `net-snmp-libs` contains all compiled libs. This commit splits `net-snmp-libs` into subpackages for each library. This allows for smaller resulting image due to finer packaging. Signed-off-by: Alexander Filippov <a.filippov@yadro.com> --- .../recipes-protocols/net-snmp/net-snmp_5.7.3.bb | 23 ++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-)