diff options
6 files changed, 18 insertions, 99 deletions
diff --git a/packages/orinoco/orinoco-modules-0.15rc1/spectrum-firmware.patch b/packages/orinoco/orinoco-modules-0.15rc1/spectrum-firmware.patch deleted file mode 100644 index c3d89d096b..0000000000 --- a/packages/orinoco/orinoco-modules-0.15rc1/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/packages/orinoco/orinoco-modules-0.15rc2/spectrum-firmware.patch b/packages/orinoco/orinoco-modules-0.15rc2/spectrum-firmware.patch deleted file mode 100644 index c3d89d096b..0000000000 --- a/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/packages/orinoco/orinoco-modules-cvs/spectrum-firmware.patch b/packages/orinoco/orinoco-modules-cvs/spectrum-firmware.patch deleted file mode 100644 index 6be4eb2fd2..0000000000 --- a/packages/orinoco/orinoco-modules-cvs/spectrum-firmware.patch +++ /dev/null @@ -1,16 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- orinoco/spectrum_cs.c~spectrum-firmware.patch -+++ orinoco/spectrum_cs.c -@@ -55,7 +55,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/packages/orinoco/orinoco-modules_0.15rc1.bb b/packages/orinoco/orinoco-modules_0.15rc1.bb index fd7eeca463..4470fc065d 100644 --- a/packages/orinoco/orinoco-modules_0.15rc1.bb +++ b/packages/orinoco/orinoco-modules_0.15rc1.bb @@ -2,46 +2,35 @@ DESCRIPTION = "A driver for wireless LAN cards based on Hermes(Orinoco) cards. \ Also contains support for cards using downloadable firmware, i.e. the Symbol/Socket family." SECTION = "kernel/modules" PRIORITY = "optional" +DEPENDS = "orinoco-conf spectrum-fw" +RDEPENDS = "orinoco-conf" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" LICENSE = "GPL" -PR = "r6" +PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \ file://makefile_fix.patch;patch=1 \ file://list-move.patch;patch=1 \ file://add_event.patch;patch=1 \ file://add_utsname.patch;patch=1 \ - file://spectrum_cs_ids.patch;patch=1 \ - file://spectrum-firmware.patch;patch=1 \ - file://spectrum.conf \ - file://spectrum_fw.h \ - file://orinoco_cs.conf" + file://spectrum_cs_ids.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/packages/orinoco/orinoco-modules_0.15rc2.bb b/packages/orinoco/orinoco-modules_0.15rc2.bb index 8093e7d246..e75924c19d 100644 --- a/packages/orinoco/orinoco-modules_0.15rc2.bb +++ b/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/packages/orinoco/orinoco-modules_cvs.bb b/packages/orinoco/orinoco-modules_cvs.bb index 09cb4f67fd..9bdd1bf68a 100644 --- a/packages/orinoco/orinoco-modules_cvs.bb +++ b/packages/orinoco/orinoco-modules_cvs.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 = "r1" +PR = "r2" PARALLEL_MAKE = "" EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"' @@ -14,37 +16,24 @@ EXTRA_OEMAKE = 'KERNEL_SRC="${KERNEL_STAGING_DIR}"' DEFAULT_PREFERENCE_arm = "-1" SRC_URI = "cvs://anoncvs:@savannah.gnu.org/cvsroot/orinoco;module=orinoco;method=ext;rsh=ssh \ - file://list-move.patch;patch=1 \ - file://spectrum-firmware.patch;patch=1 \ - file://spectrum.conf \ - file://spectrum_fw.h \ - file://orinoco_cs.conf" + file://list-move.patch;patch=1" S = "${WORKDIR}/orinoco" 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" |