From ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 30 May 2009 20:39:07 +0200 Subject: optimize ipkg package management - generate ipkg control file from PKG_* variables - automatically install init scripts from ./files/*.init set #PKG pkgname to set the binary package - rename FWINIT -> INIT - move postinst and conffiles meta data to ./files - update the packages to the latest upstream version - remove some unready or unused package (strongswan,..) more cleanups needed after allmodconfig --- package/net-snmp/Makefile | 26 +++++++++++++++++++------- package/net-snmp/files/snmpd.conffiles | 1 + package/net-snmp/files/snmpd.init | 4 +++- package/net-snmp/files/snmpd.postinst | 3 +++ package/net-snmp/ipkg/libnetsnmp.control | 4 ---- package/net-snmp/ipkg/snmp-utils.control | 5 ----- package/net-snmp/ipkg/snmpd.conffiles | 1 - package/net-snmp/ipkg/snmpd.control | 5 ----- package/net-snmp/ipkg/snmpd.postinst | 3 --- 9 files changed, 26 insertions(+), 26 deletions(-) create mode 100644 package/net-snmp/files/snmpd.conffiles create mode 100644 package/net-snmp/files/snmpd.postinst delete mode 100644 package/net-snmp/ipkg/libnetsnmp.control delete mode 100644 package/net-snmp/ipkg/snmp-utils.control delete mode 100644 package/net-snmp/ipkg/snmpd.conffiles delete mode 100644 package/net-snmp/ipkg/snmpd.control delete mode 100644 package/net-snmp/ipkg/snmpd.postinst (limited to 'package/net-snmp') diff --git a/package/net-snmp/Makefile b/package/net-snmp/Makefile index 391dde5a2..32c2c755a 100644 --- a/package/net-snmp/Makefile +++ b/package/net-snmp/Makefile @@ -9,7 +9,25 @@ PKG_NAME:= net-snmp PKG_VERSION:= 5.4.2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 984932520143f0c8bf7b7ce1fc9e1da1 -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} +PKG_DESCR:= SNMP Agent +PKG_SECTION:= net +PKG_DEPENDS:= libnetsnmp libelf +PKG_URL:= http://www.net-snmp.org +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=net-snmp/} + +PKG_DESCR_1:= SNMP utilities +PKG_DEPENDS_1:= libnetsnmp libelf + +PKG_DESCR_2:= SNMP library +PKG_DEPENDS_2:= libelf +PKG_SECTION_2:= libs + +include ${TOPDIR}/mk/package.mk + +$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_1},${PKG_DESCR_1},${PKG_SECTION})) +$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS_2},${PKG_DESCR_2},${PKG_SECTION_2})) + SNMP_MIB_MODULES_INCLUDED = \ host/hr_device \ @@ -66,12 +84,6 @@ SNMP_TRANSPORTS_INCLUDED= Callback UDP SNMP_TRANSPORTS_EXCLUDED= TCP TCPv6 UDPv6 Unix -include ${TOPDIR}/mk/package.mk - -$(eval $(call PKG_template,LIBNETSNMP,libnetsnmp,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SNMPD,snmpd,${PKG_VERSION}-${PKG_RELEASE})) -$(eval $(call PKG_template,SNMP_UTILS,snmp-utils,${PKG_VERSION}-${PKG_RELEASE})) - CONFIGURE_STYLE:= gnu CONFIGURE_ENV+= ac_cv_header_pcap_h=no CONFIGURE_ARGS+= --with-endianness=little \ diff --git a/package/net-snmp/files/snmpd.conffiles b/package/net-snmp/files/snmpd.conffiles new file mode 100644 index 000000000..121a94479 --- /dev/null +++ b/package/net-snmp/files/snmpd.conffiles @@ -0,0 +1 @@ +/etc/snmp/snmpd.conf diff --git a/package/net-snmp/files/snmpd.init b/package/net-snmp/files/snmpd.init index 71cf6c597..4a3d2671f 100644 --- a/package/net-snmp/files/snmpd.init +++ b/package/net-snmp/files/snmpd.init @@ -1,5 +1,7 @@ #!/bin/sh -#FWINIT 60 +#PKG snmpd +#INIT 60 + . /etc/rc.conf case $1 in diff --git a/package/net-snmp/files/snmpd.postinst b/package/net-snmp/files/snmpd.postinst new file mode 100644 index 000000000..3f053bd5d --- /dev/null +++ b/package/net-snmp/files/snmpd.postinst @@ -0,0 +1,3 @@ +#!/bin/sh +. $IPKG_INSTROOT/etc/functions.sh +add_rcconf 'e.g. "-Lf /dev/null -p /var/run/snmpd.pid"' snmpd_flags diff --git a/package/net-snmp/ipkg/libnetsnmp.control b/package/net-snmp/ipkg/libnetsnmp.control deleted file mode 100644 index 7a28ef887..000000000 --- a/package/net-snmp/ipkg/libnetsnmp.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: libnetsnmp -Priority: optional -Section: libs -Description: SNMP shared libraries diff --git a/package/net-snmp/ipkg/snmp-utils.control b/package/net-snmp/ipkg/snmp-utils.control deleted file mode 100644 index 42d9251c8..000000000 --- a/package/net-snmp/ipkg/snmp-utils.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: snmp-utils -Priority: optional -Section: admin -Description: SNMP client utilities -Depends: libnetsnmp, libelf diff --git a/package/net-snmp/ipkg/snmpd.conffiles b/package/net-snmp/ipkg/snmpd.conffiles deleted file mode 100644 index 121a94479..000000000 --- a/package/net-snmp/ipkg/snmpd.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/snmp/snmpd.conf diff --git a/package/net-snmp/ipkg/snmpd.control b/package/net-snmp/ipkg/snmpd.control deleted file mode 100644 index 986b19631..000000000 --- a/package/net-snmp/ipkg/snmpd.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: snmpd -Priority: optional -Section: admin -Description: SNMP agent -Depends: libnetsnmp, libelf diff --git a/package/net-snmp/ipkg/snmpd.postinst b/package/net-snmp/ipkg/snmpd.postinst deleted file mode 100644 index 3f053bd5d..000000000 --- a/package/net-snmp/ipkg/snmpd.postinst +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -. $IPKG_INSTROOT/etc/functions.sh -add_rcconf 'e.g. "-Lf /dev/null -p /var/run/snmpd.pid"' snmpd_flags -- cgit v1.2.3