summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-21 12:15:23 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-21 12:15:23 +0000
commit4b647cde776260b809da5254aea1038dd5d865a3 (patch)
treeadd800cc33bce8e10786dab9f58e6c4b2aaa1db4
parentb3b8d9ed94ea6cc713a4a0831bc3d5693c44429e (diff)
downloadpoky-4b647cde776260b809da5254aea1038dd5d865a3.tar.gz
poky-4b647cde776260b809da5254aea1038dd5d865a3.tar.bz2
poky-4b647cde776260b809da5254aea1038dd5d865a3.zip
Various minor updates from OE.dev
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@919 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/curl/curl-native_7.14.0.bb1
-rw-r--r--meta/packages/db/db_4.2.52.bb2
-rw-r--r--meta/packages/db/db_4.3.29.bb6
-rw-r--r--meta/packages/e2fsprogs/e2fsprogs_1.38.bb2
-rw-r--r--meta/packages/gcalctool/gcalctool_5.7.32.bb2
-rwxr-xr-xmeta/packages/irda-utils/files/init2
-rw-r--r--meta/packages/irda-utils/irda-utils_0.9.16.bb2
-rw-r--r--meta/packages/jpeg/jpeg_6b.bb16
-rw-r--r--meta/packages/libfakekey/libfakekey_svn.bb3
-rw-r--r--meta/packages/libgpg-error/libgpg-error_1.0.bb2
-rw-r--r--meta/packages/meta/package-index.bb4
-rw-r--r--meta/packages/orinoco/spectrum-fw.bb11
-rw-r--r--meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb4
-rw-r--r--meta/packages/ppp/ppp_2.4.3.bb2
-rwxr-xr-xmeta/packages/udev/files/init8
-rw-r--r--meta/packages/udev/udev-092/udev.rules2
16 files changed, 44 insertions, 25 deletions
diff --git a/meta/packages/curl/curl-native_7.14.0.bb b/meta/packages/curl/curl-native_7.14.0.bb
index c70dd3b9dc..e056ec10c3 100644
--- a/meta/packages/curl/curl-native_7.14.0.bb
+++ b/meta/packages/curl/curl-native_7.14.0.bb
@@ -1,5 +1,6 @@
require curl_${PV}.bb
inherit native
+DEPENDS = "zlib-native"
do_stage () {
install -d ${STAGING_INCDIR}/curl
diff --git a/meta/packages/db/db_4.2.52.bb b/meta/packages/db/db_4.2.52.bb
index 261e6f5192..05565287f5 100644
--- a/meta/packages/db/db_4.2.52.bb
+++ b/meta/packages/db/db_4.2.52.bb
@@ -14,7 +14,7 @@ HOMEPAGE = "http://www.sleepycat.com"
LICENSE = "BSD Sleepycat"
VIRTUAL_NAME ?= "virtual/db"
CONFLICTS = "db3"
-PR = "r3"
+PR = "r6"
SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
diff --git a/meta/packages/db/db_4.3.29.bb b/meta/packages/db/db_4.3.29.bb
index d8f9372caf..93d687d42c 100644
--- a/meta/packages/db/db_4.3.29.bb
+++ b/meta/packages/db/db_4.3.29.bb
@@ -17,7 +17,7 @@ HOMEPAGE = "http://www.sleepycat.com"
LICENSE = "BSD Sleepycat"
VIRTUAL_NAME ?= "virtual/db"
CONFLICTS = "db3"
-PR = "r3"
+PR = "r7"
SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
@@ -55,7 +55,9 @@ 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/meta/packages/e2fsprogs/e2fsprogs_1.38.bb b/meta/packages/e2fsprogs/e2fsprogs_1.38.bb
index c27cf4c3fa..ec28bff31a 100644
--- a/meta/packages/e2fsprogs/e2fsprogs_1.38.bb
+++ b/meta/packages/e2fsprogs/e2fsprogs_1.38.bb
@@ -8,6 +8,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/e2fsprogs/e2fsprogs-${PV}.tar.gz \
file://no-hardlinks.patch;patch=1"
S = "${WORKDIR}/e2fsprogs-${PV}"
+PARALLEL_MAKE = ""
+
inherit autotools
EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}"
diff --git a/meta/packages/gcalctool/gcalctool_5.7.32.bb b/meta/packages/gcalctool/gcalctool_5.7.32.bb
index bad339482f..084b5e4c82 100644
--- a/meta/packages/gcalctool/gcalctool_5.7.32.bb
+++ b/meta/packages/gcalctool/gcalctool_5.7.32.bb
@@ -1,7 +1,7 @@
LICENSE = "GPL"
SECTION = "x11"
DEPENDS = "gtk+"
-DESCRIPTION = "gcalctool is a powerful calculator
+DESCRIPTION = "gcalctool is a powerful calculator"
PR = "r1"
SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \
diff --git a/meta/packages/irda-utils/files/init b/meta/packages/irda-utils/files/init
index 9becfcc0ed..2d93af34df 100755
--- a/meta/packages/irda-utils/files/init
+++ b/meta/packages/irda-utils/files/init
@@ -7,7 +7,7 @@ module_id() {
if [ ! -f /etc/sysconfig/irda ]; then
case `module_id` in
- "HP iPAQ H2200" | "HP iPAQ HX4700")
+ "HP iPAQ H2200" | "HP iPAQ HX4700" | "HTC Universal")
IRDA=yes
DEVICE=/dev/ttyS2
DONGLE=
diff --git a/meta/packages/irda-utils/irda-utils_0.9.16.bb b/meta/packages/irda-utils/irda-utils_0.9.16.bb
index db56a7044d..95a15d7d23 100644
--- a/meta/packages/irda-utils/irda-utils_0.9.16.bb
+++ b/meta/packages/irda-utils/irda-utils_0.9.16.bb
@@ -3,7 +3,7 @@ IrDA allows communication over Infrared with other devices \
such as phones and laptops."
SECTION = "base"
LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
file://configure.patch;patch=1 \
diff --git a/meta/packages/jpeg/jpeg_6b.bb b/meta/packages/jpeg/jpeg_6b.bb
index 39e161f84a..342197c8ad 100644
--- a/meta/packages/jpeg/jpeg_6b.bb
+++ b/meta/packages/jpeg/jpeg_6b.bb
@@ -1,11 +1,12 @@
-PR = "r2"
+DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
+LICENSE ="jpeg"
SECTION = "libs"
PRIORITY = "required"
+
DEPENDS = "libtool-cross"
-DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
-PACKAGES =+ "jpeg-tools "
-FILES_jpeg-tools = "${bindir}/*"
-LICENSE ="jpeg"
+
+PR = "r5"
+
SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
file://debian.patch;patch=1 \
file://ldflags.patch;patch=1 \
@@ -33,3 +34,8 @@ do_install() {
${D}${mandir}/man1 ${D}${libdir}
oe_runmake 'DESTDIR=${D}' install
}
+
+PACKAGES =+ "jpeg-tools "
+FILES_jpeg-tools = "${bindir}/*"
+
+
diff --git a/meta/packages/libfakekey/libfakekey_svn.bb b/meta/packages/libfakekey/libfakekey_svn.bb
index abbbad061a..0a10054eb3 100644
--- a/meta/packages/libfakekey/libfakekey_svn.bb
+++ b/meta/packages/libfakekey/libfakekey_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard"
LICENSE = "GPL"
DEPENDS = "libxtst"
SECTION = "x11/wm"
-PR="r1"
+PR="r2"
PV = "0.0+svn${SRCDATE}"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
@@ -16,3 +16,4 @@ do_stage () {
install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey
oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR}
}
+
diff --git a/meta/packages/libgpg-error/libgpg-error_1.0.bb b/meta/packages/libgpg-error/libgpg-error_1.0.bb
index 115a9c138c..a2a19b254c 100644
--- a/meta/packages/libgpg-error/libgpg-error_1.0.bb
+++ b/meta/packages/libgpg-error/libgpg-error_1.0.bb
@@ -1,4 +1,4 @@
-PR = "r0"
+PR = "r1"
DESCRIPTION = "GPG-Error library"
SECTION = "libs"
PRIORITY = "optional"
diff --git a/meta/packages/meta/package-index.bb b/meta/packages/meta/package-index.bb
index 0afb36a6ba..eebc4efcc7 100644
--- a/meta/packages/meta/package-index.bb
+++ b/meta/packages/meta/package-index.bb
@@ -5,7 +5,7 @@ PR = "r0"
DEPENDS = "ipkg-native"
INHIBIT_DEFAULT_DEPS = "1"
-ALLOW_EMPTY = 1
+ALLOW_EMPTY = "1"
PACKAGES = ""
do_fetch() {
@@ -23,7 +23,7 @@ do_install() {
do_stage() {
}
-do_build[nostamp] = 1
+do_build[nostamp] = "1"
do_build[dirs] = "${DEPLOY_DIR_IPK}"
do_build() {
set -ex
diff --git a/meta/packages/orinoco/spectrum-fw.bb b/meta/packages/orinoco/spectrum-fw.bb
index dd76000ed1..015f61593a 100644
--- a/meta/packages/orinoco/spectrum-fw.bb
+++ b/meta/packages/orinoco/spectrum-fw.bb
@@ -1,21 +1,20 @@
DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
LICENSE = "unknown"
-PR = "r0"
-PACKAGE_ARCH = "all"
+PR = "r1"
SRC_URI = "file://get_symbol_fw \
file://parse_symbol_fw"
-
S = "${WORKDIR}"
-do_compile() {
+do_configure() {
./get_symbol_fw
}
-FILES_${PN} += "${base_libdir}/firmware/symbol*"
-
do_install() {
install -d ${D}${base_libdir}/firmware/
install -m 0755 ${WORKDIR}/symbol_sp24t_prim_fw ${D}${base_libdir}/firmware/symbol_sp24t_prim_fw
install -m 0755 ${WORKDIR}/symbol_sp24t_sec_fw ${D}${base_libdir}/firmware/symbol_sp24t_sec_fw
}
+
+PACKAGE_ARCH = "all"
+FILES_${PN} += "${base_libdir}/firmware/symbol*"
diff --git a/meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 1db3006e14..0bf20745d1 100644
--- a/meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/meta/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -20,6 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
file://wnv.conf"
SRC_URI_append_spitz = " file://nocleanup.patch;patch=1"
+SRC_URI_append_sh3 = " file://superh-noO3.patch;patch=1"
+
S = "${WORKDIR}/pcmcia-cs-${PV}"
INITSCRIPT_NAME = "pcmcia"
@@ -27,7 +29,7 @@ INITSCRIPT_PARAMS = "defaults"
inherit update-rc.d module-base
-export KERNEL_SOURCE = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}
+export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
sbindir = "/sbin"
diff --git a/meta/packages/ppp/ppp_2.4.3.bb b/meta/packages/ppp/ppp_2.4.3.bb
index b8253a1a5a..c687df3615 100644
--- a/meta/packages/ppp/ppp_2.4.3.bb
+++ b/meta/packages/ppp/ppp_2.4.3.bb
@@ -21,6 +21,7 @@ SRC_URI = "ftp://ftp.samba.org/pub/ppp/ppp-${PV}.tar.gz \
file://08setupdns \
file://92removedns"
+SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
inherit autotools
@@ -45,6 +46,7 @@ do_install_append () {
CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
+FILES_${PN}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread"
FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so"
FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so"
FILES_ppp-radius = "/usr/lib/pppd/2.4.3/radius.so /usr/lib/pppd/2.4.3/radattr.so /usr/lib/pppd/2.4.3/radrealms.so"
diff --git a/meta/packages/udev/files/init b/meta/packages/udev/files/init
index 1022b40c89..8cbab188f0 100755
--- a/meta/packages/udev/files/init
+++ b/meta/packages/udev/files/init
@@ -138,7 +138,7 @@ if [ ! -d /sys/class/ ]; then
exit 1
fi
-if [ ! -e /proc/sys/kernel/hotplug ]; then
+if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
echo "udev requires hotplug support, not started."
exit 1
fi
@@ -161,7 +161,11 @@ case "$1" in
warn_if_interactive
#echo /sbin/udevsend > /proc/sys/kernel/hotplug
- echo "" > /proc/sys/kernel/hotplug
+ if [ -e /sys/kernel/uevent_helper ] ; then
+ echo "" > /sys/kernel/uevent_helper
+ else
+ echo "" > /proc/sys/kernel/hotplug
+ fi
udevsend
if [ "$UDEV_DISABLED" = "yes" ]; then
echo "udev disabled on the kernel command line, not started."
diff --git a/meta/packages/udev/udev-092/udev.rules b/meta/packages/udev/udev-092/udev.rules
index c1834a9a1c..72be706e84 100644
--- a/meta/packages/udev/udev-092/udev.rules
+++ b/meta/packages/udev/udev-092/udev.rules
@@ -98,5 +98,5 @@ KERNEL=="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660"
ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
# Samsung UARTS
-KERNEL=="s3c2410_serial[0-9]" NAME="ttySAC%n"
+KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n"