summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-01-30 12:27:12 +0000
committerRichard Purdie <richard@openedhand.com>2007-01-30 12:27:12 +0000
commit3b75644d51f0b437e7ae738ef408b5a9e2d550f7 (patch)
tree94560f8b9959dd8907f116c6a2fd31a4313024a9
parent3cce9ba903a35dce67c08a8344acd52a3eae3e41 (diff)
downloadpoky-3b75644d51f0b437e7ae738ef408b5a9e2d550f7.tar.gz
bitbake.conf: Add ext3 image support (and update spitz to generate ext3 images)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1217 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/bitbake.conf6
-rw-r--r--meta/conf/machine/spitz.conf4
2 files changed, 8 insertions, 2 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 790475c7b3..e3a43761da 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -202,6 +202,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
202IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" 202IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}"
203IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" 203IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}"
204IMAGE_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" 204IMAGE_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"
205IMAGE_CMD_ext3 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
206IMAGE_CMD_ext3.gz = "mkdir ${DEPLOY_DIR_IMAGE}/tmp.gz; genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; gzip -f -9 ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3; mv ${DEPLOY_DIR_IMAGE}/tmp.gz/${IMAGE_NAME}.rootfs.ext3.gz ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3.gz; rmdir ${DEPLOY_DIR_IMAGE}/tmp.gz"
205IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" 207IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend"
206IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" 208IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend"
207IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." 209IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ."
@@ -217,6 +219,8 @@ IMAGE_DEPENDS_jffs2 = "mtd-utils-native"
217IMAGE_DEPENDS_cramfs = "cramfs-native" 219IMAGE_DEPENDS_cramfs = "cramfs-native"
218IMAGE_DEPENDS_ext2 = "genext2fs-native" 220IMAGE_DEPENDS_ext2 = "genext2fs-native"
219IMAGE_DEPENDS_ext2.gz = "genext2fs-native" 221IMAGE_DEPENDS_ext2.gz = "genext2fs-native"
222IMAGE_DEPENDS_ext3 = "genext2fs-native"
223IMAGE_DEPENDS_ext3.gz = "genext2fs-native"
220IMAGE_DEPENDS_squashfs = "squashfs-tools-native" 224IMAGE_DEPENDS_squashfs = "squashfs-tools-native"
221IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" 225IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native"
222EXTRA_IMAGEDEPENDS = "" 226EXTRA_IMAGEDEPENDS = ""
@@ -434,6 +438,8 @@ PCMCIA_MANAGER ?= "pcmcia-cs"
434MACHINE_TASK_PROVIDER ?= "task-bootstrap" 438MACHINE_TASK_PROVIDER ?= "task-bootstrap"
435IMAGE_ROOTFS_SIZE_ext2 ?= "65536" 439IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
436IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" 440IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
441IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
442IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
437 443
438################################################################## 444##################################################################
439# Magic Cookie for SANITY CHECK 445# Magic Cookie for SANITY CHECK
diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf
index 85a22975c7..47dfbf797c 100644
--- a/meta/conf/machine/spitz.conf
+++ b/meta/conf/machine/spitz.conf
@@ -8,8 +8,8 @@ include conf/machine/include/zaurus-2.6.conf
8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" 8PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}"
9 9
10PACKAGE_EXTRA_ARCHS += "iwmmxt" 10PACKAGE_EXTRA_ARCHS += "iwmmxt"
11IMAGE_FSTYPES ?= "tar.gz ext2" 11IMAGE_FSTYPES ?= "tar.gz ext3"
12IMAGE_ROOTFS_SIZE_ext2 = "200000" 12IMAGE_ROOTFS_SIZE_ext3 = "200000"
13 13
14ROOT_FLASH_SIZE = "100" 14ROOT_FLASH_SIZE = "100"
15# actually that should really read ROOTFS_SIZE = "100", because with modern kernels, 15# actually that should really read ROOTFS_SIZE = "100", because with modern kernels,