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

into r2d2.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/01/26 12:01:20+01:00 uni-frankfurt.de!mickeyl
use HEAD for orinoco-modules-cvs

BKrev: 41f77892Qx8zbv3vYMwZFjsT9BvJjA

diff --git a/packages/orinoco/orinoco-modules-20050101/list-move.patch b/packages/orinoco/orinoco-modules-cvs/list-move.patch
similarity index 100%
rename from packages/orinoco/orinoco-modules-20050101/list-move.patch
rename to packages/orinoco/orinoco-modules-cvs/list-move.patch

diff --git a/packages/orinoco/orinoco-modules-20050101/spectrum-firmware.patch b/packages/orinoco/orinoco-modules-cvs/spectrum-firmware.patch
similarity index 100%
rename from packages/orinoco/orinoco-modules-20050101/spectrum-firmware.patch
rename to packages/orinoco/orinoco-modules-cvs/spectrum-firmware.patch

diff --git a/packages/orinoco/orinoco-modules-20050101/spectrum.conf b/packages/orinoco/orinoco-modules-cvs/spectrum.conf
similarity index 100%
rename from packages/orinoco/orinoco-modules-20050101/spectrum.conf
rename to packages/orinoco/orinoco-modules-cvs/spectrum.conf

diff --git a/packages/orinoco/orinoco-modules-20050101/spectrum_fw.h b/packages/orinoco/orinoco-modules-cvs/spectrum_fw.h
similarity index 100%
rename from packages/orinoco/orinoco-modules-20050101/spectrum_fw.h
rename to packages/orinoco/orinoco-modules-cvs/spectrum_fw.h

diff --git a/packages/orinoco/orinoco-modules_20050101.bb b/packages/orinoco/orinoco-modules_20050101.bb
deleted file mode 100644 (file)
index 26f6aef..0000000
--- a/packages/orinoco/orinoco-modules_20050101.bb
+++ /dev/null
@@ -1,51 +0,0 @@
-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"
-PROVIDES = "spectrum-modules"
-MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
-LICENSE = "GPL"
-CVSDATE = "${PV}"
-PR = "r1"
-
-# seems to cause problems on arm
-DEFAULT_PREFERENCE_arm = "-1"
-
-# doesnt help :(
-export EXTRACFLAGS = "-mstructure-size-boundary=32"
-
-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"
-S = "${WORKDIR}/orinoco"
-
-inherit module
-
-do_compile_prepend() {
-       install ${WORKDIR}/spectrum_fw.h ${S}/
-}
-
-do_install() {
-       install -d ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -d ${D}/etc/pcmcia
-       install -m 0644 *${KERNEL_OBJECT_SUFFIX} ${D}/lib/modules/${KERNEL_VERSION}/net/
-        install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
-        install -m 0644 hermes.conf ${D}/etc/pcmcia/
-       install -d ${D}/etc/modutils
-       install -m 0644 ${WORKDIR}/orinoco_cs.conf ${D}/etc/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-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-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
new file mode 100644 (file)
index 0000000..e69de29