[oe-commits] org.oe.dev merge of '59ac76a98d175728e06d1a85a9533570b68cfad7'

[rwhitby commit]

merge of '59ac76a98d175728e06d1a85a9533570b68cfad7'
     and 'b78f2dc352e2e9c1e3c7c2020293e603d6c2a7b8'

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: d68560eb3e0b38837e6e007a6f82559194d984da
ViewMTN: http://monotone.openembedded.org/revision/info/d68560eb3e0b38837e6e007a6f82559194d984da
Files:
1
packages/meta/slugos-packages.bb
packages/redboot-utils/fis_1.0.bb
conf/checksums.ini
packages/navit/navit_0.0.1.bb
Diffs:

#
# mt diff -r59ac76a98d175728e06d1a85a9533570b68cfad7 -rd68560eb3e0b38837e6e007a6f82559194d984da
#
# 
# 
# 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 -rb78f2dc352e2e9c1e3c7c2020293e603d6c2a7b8 -rd68560eb3e0b38837e6e007a6f82559194d984da
#
# 
# 
# patch "conf/checksums.ini"
#  from [a08fa28c098b54cf9c6f748c8b4cf57ecf6944db]
#    to [6abbcaedc888cd8411607755f104327fcf5b1173]
# 
# patch "packages/navit/navit_0.0.1.bb"
#  from [96acdd2c7dd3d5a55f11159d0020d7d95d8392b7]
#    to [87c4e6ce2cdf4c2270e9f3aa51f1441b78a4db82]
# 
============================================================
--- conf/checksums.ini	a08fa28c098b54cf9c6f748c8b4cf57ecf6944db
+++ conf/checksums.ini	6abbcaedc888cd8411607755f104327fcf5b1173
@@ -11914,3 +11914,7 @@ sha256=f8e9efccbccbe1326a0a2579eb86651cf
 md5=e34320c97d768191217424af64de380a
 sha256=f8e9efccbccbe1326a0a2579eb86651cf65e0937a38fae1afaec2269208d24a1
 
+[http://downloads.sourceforge.net/navit/navit-0.0.1.tar.gz]
+md5=521fbc102a804f7c26d4240b3f970380
+sha256=d79151209bf6b2d470773968b62258c56313bf857cda8ef27f8e321dd1a9d084
+
============================================================
--- packages/navit/navit_0.0.1.bb	96acdd2c7dd3d5a55f11159d0020d7d95d8392b7
+++ packages/navit/navit_0.0.1.bb	87c4e6ce2cdf4c2270e9f3aa51f1441b78a4db82
@@ -1,14 +1,14 @@ PV = "0.0.1"
 DESCRIPTION = "Navit is a car navigation system with routing engine."
 LICENSE = "GPL"
 DEPENDS = "glib-2.0 gtk+"
 PV = "0.0.1"
-PR = "r1"
+PR = "r2"
 
 inherit autotools 
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/navit/navit-${PV}.tar.gz \
 	file://compile-fix.patch;patch=1"
 
-EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python"
+EXTRA_OECONF = "--disable-gui-sdl --disable-binding-python --enable-avoid-unaligned --enable-avoid-float"
 
 FILES_${PN}-dbg += "${libdir}/${PN}/*/.debug"