[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-384-g95f3428
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-384-g95f3428
|
From: Julien B a. A. <ar...@us...> - 2010-06-01 15:31:41
|
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 95f34287181f89e0db2890b5bb92a16422c7ca1a (commit)
via 5865a273bc016e799722476cc88fdaf0f6c12615 (commit)
via f44a861dcf7c4114f54d345e57cae2d92aee4718 (commit)
from a55ad4cda7562637e322c5b5ab7405d5aa0e7239 (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 95f34287181f89e0db2890b5bb92a16422c7ca1a
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 1 17:29:49 2010 +0200
[BUILDROOT] Upgrade bluez to 3.36 and do a little cleanup while we are at it.
commit 5865a273bc016e799722476cc88fdaf0f6c12615
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 1 17:22:31 2010 +0200
[TESTS] test_gpio.sh: use gpio_mode instead of setbit and test driver is correctly unloading
commit f44a861dcf7c4114f54d345e57cae2d92aee4718
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 1 17:20:49 2010 +0200
updates package/.gitignore
-----------------------------------------------------------------------
Summary of changes:
buildroot/package/.gitignore | 1 -
buildroot/package/bluez/Config.in | 14 ++-
buildroot/package/bluez/bluez-libs.mk | 13 +++
buildroot/package/bluez/bluez-utils.mk | 90 ++++++++++++++++
buildroot/package/bluez/bluez.mk | 177 --------------------------------
buildroot/package/bluez/hcid.conf | 2 +-
target/test/test_gpio.sh | 4 +-
7 files changed, 116 insertions(+), 185 deletions(-)
create mode 100644 buildroot/package/bluez/bluez-libs.mk
create mode 100644 buildroot/package/bluez/bluez-utils.mk
delete mode 100644 buildroot/package/bluez/bluez.mk
diff --git a/buildroot/package/.gitignore b/buildroot/package/.gitignore
index 14597d9..922667d 100644
--- a/buildroot/package/.gitignore
+++ b/buildroot/package/.gitignore
@@ -18,7 +18,6 @@
!/lcd4linux/
!/lmbench/
!/mesa/
-!/mplayer/
!/mtd/
!/openssh/
!/pymysql/
diff --git a/buildroot/package/bluez/Config.in b/buildroot/package/bluez/Config.in
index f976bef..72b3c8b 100644
--- a/buildroot/package/bluez/Config.in
+++ b/buildroot/package/bluez/Config.in
@@ -1,10 +1,16 @@
-config BR2_PACKAGE_BLUEZ
+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_PKGCONFIG
+ select BR2_PACKAGE_BLUEZ_LIBS
help
- Install the bluez package
+ Install the bluez utilities
-comment "bluez not available (need dbus)"
+comment "bluez-utils not available (need dbus)"
depends on !BR2_PACKAGE_DBUS
diff --git a/buildroot/package/bluez/bluez-libs.mk b/buildroot/package/bluez/bluez-libs.mk
new file mode 100644
index 0000000..d903d75
--- /dev/null
+++ b/buildroot/package/bluez/bluez-libs.mk
@@ -0,0 +1,13 @@
+#############################################################
+#
+# 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/bluez/bluez-utils.mk b/buildroot/package/bluez/bluez-utils.mk
new file mode 100644
index 0000000..02575d0
--- /dev/null
+++ b/buildroot/package/bluez/bluez-utils.mk
@@ -0,0 +1,90 @@
+#############################################################
+#
+# 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)
+WITH_ALSA=--with-alsa=$(STAGING_DIR)
+else
+WITH_ALSA=--without-alsa
+endif
+
+ifeq ($(strip $(BR2_PACKAGE_OPENOBEX)),y)
+OBEX_DEP=$(STAGING_DIR)/lib/libopenobex.so
+WITH_OBEX=--with-openobex=$(STAGING_DIR)
+else
+OBEX_DEP=
+WITH_OBEX=--without-obex
+endif
+
+BLUEZ_UTILS_CONF_OPT = \
+ $(WITH_OBEX) \
+ $(WITH_ALSA) \
+ --disable-expat \
+ --enable-network \
+ --enable-serial \
+ --disable-audio \
+ --disable-input \
+ --enable-sync \
+ --enable-hcid \
+ --enable-sdpd \
+ --enable-hidd \
+ --enable-pand \
+ --disable-test \
+ --enable-configfiles \
+ --disable-manpages \
+ --enable-initscripts \
+ --disable-pcmciarules \
+ --disable-bccmd \
+ --enable-avctrl \
+ --enable-hid2hci \
+ --disable-dfutool \
+
+# --disable-audio : otherwise link problem with Host libasound
+
+
+#$(BLUEZ_UTILS_BUILD_DIR)/.configured: $(BLUEZ_UTILS_BUILD_DIR)/.unpacked $(TARGET_DIR)/usr/lib/libbluetooth.so $(OBEX_DEP)
+
+BLUEZ_UTILS_DEPENDENCIES = bluez-libs dbus
+
+$(eval $(call AUTOTARGETS,package,bluez-utils))
+
+
+$(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/bluez/bluez.mk b/buildroot/package/bluez/bluez.mk
deleted file mode 100644
index 278d488..0000000
--- a/buildroot/package/bluez/bluez.mk
+++ /dev/null
@@ -1,177 +0,0 @@
-#############################################################
-#
-# bluez-utils - User Space Program For Controling Bluetooth
-#
-#############################################################
-#
-BLUEZ_SOURCE_URL=http://bluez.sourceforge.net/download
-BLUEZ_LIBS_SOURCE=bluez-libs-3.20.tar.gz
-BLUEZ_UTILS_SOURCE=bluez-utils-3.20.tar.gz
-BLUEZ_HCIDUMP_SOURCE=bluez-hcidump-1.39.tar.gz
-BLUEZ_LIBS_BUILD_DIR=$(BUILD_DIR)/bluez-libs-3.20
-BLUEZ_UTILS_BUILD_DIR=$(BUILD_DIR)/bluez-utils-3.20
-BLUEZ_HCIDUMP_BUILD_DIR=$(BUILD_DIR)/bluez-hcidump-1.39
-
-$(DL_DIR)/$(BLUEZ_LIBS_SOURCE):
- $(WGET) -P $(DL_DIR) $(BLUEZ_SOURCE_URL)/$(BLUEZ_LIBS_SOURCE)
-
-$(DL_DIR)/$(BLUEZ_UTILS_SOURCE):
- $(WGET) -P $(DL_DIR) $(BLUEZ_SOURCE_URL)/$(BLUEZ_UTILS_SOURCE)
-
-$(DL_DIR)/$(BLUEZ_HCIDUMP_SOURCE):
- $(WGET) -P $(DL_DIR) $(BLUEZ_SOURCE_URL)/$(BLUEZ_HCIDUMP_SOURCE)
-
-$(BLUEZ_LIBS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(BLUEZ_LIBS_SOURCE)
- zcat $(DL_DIR)/$(BLUEZ_LIBS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(BLUEZ_LIBS_BUILD_DIR) package/bluez bluez-libs*.patch
- touch $(BLUEZ_LIBS_BUILD_DIR)/.unpacked
-
-$(BLUEZ_UTILS_BUILD_DIR)/.unpacked: $(DL_DIR)/$(BLUEZ_UTILS_SOURCE)
- zcat $(DL_DIR)/$(BLUEZ_UTILS_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- toolchain/patch-kernel.sh $(BLUEZ_UTILS_BUILD_DIR) package/bluez bluez-utils*.patch
- touch $(BLUEZ_UTILS_BUILD_DIR)/.unpacked
-
-$(BLUEZ_HCIDUMP_BUILD_DIR)/.unpacked: $(DL_DIR)/$(BLUEZ_HCIDUMP_SOURCE)
- zcat $(DL_DIR)/$(BLUEZ_HCIDUMP_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
- touch $(BLUEZ_HCIDUMP_BUILD_DIR)/.unpacked
-
-$(BLUEZ_LIBS_BUILD_DIR)/.configured: $(BLUEZ_LIBS_BUILD_DIR)/.unpacked
- (cd $(BLUEZ_LIBS_BUILD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- );
- touch $(BLUEZ_LIBS_BUILD_DIR)/.configured
-
-ifeq ($(strip $(BR2_PACKAGE_ALSA-LIB)),y)
-WITH_ALSA=--with-alsa=$(STAGING_DIR)
-else
-WITH_ALSA=--without-alsa
-endif
-
-ifeq ($(strip $(BR2_PACKAGE_OPENOBEX)),y)
-OBEX_DEP=$(STAGING_DIR)/lib/libopenobex.so
-WITH_OBEX=--with-openobex=$(STAGING_DIR)
-else
-OBEX_DEP=
-WITH_OBEX=--without-obex
-endif
-
-$(BLUEZ_UTILS_BUILD_DIR)/.configured: $(BLUEZ_UTILS_BUILD_DIR)/.unpacked $(TARGET_DIR)/usr/lib/libbluetooth.so $(OBEX_DEP)
- (cd $(BLUEZ_UTILS_BUILD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
- ./configure \
- $(WITH_OBEX) \
- $(WITH_ALSA) \
- --disable-expat \
- --enable-network \
- --enable-serial \
- --disable-input \
- --enable-audio \
- --enable-sync \
- --enable-hcid \
- --enable-sdpd \
- --enable-hidd \
- --enable-pand \
- --disable-test \
- --enable-configfiles \
- --disable-manpages \
- --enable-initscripts \
- --disable-pcmciarules \
- --disable-bccmd \
- --enable-avctrl \
- --enable-hid2hci \
- --disable-dfutool \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- );
- touch $(BLUEZ_UTILS_BUILD_DIR)/.configured
-
-
-$(BLUEZ_HCIDUMP_BUILD_DIR)/.configured: $(BLUEZ_HCIDUMP_BUILD_DIR)/.unpacked $(TARGET_DIR)/usr/lib/libbluetooth.so
- (cd $(BLUEZ_HCIDUMP_BUILD_DIR); rm -rf config.cache; \
- $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS)" \
- PKG_CONFIG_PATH="$(STAGING_DIR)/lib/pkconfig:$(STAGING_DIR)/usr/lib/pkgconfig" PKG_CONFIG="$(STAGING_DIR)/usr/bin/pkg-config" PKG_CONFIG_SYSROOT=$(STAGING_DIR) \
- ./configure \
- --target=$(GNU_TARGET_NAME) \
- --host=$(GNU_TARGET_NAME) \
- --build=$(GNU_HOST_NAME) \
- --prefix=/usr \
- );
- touch $(BLUEZ_HCIDUMP_BUILD_DIR)/.configured
-
-$(BLUEZ_LIBS_BUILD_DIR)/src/libbluetooth.la: $(BLUEZ_LIBS_BUILD_DIR)/.configured
- $(MAKE) -C $(BLUEZ_LIBS_BUILD_DIR)
-
-$(BLUEZ_UTILS_BUILD_DIR)/tools/hciattach: $(BLUEZ_UTILS_BUILD_DIR)/.configured
- $(MAKE) -C $(BLUEZ_UTILS_BUILD_DIR)
-
-$(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/lib/libbluetooth.so: $(STAGING_DIR)/usr/lib/libbluetooth.so
- mkdir -p $(TARGET_DIR)/usr/lib
- install -D -m 0755 $(STAGING_DIR)/usr/lib/libbluetooth.so* $(TARGET_DIR)/usr/lib
- $(STRIPCMD) $(TARGET_DIR)/usr/lib/libbluetooth.so
-
-$(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 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
-
-.PHONY: bluez-libs-staging bluez-libs bluez-libs-source bluez-utils
-
-bluez-utils: bluez-libs dbus $(TARGET_DIR)/usr/sbin/hciattach
-
-bluez-utils-dirclean: bluez-libs-dirclean
- rm -rf $(BLUEZ_UTILS_BUILD_DIR)
-
-bluez-hcidump: bluez-libs $(TARGET_DIR)/usr/sbin/hcidump
-
-bluez-libs-staging: $(STAGING_DIR)/usr/lib/libbluetooth.a
-
-bluez-libs: $(TARGET_DIR)/usr/lib/libbluetooth.so
-
-bluez-libs-source: $(DL_DIR)/$(BLUEZ_SOURCE)
-
-bluez-libs-clean:
- -$(MAKE) -C $(BLUEZ_LIBS_BUILD_DIR) clean
-
-bluez-libs-dirclean:
- rm -rf $(BLUEZ_LIBS_BUILD_DIR)
-
-#############################################################
-#
-## Toplevel Makefile options
-#
-##############################################################
-ifeq ($(strip $(BR2_PACKAGE_BLUEZ)),y)
-TARGETS+=bluez-utils
-endif
diff --git a/buildroot/package/bluez/hcid.conf b/buildroot/package/bluez/hcid.conf
index 761e17b..87ee30d 100644
--- a/buildroot/package/bluez/hcid.conf
+++ b/buildroot/package/bluez/hcid.conf
@@ -29,7 +29,7 @@ device {
# Local device name
# %d - device id
# %h - host name
- name "Gumstix (%d)";
+ name "%h (%d)";
# Local device class
class 0x820116;
diff --git a/target/test/test_gpio.sh b/target/test/test_gpio.sh
index 02cef71..e1c7be1 100755
--- a/target/test/test_gpio.sh
+++ b/target/test/test_gpio.sh
@@ -42,8 +42,7 @@ blink_led_apf9328()
check_button_apf27()
{
- setbit /proc/driver/gpio/portFmode 13 1
- setbit /proc/driver/gpio/portFdir 13 0
+ gpio_mode PF13 0 # input
setbit /proc/driver/gpio/portFirq 13 1
echo "Press 2 times on S1 button"
/usr/bin/testsuite/testbutton /dev/gpio/PF13 3
@@ -78,6 +77,7 @@ test_led_gpio()
execute_for_target check_button_apf9328 check_button_apf27
+ rmmod gpio
echo_test_ok
exit 0
}
hooks/post-receive
--
armadeus
|
