Previously the MIB modules to be compiled where specified in a space
separated list only. Other packages depending on special modules could
not easily set a dependency. Now there are some extra menu entries to be
referenced by other packages and still the old list. Both are integrated
at build time.
Signed-off-by: Alexander Dahl <p...@lespocky.de>
---
rules/net-snmp.in | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
rules/net-snmp.make | 9 ++++++++-
2 files changed, 56 insertions(+), 1 deletion(-)
diff --git a/rules/net-snmp.in b/rules/net-snmp.in
index 95b7d43..a36a915 100644
--- a/rules/net-snmp.in
+++ b/rules/net-snmp.in
@@ -6,6 +6,7 @@ menuconfig NET_SNMP
select GCCLIBS_GCC_S if NET_SNMP_AGENT
select LIBC_DL if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
select LIBNL if NET_SNMP_AGENT || NET_SNMP_APPLICATIONS
+ select LM_SENSORS if NET_SNMP_MIB_MODULES_LM_SENSORS
if NET_SNMP
@@ -101,10 +102,57 @@ config NET_SNMP_PERSISTENT_DIR
string
default "/var/net-snmp"
+menu "additional mib modules "
+
+config NET_SNMP_MIB_MODULES_AGENTX
+ prompt "agentx"
+ bool
+ help
+ AgentX support (includes both agentx/master and agentx/client).
+
+config NET_SNMP_MIB_MODULES_UCD_SNMP
+ prompt "ucd_snmp"
+ bool
+ help
+ UCD-SNMP-MIB specific extensions.
+
+config NET_SNMP_MIB_MODULES_LM_SENSORS
+ prompt "ucd-snmp/lmsensorsMib"
+ bool
+ help
+ hardware monitoring (LM-SENSORS-MIB)
+
config NET_SNMP_MIB_MODULES
prompt "additional mib modules"
string
default ""
+ help
+ space separated list of optional modules
+ tunnel Linux TUNNEL-MIB support (ifTable extension)
+ mibII/interfaces (old ifTable implementation)
+ misc/ipfwacc accounting rules IP firewall information
+ ipfwchains/ipfwchains firewall chains under ipfw
+ sctp-mib support for the SCTP-MIB
+ etherlike-mib support for the EtherLike-MIB
+
+config NET_SNMP_WITHOUT_MIB_MODULES
+ prompt "without these mib modules"
+ string
+ default ""
+ help
+ space separated list of default mib modules compiled into the
+ agent (which can be removed):
+ mibII support for the mib-II tree.
+ snmpv3mibs support for the snmpv3 mib modules.
+ agent_mibs NET-SNMP-AGENT-MIB extensions
+ notification mibs supporting specification of trap
destinations.
+ target Support for the SNMP WGs TARGET-MIB.
+ utilities general agent configuration utilities.
+ disman/event support for the DISMAN-EVENT-MIB
+ disman/schedule support for the DISMAN-SCHEDULE-MIB
+ host host resources mib support.
+
+endmenu
config NET_SNMP_DEFAULT_MIBS
prompt "default mib id's to read"
diff --git a/rules/net-snmp.make b/rules/net-snmp.make
index 894946b..fca6417 100644
--- a/rules/net-snmp.make
+++ b/rules/net-snmp.make
@@ -33,6 +33,12 @@ NET_SNMP_PATH := PATH=$(CROSS_PATH)
NET_SNMP_ENV := $(CROSS_ENV)
NET_SNMP_BINCONFIG_GLOB := net-snmp-config
+NET_SNMP_MIB_MODULES-y := $(call remove_quotes,$(PTXCONF_NET_SNMP_MIB_MODULES))
+NET_SNMP_MIB_MODULES- := $(call
remove_quotes,$(PTXCONF_NET_SNMP_WITHOUT_MIB_MODULES))
+NET_SNMP_MIB_MODULES-$(PTXCONF_NET_SNMP_MIB_MODULES_AGENTX) += agentx
+NET_SNMP_MIB_MODULES-$(PTXCONF_NET_SNMP_MIB_MODULES_UCD_SNMP) += ucd_snmp
+NET_SNMP_MIB_MODULES-$(PTXCONF_NET_SNMP_MIB_MODULES_LM_SENSORS) +=
ucd-snmp/lmsensorsMib
+
#
# autoconf
#
@@ -42,7 +48,8 @@ NET_SNMP_AUTOCONF := \
--with-defaults \
--disable-manuals \
--without-openssl \
- --with-mib-modules=$(PTXCONF_NET_SNMP_MIB_MODULES) \
+ --with-mib-modules="$(NET_SNMP_MIB_MODULES-y)" \
+ --with-out-mib-modules="$(NET_SNMP_MIB_MODULES-)" \
--with-mibs=$(PTXCONF_NET_SNMP_DEFAULT_MIBS) \
--with-logfile=$(call remove_quotes,$(PTXCONF_NET_SNMP_LOGFILE)) \
--with-persistent-directory=$(call
remove_quotes,$(PTXCONF_NET_SNMP_PERSISTENT_DIR)) \
--
1.7.10.4
--
ptxdist mailing list
ptxdist@pengutronix.de
