Merge oe-devel@oe-devel.bkbits.net:packages

into null.(none):/data/mtx/oe/packages

2004/12/01 16:48:56+01:00 (none)!br1
prism54 driver: use firmware 1.0.3.0, it's reported to be more stable than newer versions

2004/12/01 16:47:41+01:00 (none)!br1
mtx-1 kernel: add coherent-pci patch

2004/12/01 09:56:01+01:00 (none)!br1
unik-olsrd_cvs: adapt to CVS build changes

BKrev: 41adea04AFD0kyRPibeWDnM1vRkvwA

diff --git a/linux/linux-mtx-1-2.4.27/15-au1000-pci-fixup-non-coherent-pre-ac.diff b/linux/linux-mtx-1-2.4.27/15-au1000-pci-fixup-non-coherent-pre-ac.diff
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/linux/linux-mtx-1_2.4.27.oe b/linux/linux-mtx-1_2.4.27.oe
index 855e97e..a6f6cd4 100644 (file)
--- a/linux/linux-mtx-1_2.4.27.oe
+++ b/linux/linux-mtx-1_2.4.27.oe
@@ -21,6 +21,7 @@ SRC_URI = "cvs://cvs@ftp.linux-mips.org/home/cvs;module=linux;tag=linux_2_4_27 \
        file://12-openswan-2.2.0-nat-t.diff;patch=1 \
        file://13-openswan-2.2.0.patch;patch=1 \
        file://14-au1000-eth-link-beat.diff;patch=1 \
+       file://15-au1000-pci-fixup-non-coherent-pre-ac.diff;patch=1 \
        file://defconfig-mtx-1"
 
 S = "${WORKDIR}/linux"

diff --git a/prism54/prism54-firmware_1.0.3.0.oe b/prism54/prism54-firmware_1.0.3.0.oe
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/prism54/prism54-module_1.2.oe b/prism54/prism54-module_1.2.oe
index a4d9393..f290ad2 100644 (file)
--- a/prism54/prism54-module_1.2.oe
+++ b/prism54/prism54-module_1.2.oe
@@ -3,7 +3,7 @@ SECTION = "base"
 PRIORITY = "optional"
 MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
 LICENSE = "GPL"
-RDEPENDS = "kernel (${KERNEL_VERSION}) kernel-module-firmware-class prism54-firmware hotplug"
+RDEPENDS = "kernel (${KERNEL_VERSION}) kernel-module-firmware-class prism54-firmware (1.0.3.0) hotplug"
 DEPENDS = "virtual/kernel"
 
 SRC_URI = "http://prism54.org/pub/linux/testing/tars/2004-06/prism54-1.2.tar.bz2"

diff --git a/unik-olsrd/unik-olsrd_cvs.oe b/unik-olsrd/unik-olsrd_cvs.oe
index 49cba1e..7f7480b 100644 (file)
--- a/unik-olsrd/unik-olsrd_cvs.oe
+++ b/unik-olsrd/unik-olsrd_cvs.oe
@@ -15,14 +15,13 @@ FILES_unik-olsrd-libs = "${libdir}"
 S = "${WORKDIR}/olsrd-current"
 
 do_compile() {
-       oe_runmake OS=linux all libs
+       oe_runmake OS=linux clean all libs
 }
 
 do_install () {
-       oe_runmake PREFIX=${D} install install_libs
+       oe_runmake INSTALL_PREFIX=${D} install install_libs
        install -d ${D}/etc/init.d
        install -m 0755 ${WORKDIR}/unik-olsrd ${D}/${sysconfdir}/init.d
 }
 
 CONFFILES_${PN} = "/etc/olsrd.conf"
-