From 2bf0192f79db3f56b08ff61b70cff115f5e14727 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Mon, 23 May 2005 21:40:10 +0000 Subject: [PATCH] Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/23 23:16:52+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/05/23 23:16:38+02:00 uni-frankfurt.de!mickeyl zaurus-clamshell-2.4.conf: use old syntax for adding stuff to PREFERRED_PROVIDERS. PREFERRED_PROVIDER_virtual/kernel_ doesn't seem to work 2005/05/23 21:22:16+02:00 uni-frankfurt.de!mickeyl add note for orinoco 0.15rc1, disable pci modules for now on 0.15rc2 (breaking w/ 2.6.12) 2005/05/23 10:13:06+02:00 uni-frankfurt.de!mickeyl fix opie-pcmciaapplet APPNAME BKrev: 42924dbathx1oMwTgPxyGquZyXlw9w --- conf/machine/zaurus-clamshell-2.4.conf | 6 ++-- .../opie-pcmciaapplet/opie-pcmciaapplet.inc | 31 +++++++++++++++++++ .../orinoco-modules-0.15rc2/disable-pci.patch | 0 packages/orinoco/orinoco-modules_0.15rc1.bb | 5 +-- packages/orinoco/orinoco-modules_0.15rc2.bb | 5 ++- 5 files changed, 39 insertions(+), 8 deletions(-) create mode 100644 packages/orinoco/orinoco-modules-0.15rc2/disable-pci.patch diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf index bf18b0837a..57fd6e9ff4 100644 --- a/conf/machine/zaurus-clamshell-2.4.conf +++ b/conf/machine/zaurus-clamshell-2.4.conf @@ -1,6 +1,6 @@ -PREFERRED_PROVIDER_virtual/kernel = "c7x0-kernels-2.4-embedix" -PREFERRED_PROVIDER_virtual/kernel_akita = "openzaurus-pxa27x" -PREFERRED_PROVIDER_virtual/kernel_spitz = "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" BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \ pcmcia-cs apmd hostap-modules orinoco-modules sharp-sdmmc-support chkhinge \ diff --git a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc index e69de29bb2..4dacc005b4 100644 --- a/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc +++ b/packages/opie-pcmciaapplet/opie-pcmciaapplet.inc @@ -0,0 +1,31 @@ +DESCRIPTION = "PCMCIA/CF Manager Applet" +SECTION = "opie/applets" +PRIORITY = "optional" +MAINTAINER = "Team Opie " +LICENSE = "GPL" +APPNAME = "pcmcia" + +S = "${WORKDIR}/${APPNAME}" + +inherit opie + +pkg_postinst() { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +if pidof -s qpe >/dev/null; then + /opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +else + exit 0 +fi +} + +pkg_postrm() { +#!/bin/sh +if [ -n "$D" ]; then exit 1; fi +/opt/QtPalmtop/bin/qcop QPE/TaskBar "reloadApplets()" +} + +do_install() { + install -d ${D}${palmtopdir}/pics/${APPNAME}/ + install -m 0644 ${WORKDIR}/pics/${APPNAME}/*.png ${D}${palmtopdir}/pics/${APPNAME}/ +} diff --git a/packages/orinoco/orinoco-modules-0.15rc2/disable-pci.patch b/packages/orinoco/orinoco-modules-0.15rc2/disable-pci.patch new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb index e1f6e11583..6887293dc9 100644 --- a/packages/orinoco/orinoco-modules_0.15rc1.bb +++ b/packages/orinoco/orinoco-modules_0.15rc1.bb @@ -4,9 +4,10 @@ SECTION = "kernel/modules" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" -PR = "r3" +PR = "r4" -# seems to cause problems on arm +# seems to cause problems on 2.4 arm kernels +# known to work on 2.6.12-rc4-mm3 DEFAULT_PREFERENCE_arm = "-1" SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \ diff --git a/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb index ec7eb6a3d0..251927aaec 100644 --- a/packages/orinoco/orinoco-modules_0.15rc2.bb +++ b/packages/orinoco/orinoco-modules_0.15rc2.bb @@ -5,16 +5,15 @@ PRIORITY = "optional" PROVIDES = "spectrum-modules" MAINTAINER = "Michael 'Mickey' Lauer " LICENSE = "GPL" -PR = "r4" +PR = "r5" # seems to cause problems on arm DEFAULT_PREFERENCE_arm = "-1" -export EXTRACFLAGS = "-mstructure-size-boundary=32" - SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \ file://list-move.patch;patch=1 \ file://spectrum-firmware.patch;patch=1 \ + file://disable-pci.patch;patch=1 \ file://spectrum.conf \ file://spectrum_fw.h \ file://orinoco_cs.conf" -- 2.39.5