aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-24 20:40:13 +0000
committernslu2-linux.adm@bkbits.net <nslu2-linux.adm@bkbits.net>2005-02-24 20:40:13 +0000
commit371e43f86bb42470b03449a3ed1d9198978f4694 (patch)
tree76ffcfa799637b12570935566ba404ee27f44d44
parent42bc77b481403b199b4b8090d285fa9a45d35745 (diff)
downloadopenembedded-371e43f86bb42470b03449a3ed1d9198978f4694.tar.gz
Merge bk://oe-devel.bkbits.net/openembedded
into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/02/24 20:33:14+00:00 (none)!pb update sqlite to 2.8.16 2005/02/24 20:21:19+00:00 (none)!pb add opensync snapshot 2005/02/24 20:19:10+00:00 (none)!pb Merge bk://oe-devel@openembedded-devel.bkbits.net/openembedded into mebius.(none):/home/pb/oe/oe 2005/02/24 20:18:45+00:00 (none)!pb add pkgconfig inherit to sqlite3 2005/02/24 21:10:50+01:00 dyndns.org!reenoo Merge oe-devel@oe-devel.bkbits.net:openembedded into sugarcube.dyndns.org:/home2/oe/bakery/openembedded 2005/02/24 21:08:07+01:00 dyndns.org!reenoo openvpn: demote kernel-module-tun to RRECOMMENDS. 2005/02/24 21:03:49+01:00 dyndns.org!reenoo hugs: remove --enable-debug from EXTRA_OECONF. BKrev: 421e3badVY-npT083f_wm7MON573Bw
-rw-r--r--packages/hugs/hugs_hugs98-Nov2003.bb4
-rw-r--r--packages/opensync/opensync_0.11.bb0
-rw-r--r--packages/openvpn/openvpn_2.0rc1.bb4
-rw-r--r--packages/sqlite/sqlite-2.8.16/main.mk0
-rw-r--r--packages/sqlite/sqlite3_3.0.8.bb4
-rw-r--r--packages/sqlite/sqlite_2.8.16.bb0
6 files changed, 6 insertions, 6 deletions
diff --git a/packages/hugs/hugs_hugs98-Nov2003.bb b/packages/hugs/hugs_hugs98-Nov2003.bb
index 9ad5247375..0269e7c4cb 100644
--- a/packages/hugs/hugs_hugs98-Nov2003.bb
+++ b/packages/hugs/hugs_hugs98-Nov2003.bb
@@ -3,7 +3,7 @@ SRC_URI = "http://cvs.haskell.org/Hugs/downloads/Nov2003/${PV}.tar.gz \
file://hugs.desktop \
file://hugs.png"
LICENSE = "BSD"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/${PV}/src/unix"
@@ -12,7 +12,7 @@ inherit autotools
# disable STRIP as the generated Makefile falsely call arm-linux-strip
# on compiling which leads to abortion of the compile
# we strip manually anyway so disabling it here is 'ok'
-EXTRA_OECONF = "--enable-debug --disable-ffi STRIP=true"
+EXTRA_OECONF = "--disable-ffi STRIP=true"
do_configure() {
oe_runconf
diff --git a/packages/opensync/opensync_0.11.bb b/packages/opensync/opensync_0.11.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/opensync/opensync_0.11.bb
diff --git a/packages/openvpn/openvpn_2.0rc1.bb b/packages/openvpn/openvpn_2.0rc1.bb
index 8003d88709..84e579b513 100644
--- a/packages/openvpn/openvpn_2.0rc1.bb
+++ b/packages/openvpn/openvpn_2.0rc1.bb
@@ -5,8 +5,8 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPLv2"
PRIORITY = "optional"
DEPENDS = "lzo openssl"
-RDEPENDS = "kernel-module-tun"
-PR = "r1"
+RRECOMMENDS = "kernel-module-tun"
+PR = "r2"
SRC_URI = "${SOURCEFORGE_MIRROR}/openvpn/openvpn-2.0_rc1.tar.gz \
file://openvpn"
diff --git a/packages/sqlite/sqlite-2.8.16/main.mk b/packages/sqlite/sqlite-2.8.16/main.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sqlite/sqlite-2.8.16/main.mk
diff --git a/packages/sqlite/sqlite3_3.0.8.bb b/packages/sqlite/sqlite3_3.0.8.bb
index cce0c4da8c..5d34a680f5 100644
--- a/packages/sqlite/sqlite3_3.0.8.bb
+++ b/packages/sqlite/sqlite3_3.0.8.bb
@@ -3,7 +3,7 @@ SECTION = "libs"
PRIORITY = "optional"
DEPENDS = "readline ncurses"
LICENSE = "PD"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://www.sqlite.org/sqlite-3.0.8.tar.gz \
file://cross-compile.patch;patch=1 \
@@ -11,7 +11,7 @@ SRC_URI = "http://www.sqlite.org/sqlite-3.0.8.tar.gz \
file://ldflags.patch;patch=1"
S = "${WORKDIR}/sqlite"
-inherit autotools
+inherit autotools pkgconfig
EXTRA_OECONF = "--without-tcl --enable-shared \
--enable-threadsafe"
diff --git a/packages/sqlite/sqlite_2.8.16.bb b/packages/sqlite/sqlite_2.8.16.bb
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/sqlite/sqlite_2.8.16.bb