[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-26-g68876b7
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2011-03-31 13:43:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via 68876b7ec35d04ba79f0c3137836ac4955549c64 (commit)
from c2302fe0bb2d714afa4a04fc7c63a8a6b3af0ef2 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 68876b7ec35d04ba79f0c3137836ac4955549c64
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 31 15:43:22 2011 +0200
[BUILDROOT] Remove no more needed buildroot/package/bluez3/ (moved as patch)
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/bluez3/Config.in | 16 ----
buildroot/package/bluez3/bluetooth.conf | 33 --------
buildroot/package/bluez3/bluetooth.default | 37 ---------
buildroot/package/bluez3/bluez-libs.mk | 13 ---
buildroot/package/bluez3/bluez-pand-devup.sh | 2 -
buildroot/package/bluez3/bluez-utils-bluepin.sh | 2 -
buildroot/package/bluez3/bluez-utils.mk | 99 -----------------------
buildroot/package/bluez3/hcid.conf | 57 -------------
buildroot/package/bluez3/rfcomm-getty | 9 --
buildroot/package/bluez3/rfcomm.conf | 16 ----
10 files changed, 0 insertions(+), 284 deletions(-)
delete mode 100644 buildroot/package/bluez3/Config.in
delete mode 100644 buildroot/package/bluez3/bluetooth.conf
delete mode 100644 buildroot/package/bluez3/bluetooth.default
delete mode 100644 buildroot/package/bluez3/bluez-libs.mk
delete mode 100644 buildroot/package/bluez3/bluez-pand-devup.sh
delete mode 100644 buildroot/package/bluez3/bluez-utils-bluepin.sh
delete mode 100644 buildroot/package/bluez3/bluez-utils.mk
delete mode 100644 buildroot/package/bluez3/hcid.conf
delete mode 100644 buildroot/package/bluez3/rfcomm-getty
delete mode 100644 buildroot/package/bluez3/rfcomm.conf
diff --git a/buildroot/package/bluez3/Config.in b/buildroot/package/bluez3/Config.in
deleted file mode 100644
index 72b3c8b..0000000
--- a/buildroot/package/bluez3/Config.in
+++ /dev/null
@@ -1,16 +0,0 @@
-config BR2_PACKAGE_BLUEZ_LIBS
- bool "bluez"
- select BR2_PACKAGE_PKGCONFIG
- help
- Install the bluez library
-
-config BR2_PACKAGE_BLUEZ_UTILS
- bool "bluez-utils"
- default n
- depends on BR2_PACKAGE_DBUS
- select BR2_PACKAGE_BLUEZ_LIBS
- help
- Install the bluez utilities
-
-comment "bluez-utils not available (need dbus)"
- depends on !BR2_PACKAGE_DBUS
diff --git a/buildroot/package/bluez3/bluetooth.conf b/buildroot/package/bluez3/bluetooth.conf
deleted file mode 100644
index aa642a2..0000000
--- a/buildroot/package/bluez3/bluetooth.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-<!-- This configuration file specifies the required security policies
- for Bluetooth core service to work. -->
-
-<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
- "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-
- <!-- ../system.conf have denied everything, so we just punch some holes -->
-
- <policy user="root">
- <allow own="org.bluez"/>
- </policy>
-
- <policy at_console="true">
- <allow send_destination="org.bluez.Manager"/>
- <allow receive_sender="org.bluez.Manager"/>
-
- <allow send_path="/org/bluez"/>
-
- <allow send_destination="org.bluez.Adapter"/>
- <allow receive_sender="org.bluez.Adapter"/>
-
- <allow send_destination="org.bluez.Service"/>
- <allow receive_sender="org.bluez.Service"/>
-
- <allow send_destination="org.bluez.Database"/>
- <allow receive_sender="org.bluez.Database"/>
-
- <allow send_destination="org.bluez.Security"/>
- <allow receive_sender="org.bluez.Security"/>
- </policy>
-
-</busconfig>
diff --git a/buildroot/package/bluez3/bluetooth.default b/buildroot/package/bluez3/bluetooth.default
deleted file mode 100644
index 4817d38..0000000
--- a/buildroot/package/bluez3/bluetooth.default
+++ /dev/null
@@ -1,37 +0,0 @@
-# Bluetooth configuraton file
-
-# Start of hcid (allowed values are "true" and "false")
-HCID_ENABLE=true
-
-# Config file for hcid
-HCID_CONFIG="/etc/bluetooth/hcid.conf"
-
-# Start sdpd (allowed values are "true" and "false")
-SDPD_ENABLE=true
-
-# Start hidd (allowed values are "true" and "false")
-HIDD_ENABLE=true
-
-# Arguments to hidd
-HIDD_OPTIONS=""
-
-# Run hid2hci (allowed values are "true" and "false")
-HID2HCI_ENABLE=true
-
-# Bind rfcomm devices (allowed values are "true" and "false")
-RFCOMM_ENABLE=true
-
-# Config file for rfcomm
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-# Start dund (allowed values are "true" and "false")
-DUND_ENABLE=false
-
-# Arguments to dund
-DUND_OPTIONS="--listen --persist"
-
-# Start pand (allowed values are "true" and "false")
-PAND_ENABLE=false
-
-# Arguments to pand
-PAND_OPTIONS="--listen --role NAP"
diff --git a/buildroot/package/bluez3/bluez-libs.mk b/buildroot/package/bluez3/bluez-libs.mk
deleted file mode 100644
index d903d75..0000000
--- a/buildroot/package/bluez3/bluez-libs.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#############################################################
-#
-# bluez-libs
-#
-#############################################################
-BLUEZ_LIBS_VERSION:=3.36
-BLUEZ_LIBS_SITE = http://bluez.sourceforge.net/download
-BLUEZ_LIBS_SOURCE = bluez-libs-$(BLUEZ_LIBS_VERSION).tar.gz
-BLUEZ_LIBS_INSTALL_STAGING = YES
-BLUEZ_LIBS_INSTALL_TARGET = YES
-
-$(eval $(call AUTOTARGETS,package,bluez-libs))
-
diff --git a/buildroot/package/bluez3/bluez-pand-devup.sh b/buildroot/package/bluez3/bluez-pand-devup.sh
deleted file mode 100644
index 6015470..0000000
--- a/buildroot/package/bluez3/bluez-pand-devup.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/sbin/ifup $1
diff --git a/buildroot/package/bluez3/bluez-utils-bluepin.sh b/buildroot/package/bluez3/bluez-utils-bluepin.sh
deleted file mode 100644
index dccb76e..0000000
--- a/buildroot/package/bluez3/bluez-utils-bluepin.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "PIN:`/bin/cat /etc/bluetooth/pin`"
diff --git a/buildroot/package/bluez3/bluez-utils.mk b/buildroot/package/bluez3/bluez-utils.mk
deleted file mode 100644
index a833043..0000000
--- a/buildroot/package/bluez3/bluez-utils.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#############################################################
-#
-# bluez-utils - User space programs for controling Bluetooth
-#
-#############################################################
-BLUEZ_UTILS_VERSION:=3.36
-BLUEZ_UTILS_SITE=http://bluez.sourceforge.net/download
-BLUEZ_UTILS_SOURCE=bluez-utils-$(BLUEZ_UTILS_VERSION).tar.gz
-
-#BLUEZ_HCIDUMP_SOURCE=bluez-hcidump-1.39.tar.gz
-#BLUEZ_HCIDUMP_BUILD_DIR=$(BUILD_DIR)/bluez-hcidump-1.39
-
-
-ifeq ($(strip $(BR2_PACKAGE_ALSA-LIB)),y)
-ALSA_DEP=alsa
-WITH_ALSA=--with-alsa=$(STAGING_DIR)
-else
-WITH_ALSA=--without-alsa
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_OPENOBEX)),y)
-OBEX_DEP=openobex
-WITH_OBEX=--with-openobex=$(STAGING_DIR)
-else
-OBEX_DEP=
-WITH_OBEX=--without-obex
-endif
-
-BLUEZ_UTILS_CONF_OPT = \
- $(WITH_OBEX) \
- $(WITH_ALSA) \
- --disable-pie \
- --disable-expat \
- --enable-network \
- --enable-serial \
- --enable-audio \
- --enable-input \
- --enable-sync \
- --enable-hcid \
- --enable-hidd \
- --enable-pand \
- --disable-test \
- --enable-configfiles \
- --disable-manpages \
- --enable-initscripts \
- --disable-pcmciarules \
- --disable-bccmd \
- --enable-avctrl \
- --enable-hid2hci \
- --disable-dfutool
-
-# --disable-pie: uClibc doesn't handle "position independent executables" (segfault at launching)
-# sdpd is obsolete
-
-#$(BLUEZ_UTILS_BUILD_DIR)/.configured: $(BLUEZ_UTILS_BUILD_DIR)/.unpacked $(TARGET_DIR)/usr/lib/libbluetooth.so $(OBEX_DEP)
-
-BLUEZ_UTILS_DEPENDENCIES = bluez-libs dbus $(OBEX_DEP) $(ALSA_DEP)
-
-$(eval $(call AUTOTARGETS,package,bluez-utils))
-
-# Hook to prevent link with Host asound and libusb
-# (seems not needed with recent BR)
-$(BLUEZ_UTILS_HOOK_POST_CONFIGURE):
- @$(call MESSAGE,"Post configuring")
- $(SED) 's,^sys_lib_search_path_spec=.*,sys_lib_search_path_spec="$(STAGING_DIR)/usr/lib $(STAGING_DIR)/lib",' $(@D)/libtool
- touch $@
-
-
-
-$(BLUEZ_HCIDUMP_BUILD_DIR)/hcidump: $(BLUEZ_HCIDUMP_BUILD_DIR)/.configured
- $(MAKE) -C $(BLUEZ_HCIDUMP_BUILD_DIR)
-
-$(STAGING_DIR)/usr/lib/libbluetooth.so $(STAGING_DIR)/usr/lib/libbluetooth.a: $(BLUEZ_LIBS_BUILD_DIR)/src/libbluetooth.la
- $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(BLUEZ_LIBS_BUILD_DIR) install
- $(SED) "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" $(STAGING_DIR)/usr/lib/libbluetooth.la
-
-$(TARGET_DIR)/usr/sbin/hcidump: $(BLUEZ_HCIDUMP_BUILD_DIR)/hcidump
- $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(BLUEZ_HCIDUMP_BUILD_DIR) install
- rm -rf $(TARGET_DIR)/usr/share/man
-
-$(TARGET_DIR)/usr/sbin/hciattach: $(BLUEZ_UTILS_BUILD_DIR)/tools/hciattach
- (list='hcid dund hidd audio input network pand rfcomm sdpd tools'; for p in $$list; do \
- $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(BLUEZ_UTILS_BUILD_DIR)/$$p install; \
- done)
- mkdir -p $(TARGET_DIR)/etc/bluetooth/pan $(TARGET_DIR)/etc/bluetooth/rfcomm
- install -D -m 0644 package/bluez/hcid.conf $(TARGET_DIR)/etc/bluetooth/hcid.conf
- install -D -m 0755 package/bluez/bluez-utils-bluepin.sh $(TARGET_DIR)/etc/bluetooth/bluepin
- install -D -m 0755 package/bluez/bluez-pand-devup.sh $(TARGET_DIR)/etc/bluetooth/pan/dev-up
- install -D -m 0755 package/bluez/rfcomm-getty $(TARGET_DIR)/etc/bluetooth/rfcomm/rfcomm-getty
- echo "1234" > $(TARGET_DIR)/etc/bluetooth/pin
- chmod 0600 $(TARGET_DIR)/etc/bluetooth/pin
- install -D -m 0644 package/bluez/rfcomm.conf $(TARGET_DIR)/etc/bluetooth/rfcomm.conf
- #install -D -m 0755 package/bluez/bluetooth.init $(TARGET_DIR)/etc/init.d/S30bluetooth TBDJB
- mkdir -p $(TARGET_DIR)/etc/default
- install -D -m 0644 package/bluez/bluetooth.default $(TARGET_DIR)/etc/default/bluetooth
- install -D -m 0644 package/bluez/bluetooth.conf $(TARGET_DIR)/etc/dbus-1/system.d/bluetooth.conf
-
-#bluez-hcidump: bluez-libs $(TARGET_DIR)/usr/sbin/hcidump
-
diff --git a/buildroot/package/bluez3/hcid.conf b/buildroot/package/bluez3/hcid.conf
deleted file mode 100644
index 87ee30d..0000000
--- a/buildroot/package/bluez3/hcid.conf
+++ /dev/null
@@ -1,57 +0,0 @@
-#
-# HCI daemon configuration file.
-#
-
-# HCId options
-options {
- # Automatically initialize new devices
- autoinit yes;
-
- # Security Manager mode
- # none - Security manager disabled
- # auto - Use local PIN for incoming connections
- # user - Always ask user for a PIN
- #
- security auto;
-
- # Pairing mode
- # none - Pairing disabled
- # multi - Allow pairing with already paired devices
- # once - Pair once and deny successive attempts
- pairing multi;
-
- # Default PIN code for incoming connections
- passkey "BlueZ";
-}
-
-# Default settings for HCI devices
-device {
- # Local device name
- # %d - device id
- # %h - host name
- name "%h (%d)";
-
- # Local device class
- class 0x820116;
-
- # Default packet type
- #pkt_type DH1,DM1,HV1;
-
- # Inquiry and Page scan
- iscan enable; pscan enable;
-
- # Default link mode
- # none - no specific policy
- # accept - always accept incoming connections
- # master - become master on incoming connections,
- # deny role switch on outgoing connections
- lm accept;
-
- # Default link policy
- # none - no specific policy
- # rswitch - allow role switch
- # hold - allow hold mode
- # sniff - allow sniff mode
- # park - allow park mode
- lp rswitch,hold,sniff,park;
-}
diff --git a/buildroot/package/bluez3/rfcomm-getty b/buildroot/package/bluez3/rfcomm-getty
deleted file mode 100644
index f1d7a45..0000000
--- a/buildroot/package/bluez3/rfcomm-getty
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-while true;
- do
- rfcomm show rfcomm0 > /dev/null 2> /dev/null
- if [ "$?" != "1" ] ; then
- /sbin/getty -w -L rfcomm0 115200 vt100;
- fi
- sleep 1;
-done
diff --git a/buildroot/package/bluez3/rfcomm.conf b/buildroot/package/bluez3/rfcomm.conf
deleted file mode 100644
index cdbbf5b..0000000
--- a/buildroot/package/bluez3/rfcomm.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# RFCOMM configuration file.
-#
-
-rfcomm0 {
- bind yes;
-
- # Bluetooth address of the device
- device 11:22:33:44:55:66;
-
- # RFCOMM channel for the connection
- channel 1;
-
- # Description of the connection
- comment "Bluetooth Serial Console";
-}
hooks/post-receive
--
armadeus
|