summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-09-19 10:04:32 +0000
committerRod Whitby <rod@whitby.id.au>2007-09-19 10:04:32 +0000
commitd240e1b714b68d8d1cd0bdc2521d4b1b87ec68c6 (patch)
treef688b011765a2b3ca900a69832f230b1844160db
parent3c9b8fa0dc7f1d5c279d345492b067630dcd02c7 (diff)
parent832fa184c0b89903e18cf1f9b6776cd52c67746b (diff)
merge of 'bac543c4612d852bbed6209100ed1a521881f0cf'
and 'e4d75b274d0d0e865c3387c7fffdc927c195383a'
-rw-r--r--packages/meta/slugos-packages.bb3
-rw-r--r--packages/redboot-utils/fis_1.0.bb4
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 26b89ff000..6b34fc187a 100644
--- a/packages/meta/slugos-packages.bb
+++ b/packages/meta/slugos-packages.bb
@@ -5,7 +5,7 @@
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 \
diff --git a/packages/redboot-utils/fis_1.0.bb b/packages/redboot-utils/fis_1.0.bb
index 87246f2717..e1ac56448b 100644
--- a/packages/redboot-utils/fis_1.0.bb
+++ b/packages/redboot-utils/fis_1.0.bb
@@ -1,7 +1,7 @@
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"