[oe-commits] Roman I Khimov : net-snmp: convert to new staging

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 34f01346be6be48cbfba134129d2fe3874c2ea78
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=34f01346be6be48cbfba134129d2fe3874c2ea78

Author: Roman I Khimov <khimov at altell.ru>
Date:   Fri May  7 13:05:32 2010 +0400

net-snmp: convert to new staging

Signed-off-by: Roman I Khimov <khimov at altell.ru>

---

 recipes/net-snmp/net-snmp.inc |   43 ++++++++--------------------------------
 1 files changed, 9 insertions(+), 34 deletions(-)

diff --git a/recipes/net-snmp/net-snmp.inc b/recipes/net-snmp/net-snmp.inc
index dde0880..81bc079 100644
--- a/recipes/net-snmp/net-snmp.inc
+++ b/recipes/net-snmp/net-snmp.inc
@@ -6,7 +6,7 @@ RDEPENDS_${PN}-server += "net-snmp-mibs"
 RDEPENDS_${PN}-client += "net-snmp-mibs"
 RDEPENDS_${PN}-dev = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})"
 RRECOMMENDS_${PN}-dbg = "net-snmp-client (= ${EXTENDPV}) net-snmp-server (= ${EXTENDPV})"
-INC_PR = "r6"
+INC_PR = "r7"
 
 inherit autotools update-rc.d siteinfo
 
@@ -25,39 +25,14 @@ do_install_append() {
         install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/snmpd
         install -m 644 ${WORKDIR}/snmpd.conf ${D}${sysconfdir}/snmp/
         install -m 644 ${WORKDIR}/snmptrapd.conf ${D}${sysconfdir}/snmp/
-}
-
-do_stage() {
-	    rm -rf ${STAGE_TEMP}
-	    mkdir -p ${STAGE_TEMP}
-	    oe_runmake INSTALL_PREFIX="${STAGE_TEMP}" install
-	    autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
-	    if [ -d ${STAGE_TEMP}/${libdir} ]
-	    then
-    		olddir=`pwd`
-    		cd ${STAGE_TEMP}/${libdir}
-    		las=$(find . -name \*.la -type f)
-    		cd $olddir
-    		echo "Found la files: $las"		 
-    		for i in $las
-    		do
-    			sed -e 's/^installed=yes$/installed=no/' \
-    			    -e '/^dependency_libs=/s,${WORKDIR}[[:alnum:]/\._+-]*/\([[:alnum:]\._+-]*\),${STAGING_LIBDIR}/\1,g' \
-    			    -e "/^dependency_libs=/s,\([[:space:]']\)${libdir},\1${STAGING_LIBDIR},g" \
-    			    -i ${STAGE_TEMP}/${libdir}/$i
-    		done
-    		autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR}
-    	fi
-        install -d ${STAGING_DIR_HOST}${layout_bindir}
-        sed -e "s at -I/usr/include@@g" \
-            -e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
-            -e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
-            -e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
-            -e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
-                -i net-snmp-config
-
-        install -m 755 net-snmp-config ${STAGING_DIR_HOST}${layout_bindir}
-        rm -Rf ${STAGE_TEMP}
+	install -d ${STAGING_BINDIR}
+	install -m 0755 ${D}${bindir}/net-snmp-config ${STAGING_BINDIR}/
+	sed -e "s at -I/usr/include@@g" \
+		-e "s@^prefix=.*@prefix=${STAGING_DIR_HOST}@g" \
+		-e "s@^exec_prefix=.*@exec_prefix=${STAGING_DIR_HOST}@g" \
+		-e "s@^includedir=.*@includedir=${STAGING_INCDIR}@g" \
+		-e "s@^libdir=.*@libdir=${STAGING_LIBDIR}@g" \
+		-i ${STAGING_BINDIR}/net-snmp-config
 }
 
 PACKAGES = "net-snmp-dbg net-snmp-doc net-snmp-dev net-snmp-static net-snmp-libs \