From 259c96a1bcf461b1f259a9ef0291142509863bfb Mon Sep 17 00:00:00 2001 From: Sven Roederer Date: Sun, 9 Oct 2016 16:01:54 +0200 Subject: [PATCH] net-snmp: add package snmp-mibs this installs the default MIBS-files under /usr/share/snmp/mibs . Also aligns the defines to the same sorting-scheme. backport of daeb5fd5063d5b49829d76ee05938178acc93946 Signed-off-by: Sven Roederer --- net/net-snmp/Makefile | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index 5736e0d7d4..e12950f333 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2017 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=net-snmp PKG_VERSION:=5.4.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/net-snmp @@ -50,6 +50,18 @@ $(call Package/net-snmp/Default/description) endef +define Package/snmp-mibs +$(call Package/net-snmp/Default) + TITLE:=Open source SNMP implementation (MIB-files) +endef + +define Package/snmp-mibs/description +$(call Package/net-snmp/Default/description) + . + This package contains SNMP MIB-Files. +endef + + define Package/snmp-utils $(call Package/net-snmp/Default) DEPENDS:=+libnetsnmp @@ -164,7 +176,6 @@ CONFIGURE_ARGS += \ --enable-applications \ --disable-debugging \ --disable-manuals \ - --disable-mibs \ --disable-scripts \ --with-out-mib-modules="$(SNMP_MIB_MODULES_EXCLUDED)" \ --with-mib-modules="$(SNMP_MIB_MODULES_INCLUDED)" \ @@ -215,6 +226,16 @@ define Package/libnetsnmp/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libnetsnmp{,agent,helpers,mibs}.so.* $(1)/usr/lib/ endef +define Package/snmp-mibs/install + $(INSTALL_DIR) $(1)/usr/share/snmp/mibs + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/snmp/mibs/* $(1)/usr/share/snmp/mibs/ +endef + +define Package/snmp-utils/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(1)/usr/bin/ +endef + define Package/snmpd/conffiles /etc/config/snmpd endef @@ -245,12 +266,8 @@ define Package/snmpd-static/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/agent/snmpd-static $(1)/usr/sbin/snmpd endef -define Package/snmp-utils/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/snmp{get,set,status,test,trap,walk} $(1)/usr/bin/ -endef - $(eval $(call BuildPackage,libnetsnmp)) +$(eval $(call BuildPackage,snmp-mibs)) $(eval $(call BuildPackage,snmp-utils)) $(eval $(call BuildPackage,snmpd)) $(eval $(call BuildPackage,snmpd-static)) -- 2.30.2