[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-488-g02fa13c
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-488-g02fa13c
|
From: Julien B a. A. <ar...@us...> - 2010-06-22 12:05:43
|
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 02fa13ce19a0268442959e005227f3673dc90b25 (commit)
from 9149a3d57af0fbfcbe3675bdd45e5123dba48736 (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 02fa13ce19a0268442959e005227f3673dc90b25
Author: Julien Boibessot <jul...@ar...>
Date: Tue Jun 22 14:05:11 2010 +0200
[BUILDROOT] Continue the (not armadeus specific) packages moving to BR patches. Only bluez3 remains.
-----------------------------------------------------------------------
Summary of changes:
Makefile | 2 -
buildroot/package/bluez3/bluetooth.init | 102 --------------------
.../bluez3/bluez-utils-bluez-include-patch.patch | 11 --
.../target/device/armadeus/apf27/apf27_defconfig | 44 ++++-----
.../device/armadeus/apf9328/apf9328_defconfig | 44 ++++-----
patches/buildroot/001-add_armadeus_device.patch | 25 ++++-
patches/buildroot/110-bluez-add_package.patch | 16 +++
patches/buildroot/113-gpsd-add_package.patch | 12 +-
patches/buildroot/116-openobex-add_package.patch | 14 ++--
patches/buildroot/117-ussp-push-add_package.patch | 10 +-
patches/buildroot/119-fbtest-add_package.patch | 16 ++--
patches/buildroot/120-cwiid-add_package.patch | 16 ++--
.../buildroot/2010.05/110-bluez-add_package.patch | 16 +++
.../buildroot/2010.05/120-cwiid-add_package.patch | 2 +-
14 files changed, 126 insertions(+), 204 deletions(-)
delete mode 100644 buildroot/package/bluez3/bluetooth.init
delete mode 100644 buildroot/package/bluez3/bluez-utils-bluez-include-patch.patch
create mode 100644 patches/buildroot/110-bluez-add_package.patch
create mode 100644 patches/buildroot/2010.05/110-bluez-add_package.patch
diff --git a/Makefile b/Makefile
index 138b4d1..77cfd19 100644
--- a/Makefile
+++ b/Makefile
@@ -113,8 +113,6 @@ buildroot-unpacked: $(BUILDROOT_DIR)/.unpacked
$(BUILDROOT_DIR)/.patched: $(BUILDROOT_DIR)/.unpacked
$(BUILDROOT_DIR)/toolchain/patch-kernel.sh $(BUILDROOT_DIR) $(BUILDROOT_PATCH_DIR) \*.patch
-# Since patches may add/delete packages, we process extra packages after patching
- perl $(BUILDROOT_PATCH_DIR)/add_packages_config_entry.pl buildroot=$(BUILDROOT_DIR)
touch $@
buildroot-patched: $(BUILDROOT_DIR)/.patched
diff --git a/buildroot/package/bluez3/bluetooth.init b/buildroot/package/bluez3/bluetooth.init
deleted file mode 100644
index 171f8e0..0000000
--- a/buildroot/package/bluez3/bluetooth.init
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/sh
-#
-# Start/stop the Bluetooth daemons
-#
-
-set -e
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=bluetooth
-DESC="Bluetooth subsystem"
-
-HCIATTACH_NAME=hciattach
-DAEMON_NAME=hcid
-HID2HCI_NAME=hid2hci
-RFCOMM_NAME=rfcomm
-RFCOMM_GETTY_NAME=rfcomm-getty
-
-HCIATTACH_EXEC="`which $HCIATTACH_NAME || true`"
-DAEMON_EXEC="`which $DAEMON_NAME || true`"
-HID2HCI_EXEC="`which $HID2HCI_NAME || true`"
-RFCOMM_EXEC="`which $RFCOMM_NAME || true`"
-
-DAEMON_ENABLE=true
-HID2HCI_ENABLE=false
-RFCOMM_ENABLE=true
-
-DAEMON_CONFIG="/etc/bluetooth/hcid.conf"
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
-
-RFCOMM_GETTY=/etc/bluetooth/rfcomm/rfcomm-getty
-
-HCIATTACH_ENABLE=true
-HCIATTACH_TTY=ttyS1
-HCIATTACH_TYPE=gumstix
-HCIATTACH_START_SPEED=57600
-HCIATTACH_SPEED=921600
-HCIATTACH_HANDSHAKE=flow
-
-[ -e /etc/default/bluetooth ] && . /etc/default/bluetooth
-
-case "$1" in
- start)
-
- echo -n "Starting 32kHz clock..."
- /usr/sbin/pxaregs OSCC_OON 1
- while /usr/sbin/pxaregs OSCC_OOK | tail -n 1 | grep -q -v 1;do
- echo -n '.'
- sleep 1
- done
- echo "Settled"
-
- /sbin/modprobe gumstix_bluetooth
- /sbin/modprobe proc_gpio
-
- echo "AF1 in" >/proc/gpio/GPIO42
- echo "AF2 out" >/proc/gpio/GPIO43
- echo "AF1 in" >/proc/gpio/GPIO44
- echo "AF2 out" >/proc/gpio/GPIO45
-
- echo -n "Starting $DESC:"
- if $HCIATTACH_ENABLE && [ -x "$HCIATTACH_EXEC" ] ; then
- $HCIATTACH_EXEC -s $HCIATTACH_START_SPEED $HCIATTACH_TTY $HCIATTACH_TYPE $HCIATTACH_SPEED $HCIATTACH_HANDSHAKE
- echo -n " $HCIATTACH_TTY"
- fi
- if $DAEMON_ENABLE && [ -x "$DAEMON_EXEC" ] && [ -f "$DAEMON_CONFIG" ] ; then
- $DAEMON_EXEC -s -f $DAEMON_CONFIG
- echo -n " $DAEMON_NAME"
- fi
- if $HID2HCI_ENABLE && [ -x "$HID2HCI_EXEC" ] ; then
- $HID2HCI_EXEC --tohci > /dev/null 2>&1 || true
- echo -n " $HID2HCI_NAME"
- fi
- if $RFCOMM_ENABLE && [ -x "$RFCOMM_EXEC" -a -f "$RFCOMM_CONFIG" ] ; then
- sleep 1
- /usr/bin/sdptool add --channel=1 SP > /dev/null
- rfcomm -r watch 0 1 /sbin/getty -w -L rfcomm0 115200 vt100 &
-# $RFCOMM_EXEC -r -f $RFCOMM_CONFIG watch all > /dev/null 2>&1 &
-# $RFCOMM_GETTY > /dev/null 2>&1 &
- echo -n " $RFCOMM_NAME"
- fi
- echo "."
- ;;
- stop)
- echo -n "Stopping $DESC:"
- killall $RFCOMM_NAME > /dev/null 2>&1 || true
- echo -n " $RFCOMM_NAME"
- killall $HID2HCI_NAME > /dev/null 2>&1 || true
- echo -n " $HID2HCI_NAME"
- killall $DAEMON_NAME > /dev/null 2>&1 || true
- echo -n " $DAEMON_NAME"
- killall $HCIATTACH_NAME > /dev/null 2>&1 || true
- echo -n " $HCIATTACH_NAME"
- echo "."
- ;;
- *)
- N=/etc/init.d/$NAME
- echo "Usage: $N {start|stop}" >&2
- exit 1
- ;;
-esac
-
-exit 0
diff --git a/buildroot/package/bluez3/bluez-utils-bluez-include-patch.patch b/buildroot/package/bluez3/bluez-utils-bluez-include-patch.patch
deleted file mode 100644
index f3465e8..0000000
--- a/buildroot/package/bluez3/bluez-utils-bluez-include-patch.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- bluez-utils-3.13/common/Makefile.in.orig 2007-08-01 14:00:11.000000000 -0700
-+++ bluez-utils-3.13/common/Makefile.in 2007-08-01 14:00:30.000000000 -0700
-@@ -226,7 +226,7 @@
- hal.h $(hal_sources) notify.h $(notify_sources)
-
- test_textfile_LDADD = libhelper.a
--AM_CFLAGS = @DBUS_CFLAGS@ @GLIB_CFLAGS@
-+AM_CFLAGS = @BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@
- EXTRA_DIST = ppoll.h uinput.h hal-dummy.c hal-libhal.c \
- notify-dummy.c notify-inotify.c \
- sdp-dummy.c sdp-expat.c sdp-glib.c
diff --git a/buildroot/target/device/armadeus/apf27/apf27_defconfig b/buildroot/target/device/armadeus/apf27/apf27_defconfig
index fd2c916..c4e8e08 100644
--- a/buildroot/target/device/armadeus/apf27/apf27_defconfig
+++ b/buildroot/target/device/armadeus/apf27/apf27_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Jun 21 10:10:19 2010
+# Tue Jun 22 13:58:00 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -328,30 +328,6 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_PCRE is not set
#
-# Armadeus specific packages
-#
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-
-#
-# Armadeus specific tools/utilities
-#
-BR2_PACKAGE_AD9889CTRL=y
-# BR2_PACKAGE_AS_DEVICES is not set
-# BR2_PACKAGE_CH7024CTRL is not set
-# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_IMXREGS=y
-# BR2_PACKAGE_IMXSSI is not set
-BR2_PACKAGE_MAX5821CTRL=y
-# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
-# BR2_PACKAGE_DUMMY is not set
-
-#
# Other stuff
#
# BR2_PACKAGE_AT is not set
@@ -389,6 +365,19 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
BR2_PACKAGE_STRACE=y
# BR2_PACKAGE_SUDO is not set
+
+#
+# Armadeus specific tools/utilities
+#
+BR2_PACKAGE_AD9889CTRL=y
+# BR2_PACKAGE_AS_DEVICES is not set
+# BR2_PACKAGE_CH7024CTRL is not set
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+BR2_PACKAGE_FPGAREGS=y
+BR2_PACKAGE_IMXREGS=y
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -404,6 +393,11 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
+
+#
+# bluez-utils not available (need dbus)
+#
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
index 081d322..3d88764 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
+++ b/buildroot/target/device/armadeus/apf9328/apf9328_defconfig
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Mon Jun 21 10:30:46 2010
+# Tue Jun 22 11:39:22 2010
#
BR2_HAVE_DOT_CONFIG=y
BR2_VERSION="0.10.0-svn"
@@ -324,30 +324,6 @@ BR2_PACKAGE_PKGCONFIG=y
# BR2_PACKAGE_PCRE is not set
#
-# Armadeus specific packages
-#
-# BR2_PACKAGE_LIBDNET is not set
-# BR2_PACKAGE_BLUEZ_LIBS is not set
-
-#
-# bluez-utils not available (need dbus)
-#
-
-#
-# Armadeus specific tools/utilities
-#
-# BR2_PACKAGE_AD9889CTRL is not set
-# BR2_PACKAGE_AS_DEVICES is not set
-BR2_PACKAGE_CH7024CTRL=y
-# BR2_PACKAGE_ARMADEUS_DEMOS is not set
-BR2_PACKAGE_FPGAREGS=y
-BR2_PACKAGE_IMXREGS=y
-# BR2_PACKAGE_IMXSSI is not set
-BR2_PACKAGE_MAX5821CTRL=y
-# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
-# BR2_PACKAGE_DUMMY is not set
-
-#
# Other stuff
#
# BR2_PACKAGE_AT is not set
@@ -385,6 +361,19 @@ BR2_PACKAGE_MAX5821CTRL=y
# BR2_PACKAGE_STARTUP_NOTIFICATION is not set
# BR2_PACKAGE_STRACE is not set
# BR2_PACKAGE_SUDO is not set
+
+#
+# Armadeus specific tools/utilities
+#
+# BR2_PACKAGE_AD9889CTRL is not set
+# BR2_PACKAGE_AS_DEVICES is not set
+# BR2_PACKAGE_CH7024CTRL is not set
+# BR2_PACKAGE_ARMADEUS_DEMOS is not set
+# BR2_PACKAGE_FPGAREGS is not set
+# BR2_PACKAGE_IMXREGS is not set
+# BR2_PACKAGE_IMXSSI is not set
+BR2_PACKAGE_MAX5821CTRL=y
+# BR2_PACKAGE_ARMADEUS_TESTSUITE is not set
# BR2_DATABASE_SUPPORT is not set
BR2_TEXTEDIT_SUPPORT=y
# BR2_PACKAGE_ED is not set
@@ -400,6 +389,11 @@ BR2_NETWORK_SUPPORT=y
# BR2_PACKAGE_AXEL is not set
# BR2_PACKAGE_BOA is not set
# BR2_PACKAGE_BIND is not set
+# BR2_PACKAGE_BLUEZ_LIBS is not set
+
+#
+# bluez-utils not available (need dbus)
+#
# BR2_PACKAGE_BRIDGE is not set
# BR2_PACKAGE_DNSMASQ is not set
# BR2_PACKAGE_DROPBEAR is not set
diff --git a/patches/buildroot/001-add_armadeus_device.patch b/patches/buildroot/001-add_armadeus_device.patch
index 793cfab..61e69e4 100644
--- a/patches/buildroot/001-add_armadeus_device.patch
+++ b/patches/buildroot/001-add_armadeus_device.patch
@@ -1,8 +1,25 @@
---- buildroot/target/device/Config.in.ref 2008-11-03 15:31:26.000000000 +0100
-+++ buildroot/target/device/Config.in 2008-11-03 15:32:00.000000000 +0100
-@@ -5,6 +5,7 @@ source "project/Config.in"
- comment "Preset Devices"
+Add armadeus target and packages specific menu to BR.
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-22 11:13:07.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:22:16.000000000 +0200
+@@ -120,6 +120,8 @@
+ source "package/which/Config.in"
+ endif
+
++source "package/armadeus/Config.in"
++
+ source "package/database/Config.in"
+
+ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+Index: buildroot/target/device/Config.in
+===================================================================
+--- buildroot.orig/target/device/Config.in 2008-11-03 09:15:09.000000000 +0100
++++ buildroot/target/device/Config.in 2010-06-22 11:10:57.000000000 +0200
+@@ -5,6 +5,7 @@
+ comment "Preset Devices"
+
source "target/device/AMD/Config.in"
+source "target/device/armadeus/Config.in"
source "target/device/ARMLTD/Config.in"
diff --git a/patches/buildroot/110-bluez-add_package.patch b/patches/buildroot/110-bluez-add_package.patch
new file mode 100644
index 0000000..a207239
--- /dev/null
+++ b/patches/buildroot/110-bluez-add_package.patch
@@ -0,0 +1,16 @@
+Add bluez package (3.36) to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-22 11:34:20.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:35:22.000000000 +0200
+@@ -141,6 +141,7 @@
+ source "package/axel/Config.in"
+ source "package/boa/Config.in"
+ source "package/bind/Config.in"
++source "package/bluez3/Config.in"
+ source "package/bridge-utils/Config.in"
+ if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+ source "package/dhcp/Config.in"
diff --git a/patches/buildroot/113-gpsd-add_package.patch b/patches/buildroot/113-gpsd-add_package.patch
index 248a5b9..6b8bdff 100644
--- a/patches/buildroot/113-gpsd-add_package.patch
+++ b/patches/buildroot/113-gpsd-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-09 10:53:23.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-09 10:55:54.000000000 +0200
-@@ -253,6 +253,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:35:22.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:37:00.000000000 +0200
+@@ -255,6 +255,7 @@
source "package/fuse/Config.in"
source "package/gadgetfs-test/Config.in"
source "package/gpm/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/gpsd/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/Config.in 2010-06-09 18:59:50.000000000 +0200
++++ buildroot/package/gpsd/Config.in 2010-06-22 11:37:01.000000000 +0200
@@ -0,0 +1,244 @@
+config BR2_PACKAGE_GPSD
+ bool "gpsd"
@@ -266,7 +266,7 @@ Index: buildroot/package/gpsd/Config.in
Index: buildroot/package/gpsd/gpsd.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/gpsd.mk 2010-06-09 19:29:23.000000000 +0200
++++ buildroot/package/gpsd/gpsd.mk 2010-06-22 11:37:01.000000000 +0200
@@ -0,0 +1,169 @@
+#############################################################
+#
@@ -440,7 +440,7 @@ Index: buildroot/package/gpsd/gpsd.mk
Index: buildroot/package/gpsd/S50gpsd
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/gpsd/S50gpsd 2010-06-09 18:53:01.000000000 +0200
++++ buildroot/package/gpsd/S50gpsd 2010-06-22 11:37:01.000000000 +0200
@@ -0,0 +1,42 @@
+#!/bin/sh
+#
diff --git a/patches/buildroot/116-openobex-add_package.patch b/patches/buildroot/116-openobex-add_package.patch
index bd8c9cf..a142be7 100644
--- a/patches/buildroot/116-openobex-add_package.patch
+++ b/patches/buildroot/116-openobex-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-16 10:21:22.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-16 16:33:02.000000000 +0200
-@@ -191,6 +191,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:37:00.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:37:56.000000000 +0200
+@@ -192,6 +192,7 @@
source "package/ntp/Config.in"
source "package/olsr/Config.in"
source "package/openntpd/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/openobex/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/Config.in 2010-06-16 13:24:33.000000000 +0200
++++ buildroot/package/openobex/Config.in 2010-06-22 11:37:56.000000000 +0200
@@ -0,0 +1,25 @@
+config BR2_PACKAGE_OPENOBEX
+ bool "openobex"
@@ -47,7 +47,7 @@ Index: buildroot/package/openobex/Config.in
Index: buildroot/package/openobex/openobex.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex.mk 2010-06-16 16:35:17.000000000 +0200
++++ buildroot/package/openobex/openobex.mk 2010-06-22 11:37:56.000000000 +0200
@@ -0,0 +1,47 @@
+#############################################################
+#
@@ -99,7 +99,7 @@ Index: buildroot/package/openobex/openobex.mk
Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-16 13:20:42.000000000 +0200
++++ buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.patch 2010-06-22 11:37:56.000000000 +0200
@@ -0,0 +1,13 @@
+Index: openobex-1.5/acinclude.m4
+===================================================================
@@ -117,7 +117,7 @@ Index: buildroot/package/openobex/openobex-libusb_check_when_cross-compiling.pat
Index: buildroot/package/openobex/openobex-replace_deprecated_functions.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-16 13:20:42.000000000 +0200
++++ buildroot/package/openobex/openobex-replace_deprecated_functions.patch 2010-06-22 11:37:56.000000000 +0200
@@ -0,0 +1,25 @@
+Index: openobex-1.5/apps/obex_test_cable.c
+===================================================================
diff --git a/patches/buildroot/117-ussp-push-add_package.patch b/patches/buildroot/117-ussp-push-add_package.patch
index c6b330d..f251c04 100644
--- a/patches/buildroot/117-ussp-push-add_package.patch
+++ b/patches/buildroot/117-ussp-push-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-20 11:57:30.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-20 11:58:27.000000000 +0200
-@@ -220,6 +220,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:37:56.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:38:03.000000000 +0200
+@@ -221,6 +221,7 @@
#source "package/udhcp/Config.in"
#endif
source "package/udpcast/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/ussp-push/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/Config.in 2010-06-20 11:57:35.000000000 +0200
++++ buildroot/package/ussp-push/Config.in 2010-06-22 11:38:03.000000000 +0200
@@ -0,0 +1,10 @@
+config BR2_PACKAGE_USSP_PUSH
+ bool "ussp-push"
@@ -32,7 +32,7 @@ Index: buildroot/package/ussp-push/Config.in
Index: buildroot/package/ussp-push/ussp-push.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/ussp-push/ussp-push.mk 2010-06-20 11:57:35.000000000 +0200
++++ buildroot/package/ussp-push/ussp-push.mk 2010-06-22 11:38:03.000000000 +0200
@@ -0,0 +1,12 @@
+#############################################################
+#
diff --git a/patches/buildroot/119-fbtest-add_package.patch b/patches/buildroot/119-fbtest-add_package.patch
index 4406f6b..ee15790 100644
--- a/patches/buildroot/119-fbtest-add_package.patch
+++ b/patches/buildroot/119-fbtest-add_package.patch
@@ -4,9 +4,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-18 23:44:05.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-18 23:49:19.000000000 +0200
-@@ -344,6 +344,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:38:03.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:38:17.000000000 +0200
+@@ -347,6 +347,7 @@
comment "--> May be broken in busybox"
source "package/fbv/Config.in"
source "package/fbset/Config.in"
@@ -17,7 +17,7 @@ Index: buildroot/package/Config.in
Index: buildroot/package/fbtest/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/Config.in 2010-06-18 23:51:27.000000000 +0200
++++ buildroot/package/fbtest/Config.in 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,7 @@
+config BR2_PACKAGE_FBTEST
+ bool "fbtest"
@@ -29,7 +29,7 @@ Index: buildroot/package/fbtest/Config.in
Index: buildroot/package/fbtest/fbtest.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest.mk 2010-06-18 23:56:39.000000000 +0200
++++ buildroot/package/fbtest/fbtest.mk 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,51 @@
+#############################################################
+#
@@ -85,7 +85,7 @@ Index: buildroot/package/fbtest/fbtest.mk
Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-18 23:56:15.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,36 @@
+--- fbtest-20041102-1.org/fb.c 2003-04-04 14:07:55.000000000 +0200
++++ fbtest-20041102-1/fb.c 2009-05-20 10:32:32.000000000 +0200
@@ -126,7 +126,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-page-mask.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-19 00:01:03.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/Makefile 2009-05-21 10:16:05.000000000 +0200
++++ fbtest-20041102-1/Makefile 2009-05-21 10:17:47.000000000 +0200
@@ -142,7 +142,7 @@ Index: buildroot/package/fbtest/fbtest-20041102-1-exe-target-name-change.patch
Index: buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2010-06-21 16:35:18.000000000 +0200
++++ buildroot/package/fbtest/fbtest-20041102-1-pnmtohex-libs-depends.patch 2010-06-22 11:38:17.000000000 +0200
@@ -0,0 +1,11 @@
+--- fbtest-20041102-1.org/pnmtohex/Makefile 2004-11-02 09:43:02.000000000 +0100
++++ fbtest-20041102-1/pnmtohex/Makefile 2005-11-16 22:24:08.406157582 +0100
diff --git a/patches/buildroot/120-cwiid-add_package.patch b/patches/buildroot/120-cwiid-add_package.patch
index 087795a..ba7b1ef 100644
--- a/patches/buildroot/120-cwiid-add_package.patch
+++ b/patches/buildroot/120-cwiid-add_package.patch
@@ -5,9 +5,9 @@ Signed-off-by: Julien Boibessot <jul...@ar...>
Index: buildroot/package/Config.in
===================================================================
---- buildroot.orig/package/Config.in 2010-06-20 19:58:08.000000000 +0200
-+++ buildroot/package/Config.in 2010-06-20 20:45:06.000000000 +0200
-@@ -241,6 +241,7 @@
+--- buildroot.orig/package/Config.in 2010-06-22 11:38:17.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:38:24.000000000 +0200
+@@ -244,6 +244,7 @@
if BR2_BLOCKDEV_SUPPORT
source "package/acpid/Config.in"
@@ -18,11 +18,11 @@ Index: buildroot/package/Config.in
Index: buildroot/package/cwiid/Config.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/cwiid/Config.in 2010-06-20 23:14:48.000000000 +0200
++++ buildroot/package/cwiid/Config.in 2010-06-22 11:38:44.000000000 +0200
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CWIID
+ bool "cwiid"
-+ select BR2_PACKAGE_BLUEZ
++ select BR2_PACKAGE_BLUEZ_LIBS
+ help
+ A collection of Linux tools written in C for interfacing to the
+ Nintendo Wiimote.
@@ -31,7 +31,7 @@ Index: buildroot/package/cwiid/Config.in
Index: buildroot/package/cwiid/cwiid.mk
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/cwiid/cwiid.mk 2010-06-20 23:03:30.000000000 +0200
++++ buildroot/package/cwiid/cwiid.mk 2010-06-22 11:38:24.000000000 +0200
@@ -0,0 +1,28 @@
+#############################################################
+#
@@ -64,7 +64,7 @@ Index: buildroot/package/cwiid/cwiid.mk
Index: buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch 2010-06-20 21:07:24.000000000 +0200
++++ buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.patch 2010-06-22 11:38:24.000000000 +0200
@@ -0,0 +1,22 @@
+--- cwiid-0.6.00.org/configure.ac 2007-08-27 02:27:58.000000000 +0200
++++ cwiid-0.6.00/configure.ac 2010-03-01 17:28:00.425401362 +0100
@@ -91,7 +91,7 @@ Index: buildroot/package/cwiid/cwiid-0.6.00-configure_ac_remove_gtk_dependancy.p
Index: buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch 2010-06-20 21:13:26.000000000 +0200
++++ buildroot/package/cwiid/cwiid-0.6.00-makefile_in-remove_wmgui.patch 2010-06-22 11:38:24.000000000 +0200
@@ -0,0 +1,11 @@
+--- cwiid-0.6.00.org/Makefile.in 2007-07-28 20:47:03.000000000 +0200
++++ cwiid-0.6.00/Makefile.in 2010-03-01 17:28:08.337399709 +0100
diff --git a/patches/buildroot/2010.05/110-bluez-add_package.patch b/patches/buildroot/2010.05/110-bluez-add_package.patch
new file mode 100644
index 0000000..7a6df7e
--- /dev/null
+++ b/patches/buildroot/2010.05/110-bluez-add_package.patch
@@ -0,0 +1,16 @@
+Add bluez package (3.36) to BR.
+
+Signed-off-by: Julien Boibessot <jul...@ar...>
+
+Index: buildroot/package/Config.in
+===================================================================
+--- buildroot.orig/package/Config.in 2010-06-22 11:34:20.000000000 +0200
++++ buildroot/package/Config.in 2010-06-22 11:35:22.000000000 +0200
+@@ -365,6 +365,7 @@
+ source "package/boa/Config.in"
+ endif
+ source "package/bind/Config.in"
++source "package/bluez3/Config.in"
+ source "package/bmon/Config.in"
+ source "package/bridge-utils/Config.in"
+ source "package/ctorrent/Config.in"
diff --git a/patches/buildroot/2010.05/120-cwiid-add_package.patch b/patches/buildroot/2010.05/120-cwiid-add_package.patch
index 4e2f15e..d9f1a62 100644
--- a/patches/buildroot/2010.05/120-cwiid-add_package.patch
+++ b/patches/buildroot/2010.05/120-cwiid-add_package.patch
@@ -22,7 +22,7 @@ Index: buildroot/package/cwiid/Config.in
@@ -0,0 +1,8 @@
+config BR2_PACKAGE_CWIID
+ bool "cwiid"
-+ select BR2_PACKAGE_BLUEZ
++ select BR2_PACKAGE_BLUEZ_LIBS
+ help
+ A collection of Linux tools written in C for interfacing to the
+ Nintendo Wiimote.
hooks/post-receive
--
armadeus
|
