Changeset 775f99a in freewrt for package/net-snmp

Timestamp:

Nov 10, 2006, 1:02:55 AM (19 years ago)

Author:

Waldemar Brodkorb <wbx@…>

Branches:

freewrt_1_0, freewrt_2_0

Children:

6db3678

Parents:

d4edf63

Message:

remove static version of snmpd

git-svn-id: ​svn://www.freewrt.org/branches/freewrt_1_0@1108 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package/net-snmp

Files:

• Config.in (modified) (5 diffs)
• Makefile (modified) (4 diffs)
• ipkg/snmpd-static.conffiles (deleted)
• ipkg/snmpd-static.control (deleted)

package/net-snmp/Config.in

@@ -1 @@
-
 config FWRT_COMPILE_NET_SNMP
         bool
@@ -6 +5 @@
 config FWRT_DUMMY_NET_SNMP
         bool
-        prompt "net-snmp.......................... SNMP Server and Cliet packages"
+        prompt "net-snmp.......................... SNMP Server and Client packages"
 
 config FWRT_PACKAGE_LIBNETSNMP
         prompt "libnetsnmp...................... SNMP shared libraries"
         tristate
-        default m if CONFIG_DEVEL
+        default n
         depends FWRT_DUMMY_NET_SNMP
         select FWRT_COMPILE_NET_SNMP
@@ -29 +28 @@
         prompt "snmp-utils...................... SNMP client utilities"
         tristate
-        default m if CONFIG_DEVEL
+        default n
         depends FWRT_DUMMY_NET_SNMP
         select FWRT_PACKAGE_LIBNETSNMP
@@ -46 +45 @@
         prompt "snmpd........................... SNMP agent"
         tristate
-        default m if CONFIG_DEVEL
+        default n
         depends FWRT_DUMMY_NET_SNMP
         select FWRT_PACKAGE_LIBNETSNMP
@@ -60 +59 @@
           This package contains the SNMP agent, dynamically linked.
 
-config FWRT_PACKAGE_SNMPD_STATIC
-        prompt "snmpd-static.................... SNMP agent (statically linked)"
-        tristate
-        default m if CONFIG_DEVEL
-        depends FWRT_DUMMY_NET_SNMP
-        select FWRT_COMPILE_NET_SNMP
-        select FWRT_PACKAGE_LIBELF
-        help
-          Simple Network Management Protocol (SNMP) is a widely used 
-          protocol for monitoring the health and welfare of network 
-          equipment (eg. routers), computer equipment and even devices 
-          like UPSs. Net-SNMP is a suite of applications used to implement 
-          SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6.
-          
-          http://www.net-snmp.org/
-          
-          This package contains the SNMP agent, statically linked.
-

package/net-snmp/Makefile

@@ -9 +9 @@
 PKG_NAME:=              net-snmp
 PKG_VERSION:=           5.1.2
-PKG_RELEASE:=           3
+PKG_RELEASE:=           4
 PKG_MD5SUM:=            8080555ab3f90011f25d5122042d9a8d
 PKG_INIT:=              80
@@ -98 +98 @@
 $(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,SNMPD,snmpd,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,SNMPD_STATIC,snmpd-static,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,SNMP_UTILS,snmp-utils,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
@@ -137 +136 @@
                 INSTALL_PREFIX="$(WRKINST)" \
                 all install
-        ( cd $(WRKINST); mv ./usr/sbin/snmpd ./usr/sbin/snmpd-shared; )
-ifneq ($(FWRT_PACKAGE_SNMPD_STATIC),)
-        ( cd $(WRKBUILD); rm -f agent/snmpd; )
-        $(MAKE) -C $(WRKBUILD) \
-                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -static" \
-                INSTALL_PREFIX="$(WRKINST)" \
-                all install
-        ( cd $(WRKINST); mv ./usr/sbin/snmpd ./usr/sbin/snmpd-static; )
-endif
         touch $@
 
@@ -164 +154 @@
         $(RSTRIP) $(IDIR_SNMPD)
         $(IPKG_BUILD) $(IDIR_SNMPD) $(PACKAGE_DIR)
-
-$(IPKG_SNMPD_STATIC):
-        install -d -m0755 $(IDIR_SNMPD_STATIC)/etc/snmp
-        install -m0644 ./files/snmpd.conf $(IDIR_SNMPD_STATIC)/etc/snmp/snmpd.conf
-        install -d -m0755 $(IDIR_SNMPD_STATIC)/etc/init.d
-        install -m0755 ./files/snmpd.init $(IDIR_SNMPD_STATIC)/etc/init.d/snmpd
-        install -d -m0755 $(IDIR_SNMPD_STATIC)/usr/sbin
-        install -m0755 $(WRKINST)/usr/sbin/snmpd-static $(IDIR_SNMPD_STATIC)/usr/sbin/snmpd
-        $(RSTRIP) $(IDIR_SNMPD_STATIC)
-        $(IPKG_BUILD) $(IDIR_SNMPD_STATIC) $(PACKAGE_DIR)
 
 $(IPKG_SNMP_UTILS):