diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2005-07-06 09:31:04 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-06 09:31:04 +0000 |
| commit | b1738183f0019463bed2a82a645ba44b7263fb6e (patch) | |
| tree | bb44b595c3bb922ffaded61bd7021b736d373fee /packages | |
| parent | 6e8987a32745bdb779c3e79bda5ef42f7a2f0955 (diff) | |
| parent | e090e2ca8c22dd6a7877b5a163e046417c68f2f6 (diff) | |
merge of 2c175103edd16989707cafa26c364d4c836c78f1
and 6ce955f2f98c52e7f840a56e77bc39b232bd4b16
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch | 10 | ||||
| -rw-r--r-- | packages/linux/linux-openzaurus_2.6.12-mm1.bb | 3 | ||||
| -rw-r--r-- | packages/pcmciautils/pcmciautils_005.bb | 29 |
3 files changed, 41 insertions, 1 deletions
diff --git a/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch b/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch new file mode 100644 index 0000000000..a2dbce3325 --- /dev/null +++ b/packages/linux/linux-openzaurus-2.6.12-mm1/dtl1_cs-add-socket-revE.patch @@ -0,0 +1,10 @@ +--- 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 @@ + static struct pcmcia_device_id dtl1_ids[] = { + PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d), + PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863), ++ PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3), + PCMCIA_DEVICE_NULL + }; + MODULE_DEVICE_TABLE(pcmcia, dtl1_ids); diff --git a/packages/linux/linux-openzaurus_2.6.12-mm1.bb b/packages/linux/linux-openzaurus_2.6.12-mm1.bb index 00d3d891b9..865a880b86 100644 --- a/packages/linux/linux-openzaurus_2.6.12-mm1.bb +++ b/packages/linux/linux-openzaurus_2.6.12-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 = "r3" +PR = "r4" DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches" RPSRC = "http://www.rpsys.net/openzaurus/patches" @@ -75,6 +75,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.12.tar.gz \ file://add-elpp-stuff.patch;patch=1 \ file://pxa-serial-hack.patch;patch=1 \ ${RPSRC}/jl1/pxa-linking-bug.patch;patch=1 \ + file://dtl1_cs-add-socket-revE.patch;patch=1 \ file://defconfig-c7x0 \ file://defconfig-ipaq-pxa-2.6 \ file://defconfig-collie \ diff --git a/packages/pcmciautils/pcmciautils_005.bb b/packages/pcmciautils/pcmciautils_005.bb new file mode 100644 index 0000000000..ad8cf7e2f4 --- /dev/null +++ b/packages/pcmciautils/pcmciautils_005.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "2.6 pcmcia utilities" +DEPENDS = "sysfsutils" +SECTION = "kernel/userland" +PRIORITY = "optional" + +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmciautils-${PV}.tar.bz2" +S = "${WORKDIR}/pcmciautils-${PV}" + +inherit update-rc.d + +INITSCRIPT_NAME = "coldplug" +INITSCRIPT_PARAMS = "defaults" + +export HOSTCC = "${BUILD_CC}" +export etcdir = "${sysconfdir}" +export hotplugdir = "${sysconfdir}/hotplug" +export pcmciaconfdir = "${sysconfdir}/pcmcia" +LD = "${CC}" +CFLAGS =+ "-I${S}/src" + +PARALLEL_MAKE = "" +EXTRA_OEMAKE = "-e 'STRIP=echo' 'LIB_OBJS=-lc -lsysfs'" + +do_install () { + oe_runmake 'DESTDIR=${D}' install +} + +CONFFILES_${PN} += "${sysconfdir}/pcmcia/config.opts" +RCONFLICTS_${PN} += "pcmcia-cs" |