[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-25-gc2302fe
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.4-25-gc2302fe
|
From: Julien B a. A. <ar...@us...> - 2011-03-31 11:55:01
|
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 c2302fe0bb2d714afa4a04fc7c63a8a6b3af0ef2 (commit)
via 115a2d1b91a0dd5a54072e6fc44c715138d4013f (commit)
from f7a38a31bd7365dec5ad240d62f208c48a67e926 (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 c2302fe0bb2d714afa4a04fc7c63a8a6b3af0ef2
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 31 13:53:33 2011 +0200
[BUILDROOT] Remove no more needed target/ubifs/ stuff
commit 115a2d1b91a0dd5a54072e6fc44c715138d4013f
Author: Julien Boibessot <jul...@ar...>
Date: Thu Mar 31 13:42:10 2011 +0200
[BUILDROOT] Makes bluez a patch against BR instead of a patch + versionned files mix
-----------------------------------------------------------------------
Summary of changes:
buildroot/configs/apf27_defconfig | 2 +-
buildroot/configs/apf27_webradio_defconfig | 2 +-
buildroot/configs/apf51_defconfig | 4 +-
buildroot/configs/apf9328_defconfig | 2 +-
buildroot/configs/pps_defconfig | 2 +-
buildroot/target/ubifs/.gitignore | 2 -
buildroot/target/ubifs/mkfs-ubifs-head.patch | 43 -----
buildroot/target/ubifs/ubinize.cfg | 7 -
.../buildroot/2010.11/110-bluez-add_package.patch | 100 ++++++++++-
patches/buildroot/2010.11/111-bluez-hacks.patch | 198 ++++++++++++++++++++
patches/buildroot/2010.11/cleanup_buildroot.sh | 2 +
11 files changed, 304 insertions(+), 60 deletions(-)
delete mode 100644 buildroot/target/ubifs/.gitignore
delete mode 100644 buildroot/target/ubifs/mkfs-ubifs-head.patch
delete mode 100644 buildroot/target/ubifs/ubinize.cfg
create mode 100644 patches/buildroot/2010.11/111-bluez-hacks.patch
diff --git a/buildroot/configs/apf27_defconfig b/buildroot/configs/apf27_defconfig
index 89f6796..f9c9708 100644
--- a/buildroot/configs/apf27_defconfig
+++ b/buildroot/configs/apf27_defconfig
@@ -652,7 +652,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_BLUEZ3_LIBS is not set
#
# bluez-utils not available (need dbus)
diff --git a/buildroot/configs/apf27_webradio_defconfig b/buildroot/configs/apf27_webradio_defconfig
index 438ead5..3b6248b 100644
--- a/buildroot/configs/apf27_webradio_defconfig
+++ b/buildroot/configs/apf27_webradio_defconfig
@@ -723,7 +723,7 @@ BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_BLUEZ3_LIBS is not set
#
# bluez-utils not available (need dbus)
diff --git a/buildroot/configs/apf51_defconfig b/buildroot/configs/apf51_defconfig
index 1faec4e..462c1fc 100644
--- a/buildroot/configs/apf51_defconfig
+++ b/buildroot/configs/apf51_defconfig
@@ -697,8 +697,8 @@ BR2_PACKAGE_LIBXML2=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-BR2_PACKAGE_BLUEZ_LIBS=y
-BR2_PACKAGE_BLUEZ_UTILS=y
+BR2_PACKAGE_BLUEZ3_LIBS=y
+BR2_PACKAGE_BLUEZ3_UTILS=y
# BR2_PACKAGE_BMON is not set
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_CTORRENT is not set
diff --git a/buildroot/configs/apf9328_defconfig b/buildroot/configs/apf9328_defconfig
index fdb1a0a..6b8179b 100644
--- a/buildroot/configs/apf9328_defconfig
+++ b/buildroot/configs/apf9328_defconfig
@@ -654,7 +654,7 @@ BR2_PACKAGE_NCURSES_TARGET_MENU=y
# BR2_PACKAGE_AVAHI is not set
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_BLUEZ3_LIBS is not set
#
# bluez-utils not available (need dbus)
diff --git a/buildroot/configs/pps_defconfig b/buildroot/configs/pps_defconfig
index 4eff67c..32eadd0 100644
--- a/buildroot/configs/pps_defconfig
+++ b/buildroot/configs/pps_defconfig
@@ -666,7 +666,7 @@ BR2_PACKAGE_NCURSES=y
# BR2_PACKAGE_AXEL is not set
BR2_PACKAGE_BOA=y
# BR2_PACKAGE_BIND is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
+# BR2_PACKAGE_BLUEZ3_LIBS is not set
#
# bluez-utils not available (need dbus)
diff --git a/buildroot/target/ubifs/.gitignore b/buildroot/target/ubifs/.gitignore
deleted file mode 100644
index 28329da..0000000
--- a/buildroot/target/ubifs/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/Config.in
-/ubifsroot.mk
diff --git a/buildroot/target/ubifs/mkfs-ubifs-head.patch b/buildroot/target/ubifs/mkfs-ubifs-head.patch
deleted file mode 100644
index 07f3bab..0000000
--- a/buildroot/target/ubifs/mkfs-ubifs-head.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-diff -purN mkfs-ubifs-HEAD/mkfs.ubifs.h mkfs-ubifs-HEAD.new/mkfs.ubifs.h
---- mkfs-ubifs-HEAD/mkfs.ubifs.h 2008-08-12 10:34:49.000000000 +0200
-+++ mkfs-ubifs-HEAD.new/mkfs.ubifs.h 2009-06-07 11:53:18.000000000 +0200
-@@ -35,6 +35,7 @@
- #include <byteswap.h>
- #include <linux/types.h>
- #include <linux/fs.h>
-+#include <linux/ext2_fs.h>
-
- #include <getopt.h>
- #include <sys/types.h>
-@@ -70,6 +71,31 @@
- #error MKFS_UBIFS_COMPR_ZLIB != UBIFS_COMPR_ZLIB
- #endif
-
-+#ifndef FS_COMPR_FL
-+#define FS_COMPR_FL EXT2_COMPR_FL
-+#endif
-+
-+#ifndef FS_SYNC_FL
-+#define FS_SYNC_FL EXT2_SYNC_FL
-+#endif
-+
-+#ifndef FS_IMMUTABLE_FL
-+#define FS_IMMUTABLE_FL EXT2_IMMUTABLE_FL
-+#endif
-+
-+#ifndef FS_APPEND_FL
-+#define FS_APPEND_FL EXT2_APPEND_FL
-+#endif
-+
-+#ifndef FS_DIRSYNC_FL
-+#define FS_DIRSYNC_FL EXT2_DIRSYNC_FL
-+#endif
-+
-+#ifndef FS_IOC_GETFLAGS
-+#define FS_IOC_GETFLAGS EXT2_IOC_GETFLAGS
-+#endif
-+
-+
- extern int verbose;
- extern int debug_level;
-
diff --git a/buildroot/target/ubifs/ubinize.cfg b/buildroot/target/ubifs/ubinize.cfg
deleted file mode 100644
index 6515271..0000000
--- a/buildroot/target/ubifs/ubinize.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-[ubifs]
-mode=ubi
-vol_id=0
-vol_type=dynamic
-vol_name=rootfs
-vol_alignment=1
-vol_flags=autoresize
diff --git a/patches/buildroot/2010.11/110-bluez-add_package.patch b/patches/buildroot/2010.11/110-bluez-add_package.patch
index 6902d29..91ee606 100644
--- a/patches/buildroot/2010.11/110-bluez-add_package.patch
+++ b/patches/buildroot/2010.11/110-bluez-add_package.patch
@@ -4,8 +4,8 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2011-01-27 15:24:54.000000000 +0100
-+++ buildroot/package/Config.in 2011-01-27 15:24:56.000000000 +0100
+--- buildroot.orig/package/Config.in 2011-03-31 10:13:14.000000000 +0200
++++ buildroot/package/Config.in 2011-03-31 10:15:40.000000000 +0200
@@ -380,6 +380,7 @@
source "package/boa/Config.in"
endif
@@ -14,3 +14,99 @@ Index: buildroot/package/Config.in
source "package/bmon/Config.in"
source "package/bridge-utils/Config.in"
source "package/ctorrent/Config.in"
+Index: buildroot/package/bluez3/Config.in
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/Config.in 2011-03-31 11:38:54.000000000 +0200
+@@ -0,0 +1,15 @@
++config BR2_PACKAGE_BLUEZ3_LIBS
++ bool "bluez (v3)"
++ select BR2_PACKAGE_PKGCONFIG
++ help
++ Install the bluez v3 library
++
++config BR2_PACKAGE_BLUEZ3_UTILS
++ bool "bluez-utils (v3)"
++ depends on BR2_PACKAGE_DBUS
++ select BR2_PACKAGE_BLUEZ3_LIBS
++ help
++ Install the bluez v3 utilities
++
++comment "bluez-utils not available (need dbus)"
++ depends on !BR2_PACKAGE_DBUS
+Index: buildroot/package/bluez3/bluez-libs.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluez-libs.mk 2011-03-31 11:40:46.000000000 +0200
+@@ -0,0 +1,13 @@
++#############################################################
++#
++# bluez-libs
++#
++#############################################################
++BLUEZ3_LIBS_VERSION:=3.36
++BLUEZ3_LIBS_SITE = http://bluez.sourceforge.net/download
++BLUEZ3_LIBS_SOURCE = bluez-libs-$(BLUEZ3_LIBS_VERSION).tar.gz
++BLUEZ3_LIBS_INSTALL_STAGING = YES
++BLUEZ3_LIBS_INSTALL_TARGET = YES
++
++$(eval $(call AUTOTARGETS,package,bluez3-libs))
++
+Index: buildroot/package/bluez3/bluez-utils.mk
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluez-utils.mk 2011-03-31 11:42:10.000000000 +0200
+@@ -0,0 +1,53 @@
++#############################################################
++#
++# bluez-utils - User space programs for controling Bluetooth
++#
++#############################################################
++BLUEZ3_UTILS_VERSION:=3.36
++BLUEZ3_UTILS_SITE=http://bluez.sourceforge.net/download
++BLUEZ3_UTILS_SOURCE=bluez-utils-$(BLUEZ3_UTILS_VERSION).tar.gz
++
++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
++
++BLUEZ3_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)
++
++BLUEZ3_UTILS_DEPENDENCIES = bluez3-libs dbus $(OBEX_DEP) $(ALSA_DEP)
++
++$(eval $(call AUTOTARGETS,package,bluez3-utils))
++
diff --git a/patches/buildroot/2010.11/111-bluez-hacks.patch b/patches/buildroot/2010.11/111-bluez-hacks.patch
new file mode 100644
index 0000000..f2fe6b1
--- /dev/null
+++ b/patches/buildroot/2010.11/111-bluez-hacks.patch
@@ -0,0 +1,198 @@
+Index: buildroot/package/bluez3/bluez-utils.mk
+===================================================================
+--- buildroot.orig/package/bluez3/bluez-utils.mk 2011-03-31 11:51:14.000000000 +0200
++++ buildroot/package/bluez3/bluez-utils.mk 2011-03-31 11:52:23.000000000 +0200
+@@ -51,3 +51,40 @@
+
+ $(eval $(call AUTOTARGETS,package,bluez3-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 $@
++
++#$(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/hciattach: $(BLUEZ_UTILS_BUILD_DIR)/tools/hciattach
++ 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
++
++
++#hcidump stuff:
++#BLUEZ_HCIDUMP_SOURCE=bluez-hcidump-1.39.tar.gz
++#BLUEZ_HCIDUMP_BUILD_DIR=$(BUILD_DIR)/bluez-hcidump-1.39
++
++$(BLUEZ_HCIDUMP_BUILD_DIR)/hcidump: $(BLUEZ_HCIDUMP_BUILD_DIR)/.configured
++ $(MAKE) -C $(BLUEZ_HCIDUMP_BUILD_DIR)
++
++$(TARGET_DIR)/usr/sbin/hcidump: $(BLUEZ_HCIDUMP_BUILD_DIR)/hcidump
++ $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(BLUEZ_HCIDUMP_BUILD_DIR) install
++
++#bluez-hcidump: bluez-libs $(TARGET_DIR)/usr/sbin/hcidump
++
+Index: buildroot/package/bluez3/bluetooth.default
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluetooth.default 2011-03-31 11:54:16.000000000 +0200
+@@ -0,0 +1,37 @@
++# 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"
+Index: buildroot/package/bluez3/bluez-pand-devup.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluez-pand-devup.sh 2011-03-31 11:55:21.000000000 +0200
+@@ -0,0 +1,2 @@
++#!/bin/sh
++/sbin/ifup $1
+Index: buildroot/package/bluez3/bluez-utils-bluepin.sh
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/bluez-utils-bluepin.sh 2011-03-31 11:55:48.000000000 +0200
+@@ -0,0 +1,2 @@
++#!/bin/sh
++echo "PIN:`/bin/cat /etc/bluetooth/pin`"
+Index: buildroot/package/bluez3/hcid.conf
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/hcid.conf 2011-03-31 11:56:57.000000000 +0200
+@@ -0,0 +1,57 @@
++#
++# 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;
++}
+Index: buildroot/package/bluez3/rfcomm-getty
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/rfcomm-getty 2011-03-31 11:56:37.000000000 +0200
+@@ -0,0 +1,9 @@
++#!/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
+Index: buildroot/package/bluez3/rfcomm.conf
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ buildroot/package/bluez3/rfcomm.conf 2011-03-31 11:57:27.000000000 +0200
+@@ -0,0 +1,16 @@
++#
++# 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";
++}
diff --git a/patches/buildroot/2010.11/cleanup_buildroot.sh b/patches/buildroot/2010.11/cleanup_buildroot.sh
index 9b8fc8c..077a0d0 100755
--- a/patches/buildroot/2010.11/cleanup_buildroot.sh
+++ b/patches/buildroot/2010.11/cleanup_buildroot.sh
@@ -49,3 +49,5 @@ rm -rf buildroot/fs/ubi/
rm -f buildroot/package/flex/flex-2.5.35-undefine_rpl_malloc_and_realloc.patch
rm -f buildroot/package/ncurses/ncurses-5.7-allows_build_with_old_ncurses_host_installation.patch
rm -rf buildroot/package/mysql_client/
+rm -rf buildroot/package/portmap/
+rm -rf buildroot/package/bluez3/
hooks/post-receive
--
armadeus
|
