diff options
| author | Koen Kooi <koen@openembedded.org> | 2006-08-10 14:44:21 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2006-08-10 14:44:21 +0000 |
| commit | 8e81b91edd924e67e3df7136b54a46183e8bd983 (patch) | |
| tree | fccc426f51b3c0fc56cad3fe4302fb5c37531f01 | |
| parent | b6ae0a23930463751118b578a37e11122bbab289 (diff) | |
| parent | b99c102029cfaaf07aa79eeed43a3d7068bd48b9 (diff) | |
merge of '1415f8fe0c4b15b7c24e2f8492c219ba906af8fd'
and '871b52cc6f79e8ed85515aeaa65ff9cb0cd40bfa'
| -rw-r--r-- | packages/db/db_4.3.29.bb | 5 | ||||
| -rw-r--r-- | packages/meta/slugos-native.bb | 4 | ||||
| -rw-r--r-- | packages/opie-networksettings/opie-networksettings.inc | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/packages/db/db_4.3.29.bb b/packages/db/db_4.3.29.bb index 8671efe02a..d17aec5325 100644 --- a/packages/db/db_4.3.29.bb +++ b/packages/db/db_4.3.29.bb @@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com" LICENSE = "BSD Sleepycat" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" -PR = "r3" +PR = "r4" SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz" #SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" @@ -52,7 +52,8 @@ FILES_${PN}-bin = "${bindir}" FILES_${PN}-dev = "${includedir} ${libdir}" #configuration - set in local.conf to override -DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild --enable-compat185" +# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) +DB4_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-statistics --disable-verify --enable-compat185" EXTRA_OECONF = "${DB4_CONFIG}" # Override the MUTEX setting here, the POSIX library is diff --git a/packages/meta/slugos-native.bb b/packages/meta/slugos-native.bb index e40116d292..7af7f7961a 100644 --- a/packages/meta/slugos-native.bb +++ b/packages/meta/slugos-native.bb @@ -5,14 +5,13 @@ # DESCRIPTION = "Packages that are required for the SlugOS native build environment" LICENSE = "MIT" -PR = "r3" +PR = "r4" INHIBIT_DEFAULT_DEPS = "1" EXCLUDE_FROM_WORLD = "1" ALLOW_EMPTY = "1" PACKAGES = "${PN}" PROVIDES += "${SLUGOS_IMAGENAME}-native" -DEPENDS = "libc6-dev" # Run-time only (RDEPENDS) stuff - no package explicitly provides # these targets. @@ -29,6 +28,7 @@ SLUGOS_NATIVE_RT = "\ gcc gcc-symlinks \ gdbm \ libstdc++-dev \ + libc6-dev \ ncurses-dev ncurses-terminfo \ perl perl-modules \ python-core python-crypt python-io python-lang python-pickle python-shell python-textutils \ diff --git a/packages/opie-networksettings/opie-networksettings.inc b/packages/opie-networksettings/opie-networksettings.inc index 9a9a88417d..c2f59fd04d 100644 --- a/packages/opie-networksettings/opie-networksettings.inc +++ b/packages/opie-networksettings/opie-networksettings.inc @@ -1,7 +1,7 @@ DESCRIPTION = "Opie Network Settings" SECTION = "opie/settings" PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +MAINTAINER = "Team Opie <opie@handhelds.org>" LICENSE = "GPL" PROVIDES = "opie-networksettings-pppplugin opie-networksettings-wlanplugin" APPNAME = "networksettings" |