From bf8f22e2cc633abde505318b896ce4b9a7495731 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Apr 2008 12:48:10 +0000
Subject: openocd: Added build dependency on libftdi

---
 packages/openocd/openocd_svn.bb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/openocd/openocd_svn.bb b/packages/openocd/openocd_svn.bb
index 2815324521..d5c5ba05cd 100644
--- a/packages/openocd/openocd_svn.bb
+++ b/packages/openocd/openocd_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Bounda
 HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
 PV = "0.0+r${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit autotools
 
@@ -10,4 +10,5 @@ SRC_URI = "svn://svn.berlios.de/openocd;module=trunk \
            file://openocd-link-static.patch;patch=1"
 S = "${WORKDIR}/trunk"
 
+DEPENDS = "libftdi"
 EXTRA_OECONF = " --enable-ft2232_libftdi --disable-ftdi2232 --disable-ftd2xx"  
-- 
cgit v1.2.3


From ae5bab2d7bcbcab7bd62ece55214658b60108a57 Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Apr 2008 12:48:41 +0000
Subject: slugos-packages: Promoted openocd and task-mokogateway now that
 openocd builds

---
 packages/meta/slugos-packages.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/meta/slugos-packages.bb b/packages/meta/slugos-packages.bb
index 5401237c49..526f49bd13 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 = "r50"
+PR = "r51"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2|ixp4xx"
@@ -176,6 +176,7 @@ SLUGOS_PACKAGES = "\
 	openobex-apps \
 	openntpd \
 	openobex \
+	openocd \
 	openssh \
 	openvpn \
 	patch \
@@ -216,6 +217,7 @@ SLUGOS_PACKAGES = "\
 	sudo \
 	sysfsutils \
 	tar \
+	task-mokogateway-everything \
 	tcpdump \
 	thttpd \
 	tiff \
@@ -262,7 +264,6 @@ SLUGOS_BROKEN_PACKAGES = "\
 	pwc \
 	qc-usb-messenger \
 	syslog-ng \
-	openocd task-mokogateway-everything \
 	task-native-sdk \
 	unionfs-modules unionfs-utils \
 	wview-sim-mysql wview-wxt510-mysql wview-vpro-mysql \
-- 
cgit v1.2.3


From e7c54bef16e24248e31170b1de7c88db457d97bc Mon Sep 17 00:00:00 2001
From: Rod Whitby <rod@whitby.id.au>
Date: Sun, 27 Apr 2008 12:55:46 +0000
Subject: unslung-image: Enable 16mb image creation

---
 packages/images/unslung-image.bb | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index cb2a20b75e..9ac4140a14 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -100,4 +100,12 @@ nslu2_pack_image () {
 		-m ${STAGING_FIRMWARE_DIR}/NPE-B \
 		-t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2.bin
+	slugimage -F -p \
+		-b ${STAGING_LIBDIR}/nslu2-binaries/RedBoot \
+		-s ${STAGING_LIBDIR}/nslu2-binaries/SysConf \
+		-k ${DEPLOY_DIR_IMAGE}/zImage-${MACHINE}.bin \
+		-r Ramdisk:1,Flashdisk:${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+		-m ${STAGING_FIRMWARE_DIR}/NPE-B \
+		-t ${STAGING_LIBDIR}/nslu2-binaries/Trailer \
+		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-nslu2-16mb.bin
 }
-- 
cgit v1.2.3