opie-networksettings: convert to new-style staging. Bump PR.

4 files changed, 33 insertions, 37 deletions

diff --git a/recipes/opie-networksettings/opie-networksettings.inc b/recipes/opie-networksettings/opie-networksettings.inc
index e8bfa8ed90..a2635a7055 100644
--- a/recipes/opie-networksettings/opie-networksettings.inc
+++ b/recipes/opie-networksettings/opie-networksettings.inc
@@ -15,38 +15,34 @@ PARALLEL_MAKE = ""
 
 EXTRA_QMAKEVARS_POST += "LIBS+=-L${S}"
 
-do_stage() {
-	oe_libinstall -so libinterfaces ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/interfaces/
-	install -m 0644 interfaces/*.h ${STAGING_INCDIR}/interfaces/
-}
-
 do_install() {
-	# Create dir for changedns and the opie-kppp peer
-	install -d ${D}${bindir}/
-	install -d ${D}${sysconfdir}/
-	install -d ${D}${sysconfdir}/ppp/
-	install -d ${D}${sysconfdir}/ppp/peers/
-	
-	install -d ${D}${palmtopdir}/pics/${APPNAME}/
-	install -d ${D}${palmtopdir}/pics/Network/
-	install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
-	install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/
-	install -d ${D}${palmtopdir}/lib/
-	oe_libinstall -so libinterfaces ${D}${libdir}
-	install -d ${D}${palmtopdir}/plugins/networksettings/
-	for plugin in kppp wlan
-	do
-		install lib$plugin.so ${D}${palmtopdir}/plugins/networksettings/
-	done
-
-	# install changedns script
-	install -m 0755 ${WORKDIR}/root/usr/bin/changedns ${D}${bindir}/
-	install -m 0644 ${WORKDIR}/root/etc/ppp/peers/opie-kppp ${D}${sysconfdir}/ppp/peers
+        # Create dir for changedns and the opie-kppp peer
+        install -d ${D}${bindir}/
+        install -d ${D}${sysconfdir}/
+        install -d ${D}${sysconfdir}/ppp/
+        install -d ${D}${sysconfdir}/ppp/peers/
+
+        install -d ${D}${palmtopdir}/pics/${APPNAME}/
+        install -d ${D}${palmtopdir}/pics/Network/
+        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.* ${D}${palmtopdir}/pics/${APPNAME}/
+        install -m 0644 ${WORKDIR}/pics/Network/*.* ${D}${palmtopdir}/pics/Network/
+        install -d ${D}${palmtopdir}/lib/
+        oe_libinstall -so libinterfaces ${D}${libdir}
+        install -d ${D}${palmtopdir}/plugins/networksettings/
+        for plugin in kppp wlan
+        do
+                install lib$plugin.so ${D}${palmtopdir}/plugins/networksettings/
+        done
+
+        # install changedns script
+        install -m 0755 ${WORKDIR}/root/usr/bin/changedns ${D}${bindir}/
+        install -m 0644 ${WORKDIR}/root/etc/ppp/peers/opie-kppp ${D}${sysconfdir}/ppp/peers
+
+        install -d ${D}${includedir}/interfaces/
+        install -m 0644 interfaces/*.h ${D}${includedir}/interfaces/
 }
 
 PACKAGES =+ "opie-networksettings-pppplugin opie-networksettings-wlanplugin"
 FILES_${PN} += " ${bindir}/changedns "
 FILES_opie-networksettings-pppplugin = "${palmtopdir}/plugins/networksettings/libkppp.so ${sysconfdir}/ppp/peers/opie-kppp"
 FILES_opie-networksettings-wlanplugin = "${palmtopdir}/plugins/networksettings/libwlan.so"
-
diff --git a/recipes/opie-networksettings/opie-networksettings_1.2.3.bb b/recipes/opie-networksettings/opie-networksettings_1.2.3.bb
index e5981ed121..05f727a7d2 100644
--- a/recipes/opie-networksettings/opie-networksettings_1.2.3.bb
+++ b/recipes/opie-networksettings/opie-networksettings_1.2.3.bb
@@ -1,9 +1,9 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-	   ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
-	  "
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+          "
diff --git a/recipes/opie-networksettings/opie-networksettings_1.2.4.bb b/recipes/opie-networksettings/opie-networksettings_1.2.4.bb
index e5981ed121..05f727a7d2 100644
--- a/recipes/opie-networksettings/opie-networksettings_1.2.4.bb
+++ b/recipes/opie-networksettings/opie-networksettings_1.2.4.bb
@@ -1,9 +1,9 @@
 require ${PN}.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \
            ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \
-	   ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
-	  "
+           ${HANDHELDS_CVS};tag=${TAG};module=opie/root \
+          "
diff --git a/recipes/opie-networksettings/opie-networksettings_cvs.bb b/recipes/opie-networksettings/opie-networksettings_cvs.bb
index 423037e7cf..db93f8d267 100644
--- a/recipes/opie-networksettings/opie-networksettings_cvs.bb
+++ b/recipes/opie-networksettings/opie-networksettings_cvs.bb
@@ -1,10 +1,10 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/noncore/settings/networksettings \
            ${HANDHELDS_CVS};module=opie/pics \
            ${HANDHELDS_CVS};module=opie/apps \
-	   ${HANDHELDS_CVS};module=opie/root \
-	  "
+           ${HANDHELDS_CVS};module=opie/root \
+          "