7 files changed, 7 insertions, 44 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 04603d393d..0141eb5bcd 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -170,6 +170,8 @@ IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_
 IMAGE_CMD_ext2.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext2.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
 IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
 IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
+IMAGE_CMD_tar.gz = "cd ${IMAGE_ROOTFS} && tar -zcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.gz ."
+IMAGE_CMD_tar.bz2 = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
 EXTRA_IMAGECMD = ""
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
 EXTRA_IMAGECMD_squashfs = "-le -b 16384"
diff --git a/conf/distro/jlime.conf b/conf/distro/jlime.conf
index 4f4ecd42af..f1cda8d539 100644
--- a/conf/distro/jlime.conf
+++ b/conf/distro/jlime.conf
@@ -35,7 +35,7 @@ PREFERRED_VERSION_xserver-kdrive = "20050207"
 INHERIT += "package_tar package_ipk"
 BBINCLUDELOGS = "yes"
 MODUTILS = "26"
-IMAGE_FSTYPES = "tar"
+IMAGE_FSTYPES = "tar.bz2"
 
 BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs ncurses nano virtual/kernel wireless-tools console-tools"
 BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs ncurses nano wireless-tools            \ 
diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
index 0950a5a008..b2d2eafc22 100644
--- a/conf/machine/borzoi.conf
+++ b/conf/machine/borzoi.conf
@@ -15,6 +15,6 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
 BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
-IMAGE_FSTYPES = "jffs2 tar"
+IMAGE_FSTYPES = "jffs2 tar.gz"
 
 ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/lite5200.conf b/conf/machine/lite5200.conf
index e8cb819551..f990d1390e 100644
--- a/conf/machine/lite5200.conf
+++ b/conf/machine/lite5200.conf
@@ -14,6 +14,6 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 
-IMAGE_FSTYPES = "jffs2 tar"
+IMAGE_FSTYPES = "jffs2 tar.bz2"
 
 include conf/machine/tune-ppc603e.conf
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 6e6ea7f605..79ce0c4193 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -15,6 +15,6 @@ PIVOTBOOT_EXTRA_RRECOMMENDS += ""
 BOOTSTRAP_EXTRA_DEPENDS  += "hdparm e2fsprogs"
 BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
 
-IMAGE_FSTYPES = "jffs2 tar"
+IMAGE_FSTYPES = "jffs2 tar.gz"
 
 ROOT_FLASH_SIZE = "100"
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.0.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.0.bb
deleted file mode 100644
index 06cd4732d7..0000000000
--- a/packages/ftpd-topfield/ftpd-topfield_0.6.0.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-# This package builds the ftpd-topfield program
-PR = "r0"
-DESCRIPTION = "ftpd-topfield - FTP access to TopField PVR"
-HOMEPAGE = "http://sourceforge.net/projects/puppy"
-MAINTAINER = "NSLU2 Linux <www.nslu2-linux.org>"
-SECTION = "net"
-LICENSE = "MIT"
-
-DEPENDS = "libusb"
-
-SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_0 \
-	   cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_5_0 \
-	   file://init"
-
-# The source will end up in the subdirectory 'ftpd-topfield' - no release name
-S = "${WORKDIR}/ftpd-topfield"
-SL = "${WORKDIR}/libtopfield"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "ftpd-topfield"
-INITSCRIPT_PARAMS = "defaults"
-
-# Just the one package at present
-PACKAGES = "${PN}"
-
-inherit autotools
-
-do_compile() {
-	oe_runmake -C ${SL} libtopfield.a
-	oe_runmake LDLIBS="${LDFLAGS} -L ../libtopfield -ltopfield -lusb"
-}
-
-do_install() {
-	install -d ${D}${sbindir}
-	install -m 0755 ${S}/ftpd ${D}${sbindir}/ftpd-topfield
-        install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d
-        install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/ftpd-topfield
-}
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb b/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb
index 095162fcbe..c93e8c2120 100644
--- a/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.6.1.bb
@@ -9,7 +9,7 @@ LICENSE = "MIT"
 DEPENDS = "libusb"
 
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_1 \
-	   cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=LIBTOPFIELD_0_6_1 \
+	   cvs://anonymous@cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_1 \
 	   file://init"
 
 # The source will end up in the subdirectory 'ftpd-topfield' - no release name