diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-04-27 13:28:41 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-04-27 13:28:41 +0000 |
| commit | b688dada8de8c2c9e8a42df102116b267f58b660 (patch) | |
| tree | 6c3b937abc5c2b59b1fd7e61014ea8beb19e74b2 /packages | |
| parent | 22ac273df7f61176476381d2ee82cdca74867b6e (diff) | |
| parent | e7c54bef16e24248e31170b1de7c88db457d97bc (diff) | |
merge of '017fd59a29d14dbd3c9a86e2bccaadc64909892a'
and 'efd9ac5db96b1872b9947299a1e10d54a34a86a3'
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/images/unslung-image.bb | 8 | ||||
| -rw-r--r-- | packages/meta/slugos-packages.bb | 5 | ||||
| -rw-r--r-- | packages/openocd/openocd_svn.bb | 3 |
3 files changed, 13 insertions, 3 deletions
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 } 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 \ 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" |