From fc792a7423bedf05d18333eff206195bbff9ae45 Mon Sep 17 00:00:00 2001 From: "nslu2-linux.adm@bkbits.net" Date: Fri, 27 May 2005 09:40:14 +0000 Subject: Merge bk://oe-devel.bkbits.net/openembedded into bkbits.net:/repos/n/nslu2-linux/openembedded 2005/05/27 11:33:11+02:00 void!koen Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into dominion.dominion.void:/data/build/oe/openembedded 2005/05/27 11:31:16+02:00 void!koen osso-thumbnail_0.3.1-1.bb: finally get it right so stuff actually links 2005/05/27 11:12:01+02:00 local!hrw Merge bk://oe-devel@oe-devel.bkbits.net/openembedded into marcinj.local:/home/hrw/zaurus/oe/openembedded 2005/05/27 11:08:58+02:00 void!koen use newer, but still old API dbus in preferred-gpe-versions 2005/05/27 11:08:14+02:00 local!hrw removed all hostap-* older then 0.3.7 2005/05/27 10:56:56+02:00 void!koen osso-thumbnail_0.3.1-1.bb: fix staging BKrev: 4296eafeT1K-pWK3ylRzDtHHQXZg6A --- packages/hostap/files/hostap_cs.modconf | 0 packages/hostap/hostap-daemon_0.2.4.bb | 17 ----- .../hostap/hostap-modules-0.2.6/Makefile.patch | 0 .../hostap/hostap-modules-0.2.6/mtx_compat.diff | 0 .../mtx_hostap_deferred_irq.diff | 81 ---------------------- .../hostap/hostap-modules-0.3.5/Makefile.patch | 0 .../hostap/hostap-modules-0.3.5/mtx_compat.diff | 0 .../mtx_hostap_deferred_irq.diff | 0 packages/hostap/hostap-modules_0.1.3.bb | 26 ------- packages/hostap/hostap-modules_0.2.6.bb | 41 ----------- packages/hostap/hostap-modules_0.3.5.bb | 42 ----------- packages/hostap/hostap-utils_0.2.6.bb | 23 ------ packages/hostap/hostap-utils_0.3.2.bb | 26 ------- packages/maemo/osso-thumbnail_0.3.1-1.bb | 8 +++ 14 files changed, 8 insertions(+), 256 deletions(-) delete mode 100644 packages/hostap/files/hostap_cs.modconf delete mode 100644 packages/hostap/hostap-daemon_0.2.4.bb delete mode 100644 packages/hostap/hostap-modules-0.2.6/Makefile.patch delete mode 100644 packages/hostap/hostap-modules-0.2.6/mtx_compat.diff delete mode 100644 packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff delete mode 100644 packages/hostap/hostap-modules-0.3.5/Makefile.patch delete mode 100644 packages/hostap/hostap-modules-0.3.5/mtx_compat.diff delete mode 100644 packages/hostap/hostap-modules-0.3.5/mtx_hostap_deferred_irq.diff delete mode 100644 packages/hostap/hostap-modules_0.1.3.bb delete mode 100644 packages/hostap/hostap-modules_0.2.6.bb delete mode 100644 packages/hostap/hostap-modules_0.3.5.bb delete mode 100644 packages/hostap/hostap-utils_0.2.6.bb delete mode 100644 packages/hostap/hostap-utils_0.3.2.bb (limited to 'packages') diff --git a/packages/hostap/files/hostap_cs.modconf b/packages/hostap/files/hostap_cs.modconf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hostap/hostap-daemon_0.2.4.bb b/packages/hostap/hostap-daemon_0.2.4.bb deleted file mode 100644 index 86566ce828..0000000000 --- a/packages/hostap/hostap-daemon_0.2.4.bb +++ /dev/null @@ -1,17 +0,0 @@ -DESCRIPTION = "User space daemon for extended IEEE 802.11 management" -HOMEPAGE = "http://hostap.epitest.fi" -SECTION = "kernel/userland" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -RDEPENDS = "hostap-modules (${PV}) hostap-utils (${PV})" - -SRC_URI = "http://hostap.epitest.fi/releases/hostapd-${PV}.tar.gz" -S = "${WORKDIR}/hostapd-${PV}" - -do_install() { - install -d ${D}${sysconfdir} ${D}${bindir} - install -m 0644 hostapd.conf ${D}${sysconfdir}/ - install -m 0755 hostapd ${D}${bindir} -} - diff --git a/packages/hostap/hostap-modules-0.2.6/Makefile.patch b/packages/hostap/hostap-modules-0.2.6/Makefile.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hostap/hostap-modules-0.2.6/mtx_compat.diff b/packages/hostap/hostap-modules-0.2.6/mtx_compat.diff deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff deleted file mode 100644 index e979b72d93..0000000000 --- a/packages/hostap/hostap-modules-0.2.6/mtx_hostap_deferred_irq.diff +++ /dev/null @@ -1,81 +0,0 @@ ---- driver/modules/hostap_pci.c.orig 2004-11-30 06:41:48.000000000 +0100 -+++ driver/modules/hostap_pci.c 2005-01-17 19:47:33.710400496 +0100 -@@ -50,6 +50,13 @@ - }; - - -+#define DEFERRED_IRQ_INITIALIZATION -+ -+#ifdef DEFERRED_IRQ_INITIALIZATION -+struct net_device *devb[MAX_PARM_DEVICES]; -+#endif -+ -+ - #ifdef PRISM2_IO_DEBUG - - static inline void hfa384x_outb_debug(struct net_device *dev, int a, u8 v) -@@ -280,6 +287,10 @@ - - pci_set_drvdata(pdev, dev); - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+ printk("%s: deferred initialization of IRQs\n", dev_info); -+ devb[cards_found-1] = dev; -+#else - if (request_irq(dev->irq, prism2_interrupt, SA_SHIRQ, dev->name, - dev)) { - printk(KERN_WARNING "%s: request_irq failed\n", dev->name); -@@ -295,7 +306,7 @@ - - printk(KERN_INFO "%s: Intersil Prism2.5 PCI: " - "mem=0x%lx, irq=%d\n", dev->name, phymem, dev->irq); -- -+#endif - return hostap_hw_ready(dev); - - fail: -@@ -399,18 +410,43 @@ - }; - - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+static void deferred_init(int num_devices) -+{ -+ int n; -+ for (n=0; nirq, prism2_interrupt, SA_SHIRQ, devb[n]->name, -+ devb[n])) { -+ printk(KERN_WARNING "%s: request_irq failed\n", devb[n]->name); -+ } -+ if (prism2_hw_config(devb[n], 1)) { -+ printk(KERN_DEBUG "%s: hardware initialization failed\n", devb[n]->name) -+; -+ } -+ printk(KERN_INFO "%s: Intersil Prism2.5 PCI: irq=%d\n", devb[n]->name, devb[n]-> -+irq); -+ } -+} -+#endif -+ - static int __init init_prism2_pci(void) - { - printk(KERN_INFO "%s: %s\n", dev_info, version); - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)) -- if (pci_register_driver(&prism2_pci_drv_id) <= 0) { -+ int n; -+ if ((n=pci_register_driver(&prism2_pci_drv_id)) <= 0) { - printk("hostap_pci: No devices found, driver not " - "installed.\n"); - pci_unregister_driver(&prism2_pci_drv_id); - return -ENODEV; - } - -+#ifdef DEFERRED_IRQ_INITIALIZATION -+ deferred_init(n); -+#endif -+ - return 0; - #else - return pci_register_driver(&prism2_pci_drv_id); diff --git a/packages/hostap/hostap-modules-0.3.5/Makefile.patch b/packages/hostap/hostap-modules-0.3.5/Makefile.patch deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hostap/hostap-modules-0.3.5/mtx_compat.diff b/packages/hostap/hostap-modules-0.3.5/mtx_compat.diff deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hostap/hostap-modules-0.3.5/mtx_hostap_deferred_irq.diff b/packages/hostap/hostap-modules-0.3.5/mtx_hostap_deferred_irq.diff deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/hostap/hostap-modules_0.1.3.bb b/packages/hostap/hostap-modules_0.1.3.bb deleted file mode 100644 index a471da8d39..0000000000 --- a/packages/hostap/hostap-modules_0.1.3.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" -SECTION = "kernel/modules" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://hostap_cs.conf" -S = "${WORKDIR}/hostap-driver-${PV}" - -inherit module - -MAKE_TARGETS = "hostap pccard" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia - install -m 0755 driver/modules/hostap_crypt_wep${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - install -m 0755 driver/modules/hostap${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - install -m 0755 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf - -} diff --git a/packages/hostap/hostap-modules_0.2.6.bb b/packages/hostap/hostap-modules_0.2.6.bb deleted file mode 100644 index a72a2d1636..0000000000 --- a/packages/hostap/hostap-modules_0.2.6.bb +++ /dev/null @@ -1,41 +0,0 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" -HOMEPAGE = "http://hostap.epitest.fi" -SECTION = "kernel/modules" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -PR = "r8" - -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://hostap_cs.conf \ - file://Makefile.patch;patch=1" -SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ - file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" - -S = "${WORKDIR}/hostap-driver-${PV}" - -inherit module - -EXTRA_OEMAKE = "EXTRA_CFLAGS='-DPRISM2_NON_VOLATILE_DOWNLOAD'" -MAKE_TARGETS = "KERNEL_PATH=${STAGING_KERNEL_DIR} MAKE='make -e'" -NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia - for i in ${NET_MODULES} - do - install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - done - install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf -} - -PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" -FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" -FILES_hostap-modules-pci = "/etc/modutils /lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" -FILES_hostap-modules = "/lib/modules/" -RDEPENDS_hostap-modules-cs = "hostap-modules" -RDEPENDS_hostap-modules-pci = "hostap-modules" diff --git a/packages/hostap/hostap-modules_0.3.5.bb b/packages/hostap/hostap-modules_0.3.5.bb deleted file mode 100644 index 0aa8e846ea..0000000000 --- a/packages/hostap/hostap-modules_0.3.5.bb +++ /dev/null @@ -1,42 +0,0 @@ -DESCRIPTION = "A driver for wireless LAN cards based on Intersil's Prism2/2.5/3 chipset" -SECTION = "kernel/modules" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "http://hostap.epitest.fi/releases/hostap-driver-${PV}.tar.gz \ - file://hostap_cs.conf \ - file://Makefile.patch;patch=1" -SRC_URI_append_mtx-1 = " file://mtx_compat.diff;patch=1;pnum=0 \ - file://mtx_hostap_deferred_irq.diff;patch=1;pnum=0" - -S = "${WORKDIR}/hostap-driver-${PV}" - -inherit module - -# Hack Alert :D -ARCH_mipsel = "mips" -MAKE_TARGETS = "KERNEL_PATH=${KERNEL_SOURCE} MAKE='make -e'" - -NET_MODULES = "hostap hostap_pci hostap_crypt_ccmp hostap_crypt_tkip hostap_crypt_wep" - -do_install() { - install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/net \ - ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia \ - ${D}${sysconfdir}/pcmcia - for i in ${NET_MODULES} - do - install -m 0644 driver/modules/$i${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/net/ - done - install -m 0644 driver/modules/hostap_cs${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/pcmcia/ - install -m 0644 driver/etc/hostap_cs.conf ${D}${sysconfdir}/pcmcia/hostap_cs.conf - cat ${WORKDIR}/hostap_cs.conf >>${D}${sysconfdir}/pcmcia/hostap_cs.conf -} - -PACKAGES = "hostap-modules-cs hostap-modules-pci hostap-modules" -FILES_hostap-modules-cs = "/lib/modules/${KERNEL_VERSION}/pcmcia/ /${sysconfdir}/pcmcia/" -FILES_hostap-modules-pci = "/lib/modules/${KERNEL_VERSION}/net/hostap_pci${KERNEL_OBJECT_SUFFIX}" -FILES_hostap-modules = "/lib/modules/" -RDEPENDS_hostap-modules-cs = "hostap-modules" -RDEPENDS_hostap-modules-pci = "hostap-modules" diff --git a/packages/hostap/hostap-utils_0.2.6.bb b/packages/hostap/hostap-utils_0.2.6.bb deleted file mode 100644 index deafe7c026..0000000000 --- a/packages/hostap/hostap-utils_0.2.6.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "User mode helpers for the hostap driver" -HOMEPAGE = "http://hostap.epitest.fi" -SECTION = "kernel/userland" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -RDEPENDS = "hostap-modules (${PV})" - -SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ - file://hostap-fw-load.patch;patch=1" -S = "${WORKDIR}/hostap-utils-${PV}" - -BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \ - hostap_rid prism2_param prism2_srec split_combined_hex" - -do_install() { - install -d ${D}${sbindir}/ - for f in ${BINARIES} - do - install -m 0755 $f ${D}${sbindir}/ - done -} - diff --git a/packages/hostap/hostap-utils_0.3.2.bb b/packages/hostap/hostap-utils_0.3.2.bb deleted file mode 100644 index 49036a7421..0000000000 --- a/packages/hostap/hostap-utils_0.3.2.bb +++ /dev/null @@ -1,26 +0,0 @@ -DESCRIPTION = "User mode helpers for the hostap driver" -HOMEPAGE = "http://hostap.epitest.fi" -SECTION = "kernel/userland" -PRIORITY = "optional" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -RDEPENDS = "hostap-modules (${PV})" -PR = "r1" - -DEFAULT_PREFERENCE = "-1" - -SRC_URI = "http://hostap.epitest.fi/releases/hostap-utils-${PV}.tar.gz \ - file://hostap-fw-load.patch;patch=1" -S = "${WORKDIR}/hostap-utils-${PV}" - -BINARIES = "hostap_crypt_conf hostap_diag hostap_fw_load hostap_io_debug \ - hostap_rid prism2_param prism2_srec split_combined_hex" - -do_install() { - install -d ${D}${sbindir}/ - for f in ${BINARIES} - do - install -m 0755 $f ${D}${sbindir}/ - done -} - diff --git a/packages/maemo/osso-thumbnail_0.3.1-1.bb b/packages/maemo/osso-thumbnail_0.3.1-1.bb index 6badc00bc6..f91982baa4 100644 --- a/packages/maemo/osso-thumbnail_0.3.1-1.bb +++ b/packages/maemo/osso-thumbnail_0.3.1-1.bb @@ -8,9 +8,17 @@ S = "${WORKDIR}/osso-thumbnail-0.3.1" inherit pkgconfig autotools EXTRA_OECONF = "--disable-gtk-doc" + +do_install_prepend() { + install -d ${D}/${libdir} + install thumbs/.libs/libossothumbnail.so.0.0.3 ${D}${libdir}/libossothumbnail.so +} + do_stage() { install -d ${STAGING_INCDIR} + install -d ${STAGING_LIBDIR} install -m 644 thumbs/*.h ${STAGING_INCDIR} + install thumbs/.libs/libossothumbnail.so.0.0.3 ${STAGING_LIBDIR}/libossothumbnail.so } -- cgit v1.2.3