Merge oe-devel@oe-devel.bkbits.net:packages.bb

into handhelds.org:/home/kergoth/code/packages.bb

2004/12/07 04:58:25-06:00 ti.com!kergoth
More updates per the core rename.

2004/12/07 04:46:51-06:00 ti.com!kergoth
Update soundtracker per the core rename.

2004/12/07 04:44:14-06:00 ti.com!kergoth
Merge

2004/12/07 04:42:38-06:00 ti.com!kergoth
Updates per the recent rename of the oe core from 'oe' to 'bitbake'.

BKrev: 41b6293b91LRHSxMOt6WnrZVAdLbFw

7 files changed, 0 insertions, 69 deletions

diff --git a/zlib/zlib-native_1.2.2.oe b/zlib/zlib-native_1.1.4.bb
index e69de29bb2..e69de29bb2 100644
--- a/zlib/zlib-native_1.2.2.oe
+++ b/zlib/zlib-native_1.1.4.bb
diff --git a/zlib/zlib-native_1.1.4.oe b/zlib/zlib-native_1.1.4.oe
deleted file mode 100644
index 1c9b5e6a08..0000000000
--- a/zlib/zlib-native_1.1.4.oe
+++ /dev/null
@@ -1,4 +0,0 @@
-SECTION = "libs"
-include zlib_${PV}.oe
-inherit native
-DEPENDS = "patcher-native"
diff --git a/zlib/zlib-native_1.2.2.bb b/zlib/zlib-native_1.2.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/zlib/zlib-native_1.2.2.bb
diff --git a/zlib/zlib_1.1.4.bb b/zlib/zlib_1.1.4.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/zlib/zlib_1.1.4.bb
diff --git a/zlib/zlib_1.1.4.oe b/zlib/zlib_1.1.4.oe
deleted file mode 100644
index 71aa48a9a9..0000000000
--- a/zlib/zlib_1.1.4.oe
+++ /dev/null
@@ -1,30 +0,0 @@
-DESCRIPTION = "Zlib Compression Library"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-
-SRC_URI = "http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz"
-S = "${WORKDIR}/zlib-${PV}"
-
-export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
-LDFLAGS_append = " -L. -lz"
-CFLAGS_prepend = "-fPIC "
-AR_append = " rc"
-EXTRA_OEMAKE = ""
-
-do_compile() {
-	./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
-	oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
-}
-
-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}
-}
-
-do_install() {
-	install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir}
-	oe_runmake "prefix=${D}/${prefix}" "includedir=${D}/${includedir}" \
-		   "libdir=${D}/${libdir}" install
-}
diff --git a/zlib/zlib_1.2.2.bb b/zlib/zlib_1.2.2.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/zlib/zlib_1.2.2.bb
diff --git a/zlib/zlib_1.2.2.oe b/zlib/zlib_1.2.2.oe
deleted file mode 100644
index 03ec866b46..0000000000
--- a/zlib/zlib_1.2.2.oe
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "Zlib Compression Library"
-SECTION = "libs"
-PRIORITY = "required"
-MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
-HOMEPAGE = "http://www.gzip.org/zlib/"
-LICENSE = "zlib"
-
-SRC_URI = "http://www.libpng.org/pub/png/src/zlib-${PV}.tar.gz"
-S = "${WORKDIR}/zlib-${PV}"
-
-export LDSHARED = "${CC} -shared -Wl,-soname,libz.so.1"
-LDFLAGS_append = " -L. -lz"
-CFLAGS_prepend = "-fPIC "
-AR_append = " rc"
-EXTRA_OEMAKE = ""
-
-do_compile() {
-	./configure --prefix=${prefix} --exec_prefix=${exec_prefix} --shared --libdir=${libdir} --includedir=${includedir}
-	oe_runmake -e MAKEFLAGS="" libz.so.${PV} libz.a
-}
-
-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}
-}
-
-do_install() {
-	install -d ${D}/${prefix} ${D}/${includedir} ${D}/${libdir}
-	oe_runmake "prefix=${D}/${prefix}" \
-		   "exec_prefix=${D}/${exec_prefix}" \
-		   "man3dir=${D}/${mandir}/man3" \
-		   "includedir=${D}/${includedir}" \
-		   "libdir=${D}/${libdir}" install
-}