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
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 @@
1require curl_${PV}.bb 1require curl_${PV}.bb
2inherit native 2inherit native
3DEPENDS = "zlib-native"
3 4
4do_stage () { 5do_stage () {
5 install -d ${STAGING_INCDIR}/curl 6 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"
14LICENSE = "BSD Sleepycat" 14LICENSE = "BSD Sleepycat"
15VIRTUAL_NAME ?= "virtual/db" 15VIRTUAL_NAME ?= "virtual/db"
16CONFLICTS = "db3" 16CONFLICTS = "db3"
17PR = "r3" 17PR = "r6"
18 18
19SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz" 19SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
20#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" 20#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"
17LICENSE = "BSD Sleepycat" 17LICENSE = "BSD Sleepycat"
18VIRTUAL_NAME ?= "virtual/db" 18VIRTUAL_NAME ?= "virtual/db"
19CONFLICTS = "db3" 19CONFLICTS = "db3"
20PR = "r3" 20PR = "r7"
21 21
22SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz" 22SRC_URI = "http://downloads.sleepycat.com/db-${PV}.tar.gz"
23#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" 23#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5"
@@ -55,7 +55,9 @@ FILES_${PN}-bin = "${bindir}/*"
55FILES_${PN}-dev = "${includedir} ${libdir}/*" 55FILES_${PN}-dev = "${includedir} ${libdir}/*"
56 56
57#configuration - set in local.conf to override 57#configuration - set in local.conf to override
58DB4_CONFIG ?= "--enable-o_direct --enable-smallbuild --enable-compat185" 58# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix)
59DB4_CONFIG ?= "--enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-statistics --disable-verify --enable-compat185"
60
59EXTRA_OECONF = "${DB4_CONFIG}" 61EXTRA_OECONF = "${DB4_CONFIG}"
60 62
61# Override the MUTEX setting here, the POSIX library is 63# 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 \
8 file://no-hardlinks.patch;patch=1" 8 file://no-hardlinks.patch;patch=1"
9S = "${WORKDIR}/e2fsprogs-${PV}" 9S = "${WORKDIR}/e2fsprogs-${PV}"
10 10
11PARALLEL_MAKE = ""
12
11inherit autotools 13inherit autotools
12 14
13EXTRA_OECONF = "--enable-dynamic-e2fsck --sbindir=${base_sbindir}" 15EXTRA_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 @@
1LICENSE = "GPL" 1LICENSE = "GPL"
2SECTION = "x11" 2SECTION = "x11"
3DEPENDS = "gtk+" 3DEPENDS = "gtk+"
4DESCRIPTION = "gcalctool is a powerful calculator 4DESCRIPTION = "gcalctool is a powerful calculator"
5PR = "r1" 5PR = "r1"
6 6
7SRC_URI = "http://download.gnome.org/sources/${PN}/5.7/${PN}-${PV}.tar.gz \ 7SRC_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() {
7if [ ! -f /etc/sysconfig/irda ]; then 7if [ ! -f /etc/sysconfig/irda ]; then
8 8
9 case `module_id` in 9 case `module_id` in
10 "HP iPAQ H2200" | "HP iPAQ HX4700") 10 "HP iPAQ H2200" | "HP iPAQ HX4700" | "HTC Universal")
11 IRDA=yes 11 IRDA=yes
12 DEVICE=/dev/ttyS2 12 DEVICE=/dev/ttyS2
13 DONGLE= 13 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 \
3such as phones and laptops." 3such as phones and laptops."
4SECTION = "base" 4SECTION = "base"
5LICENSE = "GPL" 5LICENSE = "GPL"
6PR = "r5" 6PR = "r6"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/irda/irda-utils-${PV}.tar.gz \
9 file://configure.patch;patch=1 \ 9 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 @@
1PR = "r2" 1DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format."
2LICENSE ="jpeg"
2SECTION = "libs" 3SECTION = "libs"
3PRIORITY = "required" 4PRIORITY = "required"
5
4DEPENDS = "libtool-cross" 6DEPENDS = "libtool-cross"
5DESCRIPTION = "libjpeg is a library for handling the JPEG (JFIF) image format." 7
6PACKAGES =+ "jpeg-tools " 8PR = "r5"
7FILES_jpeg-tools = "${bindir}/*" 9
8LICENSE ="jpeg"
9SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \ 10SRC_URI = "http://www.ijg.org/files/jpegsrc.v${PV}.tar.gz \
10 file://debian.patch;patch=1 \ 11 file://debian.patch;patch=1 \
11 file://ldflags.patch;patch=1 \ 12 file://ldflags.patch;patch=1 \
@@ -33,3 +34,8 @@ do_install() {
33 ${D}${mandir}/man1 ${D}${libdir} 34 ${D}${mandir}/man1 ${D}${libdir}
34 oe_runmake 'DESTDIR=${D}' install 35 oe_runmake 'DESTDIR=${D}' install
35} 36}
37
38PACKAGES =+ "jpeg-tools "
39FILES_jpeg-tools = "${bindir}/*"
40
41
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"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "libxtst" 3DEPENDS = "libxtst"
4SECTION = "x11/wm" 4SECTION = "x11/wm"
5PR="r1" 5PR="r2"
6PV = "0.0+svn${SRCDATE}" 6PV = "0.0+svn${SRCDATE}"
7 7
8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
@@ -16,3 +16,4 @@ do_stage () {
16 install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey 16 install -m 0644 ${S}/fakekey/fakekey.h ${STAGING_INCDIR}/fakekey
17 oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR} 17 oe_libinstall -so -C src libfakekey ${STAGING_LIBDIR}
18} 18}
19
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 @@
1PR = "r0" 1PR = "r1"
2DESCRIPTION = "GPG-Error library" 2DESCRIPTION = "GPG-Error library"
3SECTION = "libs" 3SECTION = "libs"
4PRIORITY = "optional" 4PRIORITY = "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"
5DEPENDS = "ipkg-native" 5DEPENDS = "ipkg-native"
6 6
7INHIBIT_DEFAULT_DEPS = "1" 7INHIBIT_DEFAULT_DEPS = "1"
8ALLOW_EMPTY = 1 8ALLOW_EMPTY = "1"
9PACKAGES = "" 9PACKAGES = ""
10 10
11do_fetch() { 11do_fetch() {
@@ -23,7 +23,7 @@ do_install() {
23do_stage() { 23do_stage() {
24} 24}
25 25
26do_build[nostamp] = 1 26do_build[nostamp] = "1"
27do_build[dirs] = "${DEPLOY_DIR_IPK}" 27do_build[dirs] = "${DEPLOY_DIR_IPK}"
28do_build() { 28do_build() {
29 set -ex 29 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 @@
1DESCRIPTION = "Firmware for Spectrum Wireless LAN cards" 1DESCRIPTION = "Firmware for Spectrum Wireless LAN cards"
2LICENSE = "unknown" 2LICENSE = "unknown"
3PR = "r0" 3PR = "r1"
4PACKAGE_ARCH = "all"
5 4
6SRC_URI = "file://get_symbol_fw \ 5SRC_URI = "file://get_symbol_fw \
7 file://parse_symbol_fw" 6 file://parse_symbol_fw"
8
9S = "${WORKDIR}" 7S = "${WORKDIR}"
10 8
11do_compile() { 9do_configure() {
12 ./get_symbol_fw 10 ./get_symbol_fw
13} 11}
14 12
15FILES_${PN} += "${base_libdir}/firmware/symbol*"
16
17do_install() { 13do_install() {
18 install -d ${D}${base_libdir}/firmware/ 14 install -d ${D}${base_libdir}/firmware/
19 install -m 0755 ${WORKDIR}/symbol_sp24t_prim_fw ${D}${base_libdir}/firmware/symbol_sp24t_prim_fw 15 install -m 0755 ${WORKDIR}/symbol_sp24t_prim_fw ${D}${base_libdir}/firmware/symbol_sp24t_prim_fw
20 install -m 0755 ${WORKDIR}/symbol_sp24t_sec_fw ${D}${base_libdir}/firmware/symbol_sp24t_sec_fw 16 install -m 0755 ${WORKDIR}/symbol_sp24t_sec_fw ${D}${base_libdir}/firmware/symbol_sp24t_sec_fw
21} 17}
18
19PACKAGE_ARCH = "all"
20FILES_${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 \
20 file://wnv.conf" 20 file://wnv.conf"
21 21
22SRC_URI_append_spitz = " file://nocleanup.patch;patch=1" 22SRC_URI_append_spitz = " file://nocleanup.patch;patch=1"
23SRC_URI_append_sh3 = " file://superh-noO3.patch;patch=1"
24
23S = "${WORKDIR}/pcmcia-cs-${PV}" 25S = "${WORKDIR}/pcmcia-cs-${PV}"
24 26
25INITSCRIPT_NAME = "pcmcia" 27INITSCRIPT_NAME = "pcmcia"
@@ -27,7 +29,7 @@ INITSCRIPT_PARAMS = "defaults"
27 29
28inherit update-rc.d module-base 30inherit update-rc.d module-base
29 31
30export KERNEL_SOURCE = ${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')} 32export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}"
31 33
32sbindir = "/sbin" 34sbindir = "/sbin"
33 35
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 \
21 file://08setupdns \ 21 file://08setupdns \
22 file://92removedns" 22 file://92removedns"
23 23
24SRC_URI_append_nylon = " file://ppp-tdbread.patch;patch=1"
24 25
25inherit autotools 26inherit autotools
26 27
@@ -45,6 +46,7 @@ do_install_append () {
45CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" 46CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
46PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" 47PACKAGES += "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
47FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd" 48FILES_${PN} = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd"
49FILES_${PN}_nylon = "/etc /usr/bin /usr/sbin/chat /usr/sbin/pppd /usr/sbin/tdbread"
48FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so" 50FILES_ppp-oa = "/usr/lib/pppd/2.4.3/pppoatm.so"
49FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so" 51FILES_ppp-oe = "/usr/sbin/pppoe-discovery /usr/lib/pppd/2.4.3/rp-pppoe.so"
50FILES_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" 52FILES_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
138 exit 1 138 exit 1
139fi 139fi
140 140
141if [ ! -e /proc/sys/kernel/hotplug ]; then 141if [ ! -e /proc/sys/kernel/hotplug ] && [ ! -e /sys/kernel/uevent_helper ]; then
142 echo "udev requires hotplug support, not started." 142 echo "udev requires hotplug support, not started."
143 exit 1 143 exit 1
144fi 144fi
@@ -161,7 +161,11 @@ case "$1" in
161 warn_if_interactive 161 warn_if_interactive
162 162
163 #echo /sbin/udevsend > /proc/sys/kernel/hotplug 163 #echo /sbin/udevsend > /proc/sys/kernel/hotplug
164 echo "" > /proc/sys/kernel/hotplug 164 if [ -e /sys/kernel/uevent_helper ] ; then
165 echo "" > /sys/kernel/uevent_helper
166 else
167 echo "" > /proc/sys/kernel/hotplug
168 fi
165 udevsend 169 udevsend
166 if [ "$UDEV_DISABLED" = "yes" ]; then 170 if [ "$UDEV_DISABLED" = "yes" ]; then
167 echo "udev disabled on the kernel command line, not started." 171 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"
98ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper" 98ACTION=="add", SUBSYSTEM=="firmware", RUN+="/lib/udev/firmware_helper"
99 99
100# Samsung UARTS 100# Samsung UARTS
101KERNEL=="s3c2410_serial[0-9]" NAME="ttySAC%n" 101KERNEL=="s3c2410_serial[0-9]", NAME="ttySAC%n"
102 102