Changeset 1133

Show
Ignore:
Timestamp:
11/13/06 21:21:29 (2 years ago)
Author:
wbx
Message:

sync with stable branch

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/freewrt/mk/modules-2.4.mk

    r1090 r1133  
    275275$(eval $(call KMOD_template,BLUETOOTH,bluetooth,\ 
    276276        $(MODULES_DIR)/kernel/net/bluetooth/*.o \ 
     277        $(MODULES_DIR)/kernel/net/bluetooth/bnep/bnep.o \ 
    277278        $(MODULES_DIR)/kernel/net/bluetooth/rfcomm/*.o \ 
    278279        $(MODULES_DIR)/kernel/drivers/bluetooth/*.o \ 
    279 ,CONFIG_BLUEZ)) 
     280,CONFIG_BLUEZ,,90,bluez l2cap hci_usb hci_uart sco rfcomm bnep)) 
    280281 
    281282$(eval $(call KMOD_template,SOFTDOG,softdog,\ 

  • trunk/freewrt/mk/pkg-depend.mk

    r1051 r1133  
    1212bitchx-compile: ncurses-compile 
    1313bitlbee-compile: libiconv-compile openssl-compile glib-compile 
     14bluez-utils-compile: bluez-libs-compile libusb-compile 
    1415cbtt-compile: mysql-compile zlib-compile 
    1516clinkc-compile: expat-compile 

  • trunk/freewrt/package/Config.in

    r1060 r1133  
    342342 
    343343menu "Bluetooth" 
     344source "package/bluez-firmware/Config.in" 
    344345source "package/bluez-libs/Config.in" 
    345346source "package/bluez-utils/Config.in" 

  • trunk/freewrt/package/Makefile

    r1075 r1133  
    1818package-$(FWRT_PACKAGE_BITCHX) += bitchx 
    1919package-$(FWRT_PACKAGE_BITLBEE) += bitlbee 
     20package-$(FWRT_PACKAGE_BLUEZ_FIRMWARE) += bluez-firmware 
    2021package-$(FWRT_PACKAGE_BLUEZ_LIBS) += bluez-libs 
    2122package-$(FWRT_PACKAGE_BLUEZ_UTILS) += bluez-utils 

  • trunk/freewrt/package/bluez-libs/Makefile

    r975 r1133  
    99PKG_NAME:=              bluez-libs 
    1010PKG_VERSION:=           2.24 
    11 PKG_RELEASE:=           1 
     11PKG_RELEASE:=           2 
    1212PKG_MD5SUM:=            d0ba50e251ae1e7f2c09024facde8e40 
    1313 
    1414PKG_SOURCE_URL:=        http://bluez.sourceforge.net/download 
    15 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1615 
    1716include $(TOPDIR)/mk/package.mk 
    …… 
    5352        $(MAKE) -C $(WRKBUILD) \ 
    5453                DESTDIR="$(WRKINST)" \ 
    55                 all install 
     54                install 
    5655        touch $@ 
    5756 
    5857$(IPKG_BLUEZ_LIBS): 
    5958        $(INSTALL_DIR) $(IDIR_BLUEZ_LIBS)/usr/lib 
    60         $(INSTALL_DATA) $(WRKINST)/usr/lib/libbluetooth.so.* $(IDIR_BLUEZ_LIBS)/usr/lib/ 
     59        $(CP) $(WRKINST)/usr/lib/libbluetooth.so.* $(IDIR_BLUEZ_LIBS)/usr/lib/ 
    6160        $(RSTRIP) $(IDIR_BLUEZ_LIBS) 
    6261        $(IPKG_BUILD) $(IDIR_BLUEZ_LIBS) $(PACKAGE_DIR) 

  • trunk/freewrt/package/bluez-utils/Config.in

    r360 r1133  
    55        select FWRT_PACKAGE_GLIB1 
    66        select FWRT_PACKAGE_BLUEZ_LIBS 
     7        select FWRT_PACKAGE_LIBUSB 
    78        help 
    89          Bluez utils.  
    910           
    10           http://bluez.org 
    11            
    12           Depends: libpthread, bluez-libs 
    13  
     11          http://www.bluez.org 

  • trunk/freewrt/package/bluez-utils/Makefile

    r975 r1133  
    99PKG_NAME:=              bluez-utils 
    1010PKG_VERSION:=           2.24 
    11 PKG_RELEASE:=           1 
     11PKG_RELEASE:=           2 
    1212PKG_MD5SUM:=            5f5488ff3d31bdb9cd36b7991fe68408 
    1313 
    1414PKG_SOURCE_URL:=        http://bluez.sourceforge.net/download 
    15 PKG_SOURCE:=            $(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1615 
    1716include $(TOPDIR)/mk/package.mk 
    …… 
    5857                        --disable-hid2hci \ 
    5958                        --disable-dfutool \ 
    60                         --disable-bcm203x \ 
     59                        --enable-bcm203x \ 
    6160                        --disable-bluepin \ 
    6261                        --with-bluez=$(STAGING_DIR)/usr/include \ 
    …… 
    8281            $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ 
    8382        install -m0700 ./files/givepin $(IDIR_BLUEZ_UTILS)/etc/bluetooth/ 
     83        install -d -m0755 $(IDIR_BLUEZ_UTILS)/etc/hotplug/usb  
     84        $(CP) $(WRKINST)/etc/hotplug/usb/bcm203x* \ 
     85                $(IDIR_BLUEZ_UTILS)/etc/hotplug/usb 
    8486        $(RSTRIP) $(IDIR_BLUEZ_UTILS) 
    8587        $(IPKG_BUILD) $(IDIR_BLUEZ_UTILS) $(PACKAGE_DIR) 

  • trunk/freewrt/package/bluez-utils/ipkg/bluez-utils.control

    r1 r1133  
    33Section: net 
    44Description: Bluez utils 
    5 Depends: kmod-bluetooth, bluez-libs 
     5Depends: kmod-bluetooth, bluez-libs, libusb 

  • trunk/freewrt/package/libpthread/Makefile

    r600 r1133  
    99PKG_NAME:=              libpthread 
    1010PKG_VERSION:=           0.9.28 
    11 PKG_RELEASE:=           1 
     11PKG_RELEASE:=           2 
    1212 
    1313DISTFILES:= 
    …… 
    2929$(IPKG_LIBPTHREAD): $(WRKBUILD)/.built 
    3030        $(INSTALL_DIR) $(IDIR_LIBPTHREAD)/lib 
    31         $(INSTALL_DATA) $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/ 
    32         $(INSTALL_DATA) $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/ 
     31        $(CP) $(STAGING_DIR)/lib/libpthread.so.* $(IDIR_LIBPTHREAD)/lib/ 
     32        $(CP) $(STAGING_DIR)/lib/libpthread-*.so $(IDIR_LIBPTHREAD)/lib/ 
    3333        $(RSTRIP) $(IDIR_LIBPTHREAD) 
    3434        $(IPKG_BUILD) $(IDIR_LIBPTHREAD) $(PACKAGE_DIR)