Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/06/21 01:11:36+02:00 uni-frankfurt.de!mickeyl
apply patch that tries to fix the firmware loading problem w/ spectrum_cs

2005/06/21 01:06:38+02:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/06/20 18:47:41+02:00 uni-frankfurt.de!mickeyl
fix opie-pcmciaapplet packaging

BKrev: 42b753db88hZ9QeqaucsP_y091pVpg

diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
index 4dacc00..6d1d58d 100644 (file)
--- a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
+++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
@@ -3,9 +3,9 @@ SECTION = "opie/applets"
 PRIORITY = "optional"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 LICENSE = "GPL"
-APPNAME = "pcmcia"
+APPNAME = "pcmciaapplet"
 
-S = "${WORKDIR}/${APPNAME}"
+S = "${WORKDIR}/pcmcia"
 
 inherit opie
 
@@ -26,6 +26,6 @@ if [ -n "$D" ]; then exit 1; fi
 }
 
 do_install() {
-        install -d ${D}${palmtopdir}/pics/${APPNAME}/
-        install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ 
+        install -d ${D}${palmtopdir}/pics/pcmcia/
+        install -m 0644 ${WORKDIR}/pics/pcmcia/*.png ${D}${palmtopdir}/pics/pcmcia/ 
 }

diff --git a/packages/orinoco/orinoco-modules-0.15rc2/catch-up-with-kernel-changes.patch b/packages/orinoco/orinoco-modules-0.15rc2/catch-up-with-kernel-changes.patch
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb
index ba2fe61..73140f8 100644 (file)
--- a/packages/orinoco/orinoco-modules_0.15rc2.bb
+++ b/packages/orinoco/orinoco-modules_0.15rc2.bb
@@ -5,7 +5,7 @@ PRIORITY = "optional"
 PROVIDES = "spectrum-modules"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 # seems to cause problems on arm
 DEFAULT_PREFERENCE_arm = "-1"
@@ -14,6 +14,7 @@ SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \
            file://makefile_fix.patch;patch=1 \
            file://list-move.patch;patch=1 \
            file://spectrum-firmware.patch;patch=1 \
+           file://catch-up-with-kernel-changes.patch;patch=1 \
            file://spectrum.conf \
            file://spectrum_fw.h \
           file://orinoco_cs.conf"