[oe-commits] org.oe.dev merge of 'b77bbe31e8594f7d7724c20dd668f62a3ecac8f0'

[rwhitby commit]

merge of 'b77bbe31e8594f7d7724c20dd668f62a3ecac8f0'
     and 'e3fa4ab0e51ec72d171b5d973d3cdbdafe22b60c'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 627a0e4a4d8f7eebf74939e0642c5fb01872af01
ViewMTN: http://monotone.openembedded.org/revision/info/627a0e4a4d8f7eebf74939e0642c5fb01872af01
Files:
1
packages/meta/slugos-packages.bb
packages/redboot-utils/fis_1.0.bb
conf/machine/dht-walnut.conf
packages/libsdl/libsdl-net_1.2.7.bb
packages/linux/linux-ezx_2.6.21.bb
Diffs:

#
# mt diff -rb77bbe31e8594f7d7724c20dd668f62a3ecac8f0 -r627a0e4a4d8f7eebf74939e0642c5fb01872af01
#
# 
# 
# patch "packages/meta/slugos-packages.bb"
#  from [738a66a4cd05dd74381dce0949ddcd547be2497f]
#    to [3e624519aa3c29fb9c243930483b6363f1b191b9]
# 
# patch "packages/redboot-utils/fis_1.0.bb"
#  from [423fde1a30e871e390b48542349b88efb3a07ac9]
#    to [16fa3c9f589d8b24e84de8555dad50affd97b735]
# 
============================================================
--- packages/meta/slugos-packages.bb	738a66a4cd05dd74381dce0949ddcd547be2497f
+++ packages/meta/slugos-packages.bb	3e624519aa3c29fb9c243930483b6363f1b191b9
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -37,6 +37,7 @@ SLUGOS_PACKAGES = "\
 	binutils \
 	bison \
 	bluez-utils \
+	bluez-hcidump \
 	bogofilter \
 	boost \
 	bridge-utils \
============================================================
--- packages/redboot-utils/fis_1.0.bb	423fde1a30e871e390b48542349b88efb3a07ac9
+++ packages/redboot-utils/fis_1.0.bb	16fa3c9f589d8b24e84de8555dad50affd97b735
@@ -1,7 +1,7 @@ DESCRIPTION = "Tool to edit the Redboot 
 DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
 S="${WORKDIR}/trunk"
 
 export CFLAGS += "--std=c99"


#
# mt diff -re3fa4ab0e51ec72d171b5d973d3cdbdafe22b60c -r627a0e4a4d8f7eebf74939e0642c5fb01872af01
#
# 
# 
# patch "conf/machine/dht-walnut.conf"
#  from [767ff97da524b39ccc11f1de9d21ab148f3a69c8]
#    to [74013431b04d2e2f9a497c24b2941e148b833e1a]
# 
# patch "packages/libsdl/libsdl-net_1.2.7.bb"
#  from [706e78998aae43ecbcf4d5e3291c6c6573c34314]
#    to [3ef6b382d1473344c9d55d2ebbd844d176758bd6]
# 
# patch "packages/linux/linux-ezx_2.6.21.bb"
#  from [2fa81f07979a54fc0cb831c107b4aef98834a892]
#    to [2ea2f1e711b98603012a3a8f2a2b5d673859fad6]
# 
============================================================
--- conf/machine/dht-walnut.conf	767ff97da524b39ccc11f1de9d21ab148f3a69c8
+++ conf/machine/dht-walnut.conf	74013431b04d2e2f9a497c24b2941e148b833e1a
@@ -5,7 +5,7 @@ TARGET_ARCH = "powerpc"
 #@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP  development platform
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405"
+PACKAGE_EXTRA_ARCHS = "ppc ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 UBOOT_ENTRYPOINT = "0"
============================================================
--- packages/libsdl/libsdl-net_1.2.7.bb	706e78998aae43ecbcf4d5e3291c6c6573c34314
+++ packages/libsdl/libsdl-net_1.2.7.bb	3ef6b382d1473344c9d55d2ebbd844d176758bd6
@@ -8,6 +8,7 @@ inherit autotools
 S = "${WORKDIR}/SDL_net-${PV}"
 
 inherit autotools
+EXTRA_OECONF += "SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config"
 
 do_stage() {
 	oe_libinstall -so libSDL_net ${STAGING_LIBDIR}
============================================================
--- packages/linux/linux-ezx_2.6.21.bb	2fa81f07979a54fc0cb831c107b4aef98834a892
+++ packages/linux/linux-ezx_2.6.21.bb	2ea2f1e711b98603012a3a8f2a2b5d673859fad6
@@ -1,8 +1,8 @@ EZX = "ezxdev"
 DESCRIPTION = "2.6 Linux Development Kernel for the Motorola GSM phones A780 and E680"
 AUTHOR = "The OpenEZX Team <openezx-devel at lists.openezx.org>"
 HOMEPAGE = "http://www.openezx.org"
 EZX = "ezxdev"
-PR = "${EZX}-20"
+PR = "${EZX}-r20"
 
 require linux.inc