[oe] [PATCH 1/2] libpng: Clean up separate -native recipes, making use of BBCLASSEXTEND.

Marc Olzheim zlo at zlo.nu
Tue Jul 20 07:54:09 UTC 2010


From: Marc Olzheim <marc at iphion.nl>

---
 recipes/libpng/libpng-native.inc       |    5 -----
 recipes/libpng/libpng-native_1.2.37.bb |    6 ------
 recipes/libpng/libpng-native_1.2.40.bb |    9 ---------
 recipes/libpng/libpng-native_1.2.41.bb |    6 ------
 recipes/libpng/libpng-native_1.2.42.bb |    6 ------
 recipes/libpng/libpng.inc              |    5 ++++-
 6 files changed, 4 insertions(+), 33 deletions(-)
 delete mode 100644 recipes/libpng/libpng-native.inc
 delete mode 100644 recipes/libpng/libpng-native_1.2.37.bb
 delete mode 100644 recipes/libpng/libpng-native_1.2.40.bb
 delete mode 100644 recipes/libpng/libpng-native_1.2.41.bb
 delete mode 100644 recipes/libpng/libpng-native_1.2.42.bb

diff --git a/recipes/libpng/libpng-native.inc b/recipes/libpng/libpng-native.inc
deleted file mode 100644
index a515346..0000000
--- a/recipes/libpng/libpng-native.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-inherit native
-
-DEPENDS = "zlib-native"
-
-INHIBIT_NATIVE_STAGE_INSTALL = "1"
diff --git a/recipes/libpng/libpng-native_1.2.37.bb b/recipes/libpng/libpng-native_1.2.37.bb
deleted file mode 100644
index 3c36b52..0000000
--- a/recipes/libpng/libpng-native_1.2.37.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libpng_${PV}.bb
-require libpng-native.inc
-
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/recipes/libpng/libpng-native_1.2.40.bb b/recipes/libpng/libpng-native_1.2.40.bb
deleted file mode 100644
index 6f0222d..0000000
--- a/recipes/libpng/libpng-native_1.2.40.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require libpng_${PV}.bb
-require libpng-native.inc
-
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
-
-SRC_URI[tarball.md5sum] = "29bbd1c3cbe54b04bfc2bda43067ccb5"
-SRC_URI[tarball.sha256sum] = "a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40"
diff --git a/recipes/libpng/libpng-native_1.2.41.bb b/recipes/libpng/libpng-native_1.2.41.bb
deleted file mode 100644
index 3c36b52..0000000
--- a/recipes/libpng/libpng-native_1.2.41.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libpng_${PV}.bb
-require libpng-native.inc
-
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/recipes/libpng/libpng-native_1.2.42.bb b/recipes/libpng/libpng-native_1.2.42.bb
deleted file mode 100644
index 3c36b52..0000000
--- a/recipes/libpng/libpng-native_1.2.42.bb
+++ /dev/null
@@ -1,6 +0,0 @@
-require libpng_${PV}.bb
-require libpng-native.inc
-
-PR = "r1"
-
-FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/libpng-${PV}"
diff --git a/recipes/libpng/libpng.inc b/recipes/libpng/libpng.inc
index fc1feb8..052e7bf 100644
--- a/recipes/libpng/libpng.inc
+++ b/recipes/libpng/libpng.inc
@@ -5,13 +5,16 @@ SECTION = "libs"
 PRIORITY = "required"
 DEPENDS = "zlib"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2;name=tarball"
 S = "${WORKDIR}/libpng-${PV}"
 
 inherit autotools pkgconfig binconfig
 
+BBCLASSEXTEND = "native"
+INHIBIT_NATIVE_STAGE_INSTALL = "1"
+
 PACKAGES =+ "libpng3 libpng12"
 
 FILES_libpng3 = "${libdir}/libpng.so.*"
-- 
1.7.0.4





More information about the Openembedded-devel mailing list