diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-09-18 18:20:23 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-09-18 18:20:23 +0000 |
| commit | 4b9805cba53ee926fbc9b3b72901b15d72982af0 (patch) | |
| tree | 956c484f804848c2b0357c09d35742334f60dc8b | |
| parent | 4d426656fdd26ae8e8066911c9a6d323e0f69cf8 (diff) | |
Merge
2004/09/19 00:03:51+09:30 (none)!rwhitby
Fixed the Redbook -> Redboot typo in slugtool, and made corresponding changes to the nslu2 firmware unpacking and packing procedures.
BKrev: 414c7c67rQASFlywei1gQZEgaXh7iQ
| -rw-r--r-- | BitKeeper/etc/logging_ok | 1 | ||||
| -rw-r--r-- | classes/nslu2_flashimg.oeclass | 16 | ||||
| -rw-r--r-- | nslu2-binary-only/nslu2-firmware-binary_2.3r25.oe | 14 | ||||
| -rw-r--r-- | slugtool/slugtool-native.oe | 9 | ||||
| -rw-r--r-- | slugtool/slugtool.oe | 16 | ||||
| -rw-r--r-- | slugtool/slugtool/redboot_typo.patch | 0 |
6 files changed, 56 insertions, 0 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok index ec354c9760..1139ac192c 100644 --- a/BitKeeper/etc/logging_ok +++ b/BitKeeper/etc/logging_ok @@ -55,6 +55,7 @@ phillim@linux.local ral@alwin.at.home red@quarm.(none) reenoo@sugarcube.dyndns.org +rwhitby@home.(none) schurig@mnz66.mn-logistik.de schurig@schurig.homelinux.net szczepan@home.hrw.one.pl diff --git a/classes/nslu2_flashimg.oeclass b/classes/nslu2_flashimg.oeclass index e69de29bb2..f6170b9b73 100644 --- a/classes/nslu2_flashimg.oeclass +++ b/classes/nslu2_flashimg.oeclass @@ -0,0 +1,16 @@ +nslu2_pack_image () { + install -d ${DEPLOY_DIR_IMAGE}/slug + install -m 0644 ${STAGING_LIBDIR}/nslu2-binaries/Redboot \ + ${STAGING_LIBDIR}/nslu2-binaries/Trailer \ + ${STAGING_LIBDIR}/nslu2-binaries/SysConf \ + ${DEPLOY_DIR_IMAGE}/slug/ + install -m 0644 ${STAGING_KERNEL_DIR}/zImage ${DEPLOY_DIR_IMAGE}/slug/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/slug/ramdisk.gz + cd ${DEPLOY_DIR_IMAGE}/slug + slugtool pack ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.img + rm -f ${DEPLOY_DIR_IMAGE}/zImage* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz + rm -rf ${DEPLOY_DIR_IMAGE}/slug +} + +EXTRA_IMAGEDEPENDS += 'slugtool-native nslu2-firmware-binary' +IMAGE_POSTPROCESS_COMMAND += "nslu2_pack_image; " diff --git a/nslu2-binary-only/nslu2-firmware-binary_2.3r25.oe b/nslu2-binary-only/nslu2-firmware-binary_2.3r25.oe index e69de29bb2..ba151b6b0e 100644 --- a/nslu2-binary-only/nslu2-firmware-binary_2.3r25.oe +++ b/nslu2-binary-only/nslu2-firmware-binary_2.3r25.oe @@ -0,0 +1,14 @@ +DEPENDS = "slugtool-native" +PACKAGES = "" +INHIBIT_DEFAULT_DEPS = "1" + +SRC_URI = "ftp://ftp.linksys.com/pub/network/nslu2-fw-2.3r25.zip" +S = "${WORKDIR}" + +do_compile () { + slugtool unpack NSLU2_V23R25.bin + install -d ${STAGING_LIBDIR}/nslu2-binaries + install -m 0755 Redboot ${STAGING_LIBDIR}/nslu2-binaries/ + install -m 0755 SysConf ${STAGING_LIBDIR}/nslu2-binaries/ + install -m 0755 Trailer ${STAGING_LIBDIR}/nslu2-binaries/ +} diff --git a/slugtool/slugtool-native.oe b/slugtool/slugtool-native.oe index e69de29bb2..3217e1215e 100644 --- a/slugtool/slugtool-native.oe +++ b/slugtool/slugtool-native.oe @@ -0,0 +1,9 @@ +include slugtool.oe +inherit native + +FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/slugtool-${PV}', '${FILE_DIRNAME}/slugtool', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}" +PACKAGES = "" + +do_stage () { + install -m 0755 slugtool ${STAGING_BINDIR}/ +} diff --git a/slugtool/slugtool.oe b/slugtool/slugtool.oe index e69de29bb2..140147e094 100644 --- a/slugtool/slugtool.oe +++ b/slugtool/slugtool.oe @@ -0,0 +1,16 @@ +DESCRIPTION = "Slugtool is a small app to disassemble and reassemble \ +flash images for the Linksys NSLU2 device." +MAINTAINER = "Chris Larson <kergoth@handhelds.org>" + +SRC_URI = "http://www.lantz.com/filemgmt_data/files/slugtool.tar.gz \ + file://redboot_typo.patch;patch=1" +S = "${WORKDIR}" + +do_compile () { + ${CC} ${CFLAGS} ${LDFLAGS} slugtool.c -o slugtool +} + +do_install () { + install -d ${D}/${bindir} + install -m 0755 slugtool ${D}/${bindir}/ +} diff --git a/slugtool/slugtool/redboot_typo.patch b/slugtool/slugtool/redboot_typo.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/slugtool/slugtool/redboot_typo.patch |