summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/openslug-packages.conf1
-rw-r--r--conf/distro/preferred-gpe-versions-2.7.inc2
-rw-r--r--conf/distro/ucslugc-packages.conf2
-rw-r--r--conf/machine/zaurus-clamshell-2.4.conf30
-rw-r--r--packages/gnome/libgnomeprint_2.8.2.bb4
-rw-r--r--packages/gpe-session-scripts/files/remove-x11-common-files.patch12
-rw-r--r--packages/gpe-session-scripts/gpe-session-scripts_0.63.bb2
-rw-r--r--packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch70
-rw-r--r--packages/hostap/hostap-modules_0.3.9.bb5
-rw-r--r--packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch30
-rw-r--r--packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb4
-rw-r--r--packages/meta/openslug-packages.bb1
-rw-r--r--packages/obexpush/obexpush-native_1.0.0.bb9
-rw-r--r--packages/opie-i18n/opie-i18n.inc3
-rw-r--r--packages/opie-i18n/opie-i18n_1.2.0.bb4
-rw-r--r--packages/opie-i18n/opie-i18n_cvs.bb4
-rw-r--r--packages/pciutils/pciutils_2.1.11.bb11
-rw-r--r--packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb4
18 files changed, 167 insertions, 31 deletions
diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index 316a030f8a..6bd6708814 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -184,6 +184,7 @@ ${PKGDIR}/packages/update-rc.d/*.bb \
${PKGDIR}/packages/upslug/*.bb \
${PKGDIR}/packages/usbutils/*.bb \
${PKGDIR}/packages/util-linux/*.bb \
+${PKGDIR}/packages/vim/*.bb \
${PKGDIR}/packages/vlan/*.bb \
${PKGDIR}/packages/vsftpd/*.bb \
${PKGDIR}/packages/wakelan/*.bb \
diff --git a/conf/distro/preferred-gpe-versions-2.7.inc b/conf/distro/preferred-gpe-versions-2.7.inc
index 8d3d03f779..3fb62d08a8 100644
--- a/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/conf/distro/preferred-gpe-versions-2.7.inc
@@ -48,7 +48,7 @@ PREFERRED_VERSION_gpe-contacts ?= "0.41"
PREFERRED_VERSION_gpe-today ?= "0.08"
PREFERRED_VERSION_matchbox-panel-manager ?= "0.1"
PREFERRED_VERSION_dbus ?= "0.23.4"
-PREFERRED_VERSION_gpe-bluetooth ?= "0.38"
+PREFERRED_VERSION_gpe-bluetooth ?= "0.42"
PREFERRED_VERSION_gpe-su ?= "0.18"
PREFERRED_VERSION_gpe-conf ?= "0.1.24"
PREFERRED_VERSION_gpe-clock ?= "0.20"
diff --git a/conf/distro/ucslugc-packages.conf b/conf/distro/ucslugc-packages.conf
index 66bb74577b..5ecc44fb03 100644
--- a/conf/distro/ucslugc-packages.conf
+++ b/conf/distro/ucslugc-packages.conf
@@ -51,6 +51,7 @@ ${PKGDIR}/packages/gzip/*.bb \
${PKGDIR}/packages/hotplug-ng/*.bb \
${PKGDIR}/packages/initscripts/*.bb \
${PKGDIR}/packages/install/*.bb \
+${PKGDIR}/packages/intltool/*.bb \
${PKGDIR}/packages/ipkg-utils/*.bb \
${PKGDIR}/packages/ipkg/*.bb \
${PKGDIR}/packages/ircp/*.bb \
@@ -62,6 +63,7 @@ ${PKGDIR}/packages/libaal/*.bb \
${PKGDIR}/packages/libao/*.bb \
${PKGDIR}/packages/libexif/*.bb \
${PKGDIR}/packages/libgphoto2/*.bb \
+${PKGDIR}/packages/libgsm/*.bb \
${PKGDIR}/packages/libiconv/*.bb \
${PKGDIR}/packages/libid3tag/*.bb \
${PKGDIR}/packages/libmad/*.bb \
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index 0934d84baa..d61dc197b2 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -1,9 +1,10 @@
# Zaurus Clamshell specific configuration for kernel 2.4
# Don't forget to include zaurus-clamshell.conf as well
-PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix"
-PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
-PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
+PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix"
+PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
+PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
+PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
# Later versions are broken on kernel 2.4
PREFERRED_VERSION_orinoco-modules = "0.13e"
@@ -29,14 +30,19 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-modu
kernel-module-firmware-class kernel-module-bt3c-cs"
# BI Module
-BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi"
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi"
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi"
+BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi"
# USB Host Modules
-BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
- kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
- kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
-BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
- kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
- kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+ kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+ kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+ kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+ kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
+ kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
+ kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
+
diff --git a/packages/gnome/libgnomeprint_2.8.2.bb b/packages/gnome/libgnomeprint_2.8.2.bb
index ae9d6cc70b..3bbdef5103 100644
--- a/packages/gnome/libgnomeprint_2.8.2.bb
+++ b/packages/gnome/libgnomeprint_2.8.2.bb
@@ -1,11 +1,13 @@
LICENSE = "GPL"
SECTION = "x11/gnome/libs"
-PR = "r1"
+PR = "r2"
DEPENDS = "libxml2 glib-2.0 pango libart-lgpl fontconfig popt gnome-common"
inherit flow-lossage pkgconfig gnome
+EXTRA_OECONF = "--with-cups=no"
+
do_stage() {
install -d ${STAGING_LIBDIR}
oe_libinstall -so -a -C libgnomeprint libgnomeprint-2-2 ${STAGING_LIBDIR}
diff --git a/packages/gpe-session-scripts/files/remove-x11-common-files.patch b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
index 1bf896923d..4ae13cba80 100644
--- a/packages/gpe-session-scripts/files/remove-x11-common-files.patch
+++ b/packages/gpe-session-scripts/files/remove-x11-common-files.patch
@@ -1,7 +1,7 @@
diff -Nur gpe-session-scripts-0.63~/Makefile gpe-session-scripts-0.63/Makefile
---- gpe-session-scripts-0.63~/Makefile 2005-08-19 18:32:17.000000000 -0700
-+++ gpe-session-scripts-0.63/Makefile 2005-08-19 18:35:46.000000000 -0700
-@@ -23,7 +23,9 @@
+--- gpe-session-scripts-0.63~/Makefile 2005-08-23 15:10:25.000000000 -0700
++++ gpe-session-scripts-0.63/Makefile 2005-08-23 15:08:40.000000000 -0700
+@@ -23,13 +23,14 @@
all:
install-program: gpe-logout.desktop
@@ -12,3 +12,9 @@ diff -Nur gpe-session-scripts-0.63~/Makefile gpe-session-scripts-0.63/Makefile
install -d $(DESTDIR)$(PREFIX)/bin
install -m 755 gpe-xcalibrate.sh $(DESTDIR)$(PREFIX)/bin/gpe-xcalibrate.sh
install -d $(DESTDIR)/etc/gpe
+ install -m 644 X11/xsettings.default $(DESTDIR)/etc/gpe/
+ install -m 644 standard.mbdock $(DESTDIR)/etc/gpe/gpe.mbdock
+- install -m 644 X11/Xdefaults $(DESTDIR)/etc/X11/
+ mkdir -p $(DESTDIR)$(PREFIX)/share/pixmaps
+ install -m 644 gpe-logout.png $(DESTDIR)$(PREFIX)/share/pixmaps
+ mkdir -p $(DESTDIR)$(PREFIX)/share/applications
diff --git a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
index 19b6608e2f..a54039d09b 100644
--- a/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
+++ b/packages/gpe-session-scripts/gpe-session-scripts_0.63.bb
@@ -1,5 +1,5 @@
LICENSE = "GPL"
-PR = "r15"
+PR = "r16"
inherit gpe
diff --git a/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch b/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch
new file mode 100644
index 0000000000..05f716e22f
--- /dev/null
+++ b/packages/hostap/hostap-modules-0.3.9/hostap_cardid.patch
@@ -0,0 +1,70 @@
+Index: hostap-driver-0.3.9/driver/modules/hostap_cs.c
+===================================================================
+--- hostap-driver-0.3.9.orig/driver/modules/hostap_cs.c 2005-08-24 10:11:47.000000000 +0100
++++ hostap-driver-0.3.9/driver/modules/hostap_cs.c 2005-08-24 10:39:10.000000000 +0100
+@@ -908,6 +908,57 @@
+ return 0;
+ }
+
++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
++static struct pcmcia_device_id hostap_cs_ids[] = {
++ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7100),
++ PCMCIA_DEVICE_MANF_CARD(0x000b, 0x7300),
++ PCMCIA_DEVICE_MANF_CARD(0x0101, 0x0777),
++ PCMCIA_DEVICE_MANF_CARD(0x0126, 0x8000),
++ PCMCIA_DEVICE_MANF_CARD(0x0138, 0x0002),
++ PCMCIA_DEVICE_MANF_CARD(0x0156, 0x0002),
++ PCMCIA_DEVICE_MANF_CARD(0x0250, 0x0002),
++ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1612),
++ PCMCIA_DEVICE_MANF_CARD(0x0274, 0x1613),
++ PCMCIA_DEVICE_MANF_CARD(0x028a, 0x0002),
++ PCMCIA_DEVICE_MANF_CARD(0x02aa, 0x0002),
++ PCMCIA_DEVICE_MANF_CARD(0x02d2, 0x0001),
++ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x0001),
++ PCMCIA_DEVICE_MANF_CARD(0x50c2, 0x7300),
++ PCMCIA_DEVICE_MANF_CARD(0xc00f, 0x0000),
++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0002),
++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0005),
++ PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0010),
++ PCMCIA_MFC_DEVICE_PROD_ID12(0, "SanDisk", "ConnectPlus",
++ 0x7a954bd9, 0x74be00c6),
++ PCMCIA_DEVICE_PROD_ID1234(
++ "Intersil", "PRISM 2_5 PCMCIA ADAPTER", "ISL37300P",
++ "Eval-RevA",
++ 0x4b801a17, 0x6345a0bf, 0xc9049a39, 0xc23adc0e),
++ PCMCIA_DEVICE_PROD_ID123(
++ "Addtron", "AWP-100 Wireless PCMCIA", "Version 01.02",
++ 0xe6ec52ce, 0x08649af2, 0x4b74baa0),
++ PCMCIA_DEVICE_PROD_ID123(
++ "D", "Link DWL-650 11Mbps WLAN Card", "Version 01.02",
++ 0x71b18589, 0xb6f1b0ab, 0x4b74baa0),
++ PCMCIA_DEVICE_PROD_ID123(
++ "Instant Wireless ", " Network PC CARD", "Version 01.02",
++ 0x11d901af, 0x6e9bd926, 0x4b74baa0),
++ PCMCIA_DEVICE_PROD_ID123(
++ "SMC", "SMC2632W", "Version 01.02",
++ 0xc4f8b18b, 0x474a1f2a, 0x4b74baa0),
++ PCMCIA_DEVICE_PROD_ID12("Compaq", "WL200_11Mbps_Wireless_PCI_Card",
++ 0x54f7c49c, 0x15a75e5b),
++ PCMCIA_DEVICE_PROD_ID12("INTERSIL", "HFA384x/IEEE",
++ 0x74c5e40d, 0xdb472a18),
++ PCMCIA_DEVICE_PROD_ID12("Linksys", "Wireless CompactFlash Card",
++ 0x0733cc81, 0x0c52f395),
++ PCMCIA_DEVICE_PROD_ID12(
++ "ZoomAir 11Mbps High", "Rate wireless Networking",
++ 0x273fe3db, 0x32a1eaee),
++ PCMCIA_DEVICE_NULL
++};
++MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);
++#endif
+
+ #if LINUX_VERSION_CODE > KERNEL_VERSION(2,5,67)
+ static struct pcmcia_driver hostap_driver = {
+@@ -917,6 +968,7 @@
+ .attach = prism2_attach,
+ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12))
+ .event = prism2_event,
++ .id_table = hostap_cs_ids,
+ #endif
+ .detach = prism2_detach,
+ .owner = THIS_MODULE,
diff --git a/packages/hostap/hostap-modules_0.3.9.bb b/packages/hostap/hostap-modules_0.3.9.bb
index b6a3891cd2..1be1e6a77e 100644
--- a/packages/hostap/hostap-modules_0.3.9.bb
+++ b/packages/hostap/hostap-modules_0.3.9.bb
@@ -3,13 +3,14 @@ SECTION = "kernel/modules"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \
file://hostap_cs.conf \
file://Makefile.patch;patch=1 \
file://add_event.patch;patch=1 \
- file://hostap-utsname.patch;patch=1"
+ file://hostap-utsname.patch;patch=1 \
+ file://hostap_cardid.patch;patch=1"
SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \
file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0"
SRC_URI_append_h3900 = " file://ipaq_compat.patch;patch=1 "
diff --git a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch
index a2dbce3325..9fe3bd06d3 100644
--- a/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch
+++ b/packages/linux/linux-openzaurus-2.6.13-rc5-mm1/dtl1_cs-add-socket-revE.patch
@@ -1,3 +1,33 @@
+
+Patch was sent upstream to Marcel Holtmann <marcel@holtmann.org>
+
+Response:
+
+Hi Marcin,
+
+> I use Socket Bluetooth CompactFlash card in my Zaurus. Some time ago we
+> switched to 2.6.12-rcX-mmY so we get PCMCIA hotplug support. On my device
+> I also switched from pcmcia-cs 3.2.8 to pcmciautils 003 (will check 005
+> later).
+>
+> With my config I lost automatic module loading after BT card insert so I
+> looked into kernel driver and added infos about my card. Patch attached.
+
+there are some pending patches from Dominic that I want to see merged
+mainline first, before I am going to submit patches for the Bluetooth
+PCMCIA drivers.
+
+> BTW - any plans on adding suspend/resume support into this driver? Now I
+> have to eject/insert card after resume and restart bluez-utils to get it
+> working.
+
+Maybe with the new PCMCIA subsystem this will be possible. Feel free to
+send in patches.
+
+Regards
+
+Marcel
+
--- linux-2.6.12/drivers/bluetooth/dtl1_cs.c.orig 2005-07-05 11:19:50.000000000 +0200
+++ linux-2.6.12/drivers/bluetooth/dtl1_cs.c 2005-07-05 11:19:51.000000000 +0200
@@ -810,6 +810,7 @@
diff --git a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
index 76f217d74e..065d5d9eb8 100644
--- a/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.13-rc5-mm1.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
#KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
KV = "${@bb.data.getVar('PV',d,True)}"
-PR = "r10"
+PR = "r11"
DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
RPSRC = "http://www.rpsys.net/openzaurus/patches"
@@ -79,7 +79,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \
${DOSRC}/tosa-lcd-r3.patch;patch=1 \
${DOSRC}/tosa-2.6.13-r1.patch;patch=1 \
${RPSRC}/temp/tosa-bl-r5.patch;patch=1 \
- ${RPSRC}/pxa27x_extraregs-r2.patch;patch=1 \
+ ${RPSRC}/pxa27x_extraregs-r3.patch;patch=1 \
${RPSRC}/spitzbase-r5.patch;patch=1 \
${RPSRC}/spitzkbd-r1.patch;patch=1 \
${RPSRC}/spitzssp-r4.patch;patch=1 \
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index e67eadd555..2febd8d2b3 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -118,6 +118,7 @@ OPENSLUG_PACKAGES = "\
unionfs-modules unionfs-utils \
usbutils \
util-linux \
+ vim \
vlan \
vsftpd \
wakelan \
diff --git a/packages/obexpush/obexpush-native_1.0.0.bb b/packages/obexpush/obexpush-native_1.0.0.bb
new file mode 100644
index 0000000000..6e63de5c98
--- /dev/null
+++ b/packages/obexpush/obexpush-native_1.0.0.bb
@@ -0,0 +1,9 @@
+include obexpush_${PV}.bb
+inherit native
+
+FILESPATH = "${FILE_DIRNAME}/obexpush-${PV}:${FILE_DIRNAME}/obexpush:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+
+do_install() {
+ :
+}
+
diff --git a/packages/opie-i18n/opie-i18n.inc b/packages/opie-i18n/opie-i18n.inc
index fe971c85d9..e36da0baa3 100644
--- a/packages/opie-i18n/opie-i18n.inc
+++ b/packages/opie-i18n/opie-i18n.inc
@@ -32,6 +32,7 @@ do_install() {
then
install -m 0644 ${WORKDIR}/dict/dawg.$f ${D}${palmtopdir}/etc/dict/
fi
+ install -m 0644 ${WORKDIR}/dict/dawg ${D}${palmtopdir}/etc/dict/
done
}
@@ -48,7 +49,7 @@ FILES_opie-dict-cz = "${palmtopdir}/etc/dict/dawg.cz"
FILES_opie-dict-da = "${palmtopdir}/etc/dict/dawg.da"
FILES_opie-dict-de = "${palmtopdir}/etc/dict/dawg.de"
FILES_opie-dict-dk = "${palmtopdir}/etc/dict/dawg.dk"
-FILES_opie-dict-en = "${palmtopdir}/etc/dict/dawg.en"
+FILES_opie-dict-en = "${palmtopdir}/etc/dict/dawg"
FILES_opie-dict-es = "${palmtopdir}/etc/dict/dawg.es"
FILES_opie-dict-fr = "${palmtopdir}/etc/dict/dawg.fr"
FILES_opie-dict-hu = "${palmtopdir}/etc/dict/dawg.hu"
diff --git a/packages/opie-i18n/opie-i18n_1.2.0.bb b/packages/opie-i18n/opie-i18n_1.2.0.bb
index af049f3eb5..dc094e3986 100644
--- a/packages/opie-i18n/opie-i18n_1.2.0.bb
+++ b/packages/opie-i18n/opie-i18n_1.2.0.bb
@@ -1,7 +1,7 @@
include ${PN}.inc
-
+
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
-PR = "r0"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/i18n \
${HANDHELDS_CVS};tag=${TAG};module=opie/etc/dict"
diff --git a/packages/opie-i18n/opie-i18n_cvs.bb b/packages/opie-i18n/opie-i18n_cvs.bb
index cead470f75..a8b119b3e8 100644
--- a/packages/opie-i18n/opie-i18n_cvs.bb
+++ b/packages/opie-i18n/opie-i18n_cvs.bb
@@ -1,7 +1,7 @@
include ${PN}.inc
-
+
PV = "1.2.0+cvs-${CVSDATE}"
-PR = "r0"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/i18n \
${HANDHELDS_CVS};module=opie/etc/dict"
diff --git a/packages/pciutils/pciutils_2.1.11.bb b/packages/pciutils/pciutils_2.1.11.bb
index 792b34fda7..ce9979ca91 100644
--- a/packages/pciutils/pciutils_2.1.11.bb
+++ b/packages/pciutils/pciutils_2.1.11.bb
@@ -1,13 +1,15 @@
SECTION = "console/utils"
DESCRIPTION = 'The PCI Utilities package contains a library for portable access \
to PCI bus configuration space and several utilities based on this library.'
+DESCRIPTION_pciutils-ids = 'The list of PCI IDs for pciutils'
HOMEPAGE = "http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml"
LICENSE = "GPLv2"
-PR="r1"
+PR="r3"
PARALLEL_MAKE = ""
-
+FILES_pciutils-ids="${prefix}/share/pci.ids"
+PACKAGES =+ "pciutils-ids"
SRC_URI = "ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-${PV}.tar.bz2 \
file://configure.patch;patch=1 \
file://configure-uclibc.patch;patch=1 \
@@ -25,3 +27,8 @@ export MANDIR = "${D}${mandir}"
do_install () {
oe_runmake install
}
+do_install_append () {
+ install -d ${D}/${prefix}/share
+ install -m 6440 ${WORKDIR}/${PN}-${PV}/pci.ids ${D}/${prefix}/share
+}
+
diff --git a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
index d27f018daf..b84e0575af 100644
--- a/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
+++ b/packages/sharp-binary-only/sharp-sdmmc-support_2.4.18-rmk7-pxa3-embedix.bb
@@ -4,9 +4,9 @@ PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "CLOSED"
RDEPENDS = "kernel (${KERNEL_VERSION})"
-PR = "r20"
+PR = "r21"
-SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r3.tar.bz2 \
+SRC_URI = "http://www.openzaurus.org/mirror/sd-modules-2.4.18-rmk7-pxa3-embedix-r4.tar.bz2 \
file://sd \
file://sdmgr \
file://sdcontrol"