5 files changed, 22 insertions, 13 deletions

diff --git a/meta/packages/zlib/zlib-native.inc b/meta/packages/zlib/zlib-native.inc
new file mode 100644
index 0000000000..290ee98b32
--- /dev/null
+++ b/meta/packages/zlib/zlib-native.inc
@@ -0,0 +1,10 @@
+ZLIB_EXTRA = ""
+inherit native
+
+do_stage() {
+        install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
+        install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
+        oe_libinstall -a -so libz ${STAGING_LIBDIR}
+}
+
+DEPENDS = "libtool-native"
diff --git a/meta/packages/zlib/zlib-native_1.2.3.bb b/meta/packages/zlib/zlib-native_1.2.3.bb
index 8ad4a8c03c..645b2c45c6 100644
--- a/meta/packages/zlib/zlib-native_1.2.3.bb
+++ b/meta/packages/zlib/zlib-native_1.2.3.bb
@@ -1,13 +1,2 @@
-SECTION = "libs"
 require zlib_${PV}.bb
-ZLIB_EXTRA = ""
-inherit native
-
-do_stage() {
-        install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
-        install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
-        oe_libinstall -a -so libz ${STAGING_LIBDIR}
-}
-
-
-DEPENDS = "libtool-native"
+require zlib-native.inc
diff --git a/meta/packages/zlib/zlib-sdk.inc b/meta/packages/zlib/zlib-sdk.inc
new file mode 100644
index 0000000000..e4eb3024e2
--- /dev/null
+++ b/meta/packages/zlib/zlib-sdk.inc
@@ -0,0 +1,8 @@
+ZLIB_EXTRA = ""
+inherit sdk
+
+do_stage() {
+        install -m 0644 zlib.h ${STAGING_INCDIR}/zlib.h
+        install -m 0644 zconf.h ${STAGING_INCDIR}/zconf.h
+        oe_libinstall -a -so libz ${STAGING_LIBDIR}
+}
diff --git a/meta/packages/zlib/zlib-sdk_1.2.3.bb b/meta/packages/zlib/zlib-sdk_1.2.3.bb
new file mode 100644
index 0000000000..b6e15c3ae2
--- /dev/null
+++ b/meta/packages/zlib/zlib-sdk_1.2.3.bb
@@ -0,0 +1,2 @@
+require zlib_${PV}.bb
+require zlib-sdk.inc
diff --git a/meta/packages/zlib/zlib_1.2.3.bb b/meta/packages/zlib/zlib_1.2.3.bb
index 629ee83efb..69f78687f2 100644
--- a/meta/packages/zlib/zlib_1.2.3.bb
+++ b/meta/packages/zlib/zlib_1.2.3.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
 PRIORITY = "required"
 HOMEPAGE = "http://www.gzip.org/zlib/"
 LICENSE = "zlib"
-PR="r2"
+PR = "r2"
 
 SRC_URI = "http://www.zlib.net/zlib-1.2.3.tar.bz2 \
                 file://visibility.patch;patch=1 \