summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-09-22 22:43:49 +0000
committerRod Whitby <rod@whitby.id.au>2007-09-22 22:43:49 +0000
commitc1ffb356c4f51e3861d2cfad613acd88b04c60ca (patch)
tree7f09d8db7de4bc041fab43f1a3d381340939e481
parent8cf1c3a637603ef6640bf6d452b6b9927e86cd07 (diff)
parentd51fb9edae8caefc9a5d4e7b78fe19b94774acfb (diff)
merge of '21944f0f10c4b5fc5cbb2468a81955b02d5ad97e'
and '627a0e4a4d8f7eebf74939e0642c5fb01872af01'
-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"