diff options
17 files changed, 334 insertions, 109 deletions
diff --git a/openembedded/classes/efl.bbclass b/openembedded/classes/efl.bbclass index 964748e85c..b438ca61b4 100644 --- a/openembedded/classes/efl.bbclass +++ b/openembedded/classes/efl.bbclass @@ -40,6 +40,7 @@ export IMLIB2_CONFIG = "${STAGING_BINDIR}/imlib2-config${@binconfig_suffix(d)}" do_compile_prepend() { find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:' + find ${S} -name Makefile | xargs sed -i 's:/usr/X11R6/include:${STAGING_INCDIR}:' } do_stage_append () { diff --git a/openembedded/classes/kernel.bbclass b/openembedded/classes/kernel.bbclass index df676c5a8d..463ff5f6b5 100644 --- a/openembedded/classes/kernel.bbclass +++ b/openembedded/classes/kernel.bbclass @@ -60,7 +60,7 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" kernel_do_compile() { unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS oe_runmake include/linux/version.h CC="${KERNEL_CC}" LD="${KERNEL_LD}" - if ${KERNEL_MAJOR_VERSION} != "2.6"; then + if [ "${KERNEL_MAJOR_VERSION}" != "2.6" ]; then oe_runmake dep CC="${KERNEL_CC}" LD="${KERNEL_LD}" fi oe_runmake ${KERNEL_IMAGETYPE} CC="${KERNEL_CC}" LD="${KERNEL_LD}" diff --git a/openembedded/conf/machine/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/zaurus-clamshell-2.6.conf index a26ae7754f..7438e8f998 100644 --- a/openembedded/conf/machine/zaurus-clamshell-2.6.conf +++ b/openembedded/conf/machine/zaurus-clamshell-2.6.conf @@ -3,7 +3,7 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules spectrum-fw \ +BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel udev sysfsutils hostap-modules spectrum-fw orinoco-conf \ pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \ ppp ppp-dialin openswan wpa-supplicant-nossl" diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory b/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory index 185ea7a3a5..185ea7a3a5 100644 --- a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre7/ignore_arch_directory +++ b/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/ignore_arch_directory diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt b/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt index ee1454c6ef..5d5cac609e 100644 --- a/openembedded/packages/module-init-tools/module-init-tools-3.2-pre7/manpagesopt +++ b/openembedded/packages/module-init-tools/module-init-tools-3.2-pre9/manpagesopt @@ -1,7 +1,7 @@ -Index: module-init-tools-3.1/configure.in +Index: module-init-tools-3.2-pre9/configure.in =================================================================== ---- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500 -+++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500 +--- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000 ++++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000 @@ -41,5 +41,14 @@ fi]) AC_SUBST(MODULE_DIR) @@ -18,8 +18,10 @@ Index: module-init-tools-3.1/configure.in +AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") +AC_OUTPUT([Makefile]) ---- module-init-tools-3.2-pre7/Makefile.am.orig 2005-07-05 13:55:06.000000000 +0200 -+++ module-init-tools-3.2-pre7/Makefile.am 2005-07-05 13:55:31.000000000 +0200 +Index: module-init-tools-3.2-pre9/Makefile.am +=================================================================== +--- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000 ++++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000 @@ -21,13 +21,14 @@ MAN5 = modprobe.conf.5 modules.dep.5 MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 @@ -28,7 +30,7 @@ Index: module-init-tools-3.1/configure.in # If they haven't overridden mandir, fix it (never /man!) mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) - TESTSUITE := $(shell find tests -type f ! -name '*~') + TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions -EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) +if MANPAGES diff --git a/openembedded/packages/module-init-tools/module-init-tools_3.1.bb b/openembedded/packages/module-init-tools/module-init-tools_3.1.bb deleted file mode 100644 index 62523f513a..0000000000 --- a/openembedded/packages/module-init-tools/module-init-tools_3.1.bb +++ /dev/null @@ -1,60 +0,0 @@ -LICENSE = "GPL" -SECTION = "base" -DESCRIPTION = "This package contains a set of programs for loading, inserting, and \ -removing kernel modules for Linux (versions 2.5.48 and above). It serves \ -the same function that the modutils package serves for Linux 2.4." -PR = "r2" - -PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" -RDEPENDS_${PN} += "module-init-tools-depmod" - -FILES_module-init-tools-depmod = "${sbindir}/depmod.26" -FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" - -SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ - file://ignore_arch_directory;patch=1 \ - file://modutils_extension;patch=1 \ - file://no_man_rebuild;patch=1 \ - file://manpagesopt;patch=1 \ - file://soc.patch;patch=1;pnum=0" -S = "${WORKDIR}/module-init-tools-${PV}" - -EXTRA_OECONF = "--disable-manpages" - -bindir = "/bin" -sbindir = "/sbin" - -inherit autotools - -do_install() { - autotools_do_install - for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do - mv ${D}/$f ${D}/$f.26 - done -} - -pkg_postinst_module-init-tools() { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do -bn=`basename $f` - update-alternatives --install /$f $bn /$f.26 20 -done -} - -pkg_prerm_module-init-tools() { -#!/bin/sh -for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo bin/lsmod; do -bn=`basename $f` - update-alternatives --remove $bn /$f.26 -done -} - -pkg_postinst_module-init-tools-depmod() { -#!/bin/sh -update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20 -} - -pkg_prerm_module-init-tools() { -#!/bin/sh -update-alternatives --remove depmod /sbin/depmod.26 -} diff --git a/openembedded/packages/module-init-tools/module-init-tools_3.2-pre7.bb b/openembedded/packages/module-init-tools/module-init-tools_3.2-pre9.bb index 017f288e7d..bbd8cca1bf 100644 --- a/openembedded/packages/module-init-tools/module-init-tools_3.2-pre7.bb +++ b/openembedded/packages/module-init-tools/module-init-tools_3.2-pre9.bb @@ -3,7 +3,7 @@ removing kernel modules for Linux (versions 2.5.48 and above). It serves \ the same function that the modutils package serves for Linux 2.4." LICENSE = "GPL" SECTION = "base" -PR = "r1" +PR = "r0" PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" RDEPENDS_${PN} += "module-init-tools-depmod" @@ -36,7 +36,7 @@ pkg_postinst_module-init-tools() { #!/bin/sh for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/depmod sbin/modinfo; do bn=`basename $f` - update-alternatives --install /$f $bn /$f.26 20 + update-alternatives --install /$f $bn /$f.26 60 done update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60 update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60 @@ -54,7 +54,7 @@ update-alternatives --remove lsmod /bin/lsmod.26 pkg_postinst_module-init-tools-depmod() { #!/bin/sh -update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 20 +update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60 } pkg_prerm_module-init-tools() { diff --git a/openembedded/packages/orinoco/files/hermes.conf b/openembedded/packages/orinoco/files/hermes.conf new file mode 100644 index 0000000000..e45114dd08 --- /dev/null +++ b/openembedded/packages/orinoco/files/hermes.conf @@ -0,0 +1,149 @@ +device "orinoco_cs" + class "network" + module "hermes", "orinoco", "orinoco_cs" + +device "spectrum_cs" + class "network" module "hermes", "orinoco", "spectrum_cs" + + +# This manfid was used for cards with Lucent/Agere and Intersil firmware. +# orinoco_cs supports both types, so we don't need to distinguish them. + +card "Orinoco or Intersil Prism 2 Wireless" + manfid 0x0156,0x0002 + bind "orinoco_cs" + + +# Cards with Lucent/Agere firmware (Hermes chipset) + +card "Lucent Technologies Wavelan/IEEE" + version "Lucent Technologies", "WaveLAN/IEEE" + bind "orinoco_cs" + +card "Avaya World Card" + version "Avaya Communication", "Avaya Wireless PC Card" + bind "orinoco_cs" + +card "Cabletron RoamAbout 802.11 DS" + version "Cabletron", "RoamAbout 802.11 DS" + bind "orinoco_cs" + +card "ELSA AirLancer MC-11" + version "ELSA", "AirLancer MC-11" + bind "orinoco_cs" + +card "MELCO WLI-PCM-L11" + version "MELCO", "WLI-PCM-L11" + bind "orinoco_cs" + +card "ARtem Onair" + version "ARtem", "Onair" + bind "orinoco_cs" + + +# Cards with Symbol firmware in flash (Spectrum24 chipset) + +card "LA4111 Spectrum24 Wireless LAN PC Card" + version "Symbol Technologies" + bind "orinoco_cs" + +card "3Com AirConnect" + version "3Com", "3CRWE737A AirConnect Wireless LAN PC Card" + bind "orinoco_cs" + +card "Intel PRO/Wireless 2011" + manfid 0x0089,0x0001 + bind "orinoco_cs" + +card "Ericsson WLAN Card C11" + manfid 0x016b,0x0001 + bind "orinoco_cs" + +card "Nortel Networks e-mobility 802.11 Wireless LAN PC Card" + version "Nortel Networks", "emobility 802.11 Wireless LAN PC Card", "1.00" + bind "orinoco_cs" + +card "D-Link DWL-650H" + version "D-Link Corporation", "D-Link DWL-650H 11Mbps WLAN Adapter" + bind "orinoco_cs" + + +# Cards with Symbol firmware without flash memory (Spectrum24 Trilogy). +# These cards need a separate driver that loads the firmware. + +card "LA4100 Spectrum24 CF WLAN Card" + manfid 0x026c, 0x0001 + bind "spectrum_cs" + +card "Socket Communications CF+ LP WLAN Card" + manfid 0x0104, 0x0001 + bind "spectrum_cs" + +card "Intel PRO/Wireless 2011B" + manfid 0x0089, 0x0001 + bind "spectrum_cs" + + +# Cards with Intersil firmware (Prism chipset) + +card "Farallon SkyLINE" + version "INTERSIL", "HFA384x/IEEE" + bind "orinoco_cs" + +card "D-Link DWL-650" + version "D", "Link DWL-650 11Mbps WLAN Card" + bind "orinoco_cs" + +card "SAMSUNG 11Mbps WLAN Card" + version "SAMSUNG", "11Mbps WLAN Card" + bind "orinoco_cs" +# Does this one cover Compaq as well ??? + +card "HyperLink Wireless PC Card 11Mbps" + version "HyperLink","Wireless PC Card 11Mbps" + bind "orinoco_cs" + +card "PROXIM LAN PC CARD HARMONY 80211B" + version "PROXIM","LAN PC CARD HARMONY 80211B" + bind "orinoco_cs" + +card "Linksys WPC11 11Mbps 802.11b WLAN Card" + version "Instant Wireless ", " Network PC CARD", "Version 01.02" + bind "orinoco_cs" + +card "Linksys WPC11 11Mbps 802.11b WLAN Card" + version "The Linksys Group, Inc.", "Instant Wireless Network PC Card", "ISL37300P", "RevA" + bind "orinoco_cs" + +card "Linksys CompactFlash Wireless Card" + version "Linksys", "Wireless CompactFlash Card" + bind "orinoco_cs" + +card "Tekram PCF-200" + version "PCMCIA", "11M WLAN Card v2.5", "ISL37300P", "RevA" + bind "orinoco_cs" + +card "ACTIONTEC PRISM Wireless LAN PC Card" + version "ACTIONTEC", "PRISM Wireless LAN PC Card" + bind "orinoco_cs" + +card "Zcomax XI-325HP" + version " ", "IEEE 802.11 Wireless LAN/PC Card" + bind "orinoco_cs" + +card "Microsoft Wireless Notebook Adapter MN-520 1.0.3" + version "Microsoft", "Wireless Notebook Adapter MN-520", "", "1.0.3" + bind "orinoco_cs" + +card "Linksys WPC11 Version 3" + manfid 0x0274,0x1613 + bind "orinoco_cs" + +card "Netgear MA401RA" + version "NETGEAR MA401RA Wireless PC", "Card", "ISL37300P", "Eval-RevA" + bind "orinoco_cs" + +card "BENQ AWL100" + version "BENQ", "AWL100 PCMCIA ADAPTER" + bind "orinoco_cs" + diff --git a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum.conf b/openembedded/packages/orinoco/files/spectrum.conf index 96aa794f0b..849455537e 100644 --- a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum.conf +++ b/openembedded/packages/orinoco/files/spectrum.conf @@ -5,6 +5,10 @@ card "LA4100 Spectrum24 CF WLAN Card" manfid 0x026c, 0x0001 bind "spectrum_cs" +card "LA4137 Spectrum24 CF WLAN CARD" + manfid 0x014d, 0x0001 + bind "spectrum_cs" + card "Socket Communications CF+ LP WLAN Card" manfid 0x0104, 0x0001 bind "spectrum_cs" diff --git a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum_fw.h b/openembedded/packages/orinoco/files/spectrum_fw.h index 94c825d372..94c825d372 100644 --- a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum_fw.h +++ b/openembedded/packages/orinoco/files/spectrum_fw.h diff --git a/openembedded/packages/orinoco/orinoco-conf_1.0.bb b/openembedded/packages/orinoco/orinoco-conf_1.0.bb new file mode 100644 index 0000000000..d44446895d --- /dev/null +++ b/openembedded/packages/orinoco/orinoco-conf_1.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "PCMCIA-cs configuration files for Hermes (Orinoco) wireless LAN cards" +SECTION = "kernel/modules" +PRIORITY = "optional" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "file://spectrum.conf \ + file://hermes.conf \ + file://orinoco_cs.conf" + +do_install() { + install -d ${D}${sysconfdir}/pcmcia + install -d ${D}${sysconfdir}/modutils + install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/ + install -m 0644 ${WORKDIR}/hermes.conf ${D}${sysconfdir}/pcmcia/ + install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/ +} diff --git a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum-firmware.patch b/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum-firmware.patch deleted file mode 100644 index c3d89d096b..0000000000 --- a/openembedded/packages/orinoco/orinoco-modules-0.15rc2/spectrum-firmware.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- orinoco-0.15rc1/spectrum_cs.c~spectrum-firmware 2004-04-19 07:08:24.000000000 +0200 -+++ orinoco-0.15rc1/spectrum_cs.c 2004-05-28 01:20:05.000000000 +0200 -@@ -57,7 +57,7 @@ - * hotplug firmware directory (typically /usr/lib/hotplug/firmware) and - * make sure that you have hotplug installed and enabled in the kernel. - */ --/* #define SPECTRUM_FW_INCLUDED 1 */ -+#define SPECTRUM_FW_INCLUDED 1 - - #ifdef SPECTRUM_FW_INCLUDED - /* Header with the firmware */ diff --git a/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb b/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb index 8093e7d246..e75924c19d 100644 --- a/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb +++ b/openembedded/packages/orinoco/orinoco-modules_0.15rc2.bb @@ -3,9 +3,11 @@ Also contains support for cards using downloadable firmware, i.e. the Symbol/Soc SECTION = "kernel/modules" PRIORITY = "optional" PROVIDES = "spectrum-modules" +DEPENDS = "orinoco-conf spectrum-fw" +RDEPENDS = "orinoco-conf" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r8" +PR = "r9" SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \ file://makefile_fix.patch;patch=1 \ @@ -13,37 +15,24 @@ SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz \ file://add_utsname.patch;patch=1 \ file://add_event.patch;patch=1 \ file://spectrum_cs_ids.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" + file://catch-up-with-kernel-changes.patch;patch=1" S = "${WORKDIR}/orinoco-${PV}" inherit module -do_compile_prepend() { - install ${WORKDIR}/spectrum_fw.h ${S}/ -} - do_install() { install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - install -d ${D}${sysconfdir}/pcmcia install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - install -m 0644 ${WORKDIR}/spectrum.conf ${D}${sysconfdir}/pcmcia/ - install -m 0644 hermes.conf ${D}${sysconfdir}/pcmcia/ - install -d ${D}${sysconfdir}/modutils - install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}${sysconfdir}/modutils/ } PACKAGES = "orinoco-modules-cs orinoco-modules-pci orinoco-modules-usb orinoco-modules-nortel orinoco-modules" -FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX} /${sysconfdir}" +FILES_orinoco-modules-cs = "/lib/modules/${KERNEL_VERSION}/net/*_cs${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/orinoco_p*${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-usb = "/lib/modules/${KERNEL_VERSION}/net/*_usb${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules-nortel = "/lib/modules/${KERNEL_VERSION}/net/orinoco_tmd${KERNEL_OBJECT_SUFFIX} \ /lib/modules/${KERNEL_VERSION}/net/orinoco_nortel${KERNEL_OBJECT_SUFFIX}" FILES_orinoco-modules = "/lib/modules/" -RDEPENDS_orinoco-modules-cs = "orinoco-modules" +RDEPENDS_orinoco-modules-cs = "orinoco-modules spectrum-fw" RDEPENDS_orinoco-modules-pci = "orinoco-modules" RDEPENDS_orinoco-modules-usb = "orinoco-modules" RDEPENDS_orinoco-modules-nortel = "orinoco-modules" diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/no-hostap-cards.patch b/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/no-hostap-cards.patch new file mode 100644 index 0000000000..1c1dd54356 --- /dev/null +++ b/openembedded/packages/pcmcia-cs/pcmcia-cs-3.2.8/no-hostap-cards.patch @@ -0,0 +1,124 @@ +--- pcmcia-cs/etc/config.orig 2004-07-16 18:38:25.000000000 +0200 ++++ pcmcia-cs/etc/config 2005-10-03 13:02:49.000000000 +0200 +@@ -1151,10 +1151,6 @@ + # + # Wireless network adapters + # +-card "Intersil PRISM2 11 Mbps Wireless Adapter" +- manfid 0x0156, 0x0002 +- bind "orinoco_cs" +- + card "350 Series Wireless LAN Adapter" + manfid 0x015f, 0x000a + bind "airo_cs" +@@ -1180,25 +1176,11 @@ + manfid 0x015f, 0x0007 + bind "airo_cs" + +-card "Airvast WN-100" +- #version "WLAN", "PRISM PCMCIA CARD" +- manfid 0x50c2, 0x7300 +- bind "orinoco_cs" +- +-card "AirWay 802.11 Adapter (PCMCIA)" +- #version "AirWay", "802.11 Adapter (PCMCIA)" +- manfid 0x0261, 0x0002 +- bind "orinoco_cs" +- + card "ARtem Onair Version 1.0" + #version "ARtem", "Onair", "Version 1.0" + manfid 0x0268, 0x0001 + bind "orinoco_cs" + +-card "ASUS SpaceLink WL-100" +- manfid 0x02aa, 0x0002 +- bind "orinoco_cs" +- + card "AT&T WaveLAN Adapter" + version "AT&T", "WaveLAN/PCMCIA" + bind "wavelan_cs" +@@ -1215,18 +1197,6 @@ + version "Cabletron", "RoamAbout 802.11 DS" + bind "orinoco_cs" + +-card "Compaq WL100 11 Mbps Wireless Adapter" +- manfid 0x0138, 0x0002 +- bind "orinoco_cs" +- +-card "Compaq HNW-100 11 Mbps Wireless Adapter" +- manfid 0x028a, 0x0002 +- bind "orinoco_cs" +- +-card "Conceptronic CON11Cpro" +- manfid 0xc250, 0x0002 +- bind "orinoco_cs" +- + card "Corega PCC-11" + version "corega K.K.", "Wireless LAN PCC-11" + bind "orinoco_cs" +@@ -1247,10 +1217,6 @@ + version "D", "Link DRC-650 11Mbps WLAN Card" + bind "orinoco_cs" + +-card "D-Link DCF660" +- manfid 0xd601, 0x0005 +- bind "orinoco_cs" +- + card "ELSA AirLancer MC-11" + version "ELSA", "AirLancer MC-11" + bind "orinoco_cs" +@@ -1275,14 +1241,6 @@ + version "Instant Wireless ", " Network PC CARD", "Version 01.02" + bind "orinoco_cs" + +-card "Linksys WPC11 11Mbps 802.11b WLAN Card" +- manfid 0x0274, 0x1613 +- bind "orinoco_cs" +- +-card "Linksys WCF12 Wireless CompactFlash Card" +- manfid 0x028a, 0x0673 +- bind "orinoco_cs" +- + card "Lucent Technologies WaveLAN/IEEE Adapter" + version "Lucent Technologies", "WaveLAN/IEEE" + bind "orinoco_cs" +@@ -1343,27 +1301,10 @@ + manfid 0x01a6, 0x0000 + bind "ray_cs" + +-card "Safeway 802.11b Wireless Adapter" +- manfid 0xd601, 0x0002 +- bind "orinoco_cs" +- + card "SAMSUNG 11Mbps WLAN Card" + version "SAMSUNG", "11Mbps WLAN Card" + bind "orinoco_cs" + +-card "Sandisk Connect SDWCFB-000" +- manfid 0xd601, 0x0005 +- bind "orinoco_cs" +- +-card "Sohoware NCP110" +- manfid 0x000b,0x7300 +- bind "orinoco_cs" +- +-card "SpeedStream SS1021 Wireless Adapter" +- #version "Siemens", "SpeedStream Wireless PCMCIA" +- manfid 0x02ac, 0x0002 +- bind "orinoco_cs" +- + card "Xircom CreditCard Netwave" + version "Xircom", "CreditCard Netwave" + bind "netwave_cs" +@@ -1372,11 +1313,6 @@ + manfid 0x0105, 0x0007 + bind "airo_cs" + +-card "ZCOMAX AirRunner/XI-300" +- #version "ZCOMAX", "AirRunner/XI-300" +- manfid 0xd601, 0x0002 +- bind "orinoco_cs" +- + # + # Modems and other serial devices + # diff --git a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb index dadf830534..fa685f8d5f 100644 --- a/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb +++ b/openembedded/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb @@ -3,7 +3,7 @@ SECTION = "base" PRIORITY = "required" LICENSE = "GPL" DEPENDS = "virtual/kernel" -PR = "r21" +PR = "r22" SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ file://busybox.patch;patch=1 \ @@ -11,6 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \ file://pcic-extra.patch;patch=1 \ file://automount.patch;patch=1 \ file://ratoc-cfu1u.patch;patch=1 \ + file://no-hostap-cards.patch;patch=1 \ file://pcmcia \ file://ide.opts \ file://wireless.opts \ diff --git a/openembedded/packages/perl/perl_5.8.7.bb b/openembedded/packages/perl/perl_5.8.7.bb index bb8e0c5174..e78a4829af 100644 --- a/openembedded/packages/perl/perl_5.8.7.bb +++ b/openembedded/packages/perl/perl_5.8.7.bb @@ -3,6 +3,7 @@ MAINTAINER="David Karlstrom <daka@thg.se>" include perl.inc SRC_URI += "file://config.sh-armeb-linux \ + file://config.sh-arm-linux \ file://config.sh-i386-linux" PR = "r14" @@ -17,6 +18,12 @@ do_configure() { cp ${WORKDIR}/config.sh-i686-linux . cp ${WORKDIR}/config.sh-i386-linux . cp ${WORKDIR}/config.sh-armeb-linux . + # nslu2 LE uclibc builds do not work with the default config.sh + if test "${MACHINE}" = nslu2 + then + rm -f ./config.sh-arm-linux + cp ${WORKDIR}/config.sh-arm-linux . + fi for i in config.sh-*-linux; do a="`echo $i|sed -e 's,^config.sh-,,; s,-linux$,,'`" newfile="`echo $i|sed -e 's,-linux$,-linux-uclibc,g'`" diff --git a/openembedded/packages/xserver/xserver-kdrive_20050207.bb b/openembedded/packages/xserver/xserver-kdrive_20050207.bb index e1e1381f93..f37cd578b9 100644 --- a/openembedded/packages/xserver/xserver-kdrive_20050207.bb +++ b/openembedded/packages/xserver/xserver-kdrive_20050207.bb @@ -38,11 +38,15 @@ SRC_URI = "cvs://anoncvs:anoncvs@pdx.freedesktop.org/cvs/xserver;module=xserver; file://fbdev-not-fix.patch;patch=1 " SRC_URI_append_mnci = " file://onlyfb.patch;patch=1 \ - file://devfs.patch;patch=1 \ - file://disable-apm.patch;patch=1" -SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1" + file://faster-rotated.patch;patch=1 \ + file://devfs.patch;patch=1 \ + file://disable-apm.patch;patch=1" +SRC_URI_append_collie = " file://faster-rotated.patch;patch=1" +SRC_URI_append_poodle = " file://xserver-kdrive-poodle.patch;patch=1 \ + file://faster-rotated.patch;patch=1" SRC_URI_append_c7x0 = " file://disable-apm.patch;patch=1" -SRC_URI_append_ipaq-pxa270= " file://disable-apm.patch;patch=1" +SRC_URI_append_ipaq-pxa270= " file://disable-apm.patch;patch=1" +SRC_URI_append_h3600 = " file://faster-rotated.patch;patch=1" SRC_URI_append_h3900 = " file://disable-apm.patch;patch=1" SRC_URI_append_h2200 = " file://disable-apm.patch;patch=1" SRC_URI_append_spitz = " file://disable-apm.patch;patch=1 \ @@ -52,9 +56,11 @@ SRC_URI_append_akita = " file://disable-apm.patch;patch=1 \ SRC_URI_append_borzoi = " file://disable-apm.patch;patch=1 \ file://faster-rotated.patch;patch=1" +PACKAGE_ARCH_collie = "collie" PACKAGE_ARCH_poodle = "poodle" PACKAGE_ARCH_c7x0 = "c7x0" PACKAGE_ARCH_ipaq-pxa270 = "ipaq-pxa270" +PACKAGE_ARCH_h3600 = "h3600" PACKAGE_ARCH_h3900 = "h3900" PACKAGE_ARCH_h2200 = "h2200" PACKAGE_ARCH_spitz = "spitz" |