apache2-native: Convert from legacy staging

Signed-off-by: Tom Rini <tom_rini@mentor.com>

2 files changed, 45 insertions, 41 deletions

diff --git a/recipes/apache2/apache2-native_2.2.14.bb b/recipes/apache2/apache2-native_2.2.14.bb
index fcbb7dd34b..8b1bf7e886 100644
--- a/recipes/apache2/apache2-native_2.2.14.bb
+++ b/recipes/apache2/apache2-native_2.2.14.bb
@@ -3,7 +3,7 @@ DEPENDS = "expat pcre"
 
 inherit native 
 
-PR ="r1"
+PR = "r2"
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 
 S = "${WORKDIR}/httpd-${PV}"
@@ -12,31 +12,33 @@ do_configure () {
 	./configure --with-included-apr --prefix=${prefix}
 }
 
-do_stage () {
-	install -d ${STAGING_BINDIR_NATIVE}
-	cp server/gen_test_char ${STAGING_BINDIR_NATIVE}
-	cp srclib/apr/apr-1-config ${STAGING_BINDIR_NATIVE}
-	cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE}
-	cp support/apxs ${STAGING_BINDIR_NATIVE}
-	chmod 755 ${STAGING_BINDIR_NATIVE}/apxs
-	mkdir -p ${STAGING_DIR_NATIVE}//usr/build
-	cp build/*.mk ${STAGING_DIR_NATIVE}/usr/build
-	cp build/instdso.sh ${STAGING_DIR_NATIVE}/usr/build
-	cp .libs/httpd ${STAGING_BINDIR_NATIVE}
+do_install () {
+	install -d ${D}${bindir} ${D}${libdir}
+	cp server/gen_test_char ${D}${bindir}
+	cp srclib/apr/apr-1-config ${D}${bindir}
+	cp srclib/apr-util/apu-1-config ${D}${bindir}
+	cp support/apxs ${D}${bindir}
+	chmod 755 ${D}${bindir}/apxs
+	install -d ${D}/usr/build
+	cp build/*.mk ${D}/usr/build
+	cp build/instdso.sh ${D}/usr/build
+	cp .libs/httpd ${D}${bindir}
 
 	(cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
-	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
+	  (cd ${D}${libdir}; tar -xf - )
 	(cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
-	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
+	  (cd ${D}${libdir}; tar -xf - )
 
-	mkdir -p ${STAGING_INCDIR_NATIVE}/apache2
-	cp include/* ${STAGING_INCDIR_NATIVE}/apache2
-	cp os/unix/os.h ${STAGING_INCDIR_NATIVE}/apache2
-	cp os/unix/unixd.h ${STAGING_INCDIR_NATIVE}/apache2
+	install -d ${D}${includedir}/apache2
+	cp include/* ${D}${includedir}/apache2
+	cp os/unix/os.h ${D}${includedir}/apache2
+	cp os/unix/unixd.h ${D}${includedir}/apache2
 
-  	cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars
-    	chmod 755 ${STAGING_BINDIR_NATIVE}/envvars
+  	cp support/envvars-std ${D}${bindir}/envvars
+    	chmod 755 ${D}${bindir}/envvars
 }
 
 SRC_URI[md5sum] = "a5226203aaf97e5b941c41a71c112704"
 SRC_URI[sha256sum] = "b2deab8a5e797fde7a04fb4a5ebfa9c80f767d064dd19dcd2857c94838ae3ac6"
+
+NATIVE_INSTALL_WORKS = "1"
diff --git a/recipes/apache2/apache2-native_2.2.3.bb b/recipes/apache2/apache2-native_2.2.3.bb
index f5b70bcfe8..153bce8e38 100644
--- a/recipes/apache2/apache2-native_2.2.3.bb
+++ b/recipes/apache2/apache2-native_2.2.3.bb
@@ -3,7 +3,7 @@ DEPENDS = "expat pcre"
 
 inherit native 
 
-PR ="r10"
+PR = "r11"
 SRC_URI = "http://www.apache.org/dist/httpd/httpd-${PV}.tar.bz2"
 
 S = "${WORKDIR}/httpd-${PV}"
@@ -12,32 +12,34 @@ do_configure () {
 	./configure --with-included-apr --prefix=${prefix}
 }
 
-do_stage () {
-	install -d ${STAGING_BINDIR_NATIVE}
-	cp srclib/pcre/dftables ${STAGING_BINDIR_NATIVE}
-	cp server/gen_test_char ${STAGING_BINDIR_NATIVE}
-	cp srclib/apr/apr-1-config ${STAGING_BINDIR_NATIVE}
-	cp srclib/apr-util/apu-1-config ${STAGING_BINDIR_NATIVE}
-	cp support/apxs ${STAGING_BINDIR_NATIVE}
-	chmod 755 ${STAGING_BINDIR_NATIVE}/apxs
-	mkdir -p ${STAGING_DIR_NATIVE}//usr/build
-	cp build/*.mk ${STAGING_DIR_NATIVE}/usr/build
-	cp build/instdso.sh ${STAGING_DIR_NATIVE}/usr/build
-	cp .libs/httpd ${STAGING_BINDIR_NATIVE}
+do_install () {
+	install -d ${D}${bindir} ${D}${libdir}
+	cp srclib/pcre/dftables ${D}${bindir}
+	cp server/gen_test_char ${D}${bindir}
+	cp srclib/apr/apr-1-config ${D}${bindir}
+	cp srclib/apr-util/apu-1-config ${D}${bindir}
+	cp support/apxs ${D}${bindir}
+	chmod 755 ${D}${bindir}/apxs
+	install -d ${D}//usr/build
+	cp build/*.mk ${D}/usr/build
+	cp build/instdso.sh ${D}/usr/build
+	cp .libs/httpd ${D}${bindir}
 
 	(cd srclib/apr/.libs; tar -cf - libapr-*.so* ) |
-	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
+	  (cd ${D}${libdir}; tar -xf - )
 	(cd srclib/apr-util/.libs; tar -cf - libaprutil-*.so* ) |
-	  (cd ${STAGING_LIBDIR_NATIVE}; tar -xf - )
+	  (cd ${D}${libdir}; tar -xf - )
 
-	mkdir -p ${STAGING_INCDIR_NATIVE}/apache2
-	cp include/* ${STAGING_INCDIR_NATIVE}/apache2
-	cp os/unix/os.h ${STAGING_INCDIR_NATIVE}/apache2
-	cp os/unix/unixd.h ${STAGING_INCDIR_NATIVE}/apache2
+	install -d ${D}${includedir}/apache2
+	cp include/* ${D}${includedir}/apache2
+	cp os/unix/os.h ${D}${includedir}/apache2
+	cp os/unix/unixd.h ${D}${includedir}/apache2
 
-  	cp support/envvars-std ${STAGING_BINDIR_NATIVE}/envvars
-    	chmod 755 ${STAGING_BINDIR_NATIVE}/envvars
+  	cp support/envvars-std ${D}${bindir}/envvars
+    	chmod 755 ${D}${bindir}/envvars
 }
 
 SRC_URI[md5sum] = "887bf4a85505e97babe1d90635361c0d"
 SRC_URI[sha256sum] = "dd86e8221f9efb85497c46229d0f04237d4e66d293fabe98eb0745166aaf4b6c"
+
+NATIVE_INSTALL_WORKS = "1"