dm7025.conf: update to match kernel config, build jffs2-only image

diff --git a/conf/machine/dm7025.conf b/conf/machine/dm7025.conf
index fe198c2..65986d5 100644 (file)
--- a/conf/machine/dm7025.conf
+++ b/conf/machine/dm7025.conf
@@ -3,77 +3,25 @@
 #@DESCRIPTION: Machine configuration for the Dreambox DM 7025
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS = "\
-       dreambox-boottool \
-       kernel-module-autofs4 \
-       kernel-module-cdrom \
-       kernel-module-cifs \
-       kernel-module-exportfs \
-       kernel-module-fat \
-       kernel-module-ide-cd \
-       kernel-module-loop \
-       kernel-module-msdos \
-       kernel-module-reiserfs \
-       kernel-module-sg \
-       kernel-module-sqlzma \
-       kernel-module-squashfs \
-       kernel-module-sr-mod \
-       kernel-module-stv0299 \
-       kernel-module-unlzma \
-       kernel-module-vfat \
-       kernel-module-xfs \
-       unionfs-modules"
+       kernel-module-pata-xilleon \
+"
 
-PREFERRED_VERSION_squashfs-tools-native = "3.1r2"
-
-KERNEL_VERSION = 2.6.12.6
-
-EXTRA_IMAGEDEPENDS += "squashfs-tools-native"
 EXTRA_IMAGECMD_jffs2 = " --eraseblock=0x4000 -n -l "
 IMAGE_CMD_jffs2 = "\
-       install -d ${DEPLOY_DIR_IMAGE}/boot_tmp; \
-       for i in bin dev mnt/flash mnt/squashfs mnt/root; \
-       do \
-               install -d ${IMAGE_ROOTFS}/boot/$i; \
-       done; \
-       install -d ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
-       install -d ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/drivers/block; \
-       mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/fs/squashfs \
-               ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
-       mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/fs/unionfs.ko \
-               ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/fs; \
-       mv ${IMAGE_ROOTFS}/lib/modules/${KERNEL_VERSION}/kernel/drivers/block/loop.ko \
-               ${IMAGE_ROOTFS}/boot/lib/modules/${KERNEL_VERSION}/kernel/drivers/block; \
-       mkfs.jffs2 --root=${IMAGE_ROOTFS}/boot --faketime -x lzo \
+       mkfs.jffs2 \
+               --root=${IMAGE_ROOTFS}/boot \
+               --faketime \
+               --disable-compressor=lzo \
+               --compression-mode=size \
                --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
                ${EXTRA_IMAGECMD}; \
-       mv ${IMAGE_ROOTFS}/boot/* ${DEPLOY_DIR_IMAGE}/boot_tmp; \
-       \
-       install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta; \
-       cd ${IMAGE_ROOTFS}; \
-       for i in `find -maxdepth 3 -name enigma2 | xargs`; \
-       do \
-               install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/enigma2}; \
-               mv $i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/enigma2}; \
-       done; \
-       for i in `find -type d -name extra | xargs`; \
-       do \
-               install -d ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/extra}; \
-               mv $i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/${i%%/extra}; \
-       done; \
-       cat ${IMAGE_ROOTFS}/etc/fstab | sed 's/^\/dev\/mtdblock\/2/\/dev\/root/;' > ${IMAGE_ROOTFS}/etc/fstab_neu; \
-       mv -f ${IMAGE_ROOTFS}/etc/fstab_neu ${IMAGE_ROOTFS}/etc/fstab; \
-       mksquashfs ${IMAGE_ROOTFS}/* ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/squashfs \
-               -root-owned -le -noappend; \
-       \
-       mkfs.jffs2 --root=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME} --faketime -x lzo \
+       rm -rf ${IMAGE_ROOTFS}/boot/*; \
+       mkfs.jffs2 \
+               --root=${IMAGE_ROOTFS} \
+               --faketime \
+               --compression-mode=size \
                --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
                ${EXTRA_IMAGECMD}; \
-       \
-       for i in ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}/delta/*; \
-               do cp -R $i ${IMAGE_ROOTFS}; done; \
-       rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}; \
-       rm -rf ${IMAGE_ROOTFS}/boot; \
-       mv ${DEPLOY_DIR_IMAGE}/boot_tmp ${IMAGE_ROOTFS}/boot; \
        buildimage ${STAGING_LIBDIR}/dreambox-secondstage/main.bin.gz \
                ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.boot.jffs2 \
                ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \