summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2007-09-22 08:11:55 +0000
committerRod Whitby <rod@whitby.id.au>2007-09-22 08:11:55 +0000
commite319201f9044f21e805f7d9828f2ae9e42f1bd2f (patch)
tree65b44eec89ea2dad20d9a9eff8e9fb2a08f11ca2
parentc9df1e7b3d7198b6cf9fd86a9b59b550c5cfd65d (diff)
parente40945c549e702290ff2df835771d4145786734d (diff)
merge of '6ba440770253a20d17a68175abe67875c69ce828'
and 'd68560eb3e0b38837e6e007a6f82559194d984da'
-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"