diff options
-rw-r--r-- | meta/conf/bitbake.conf | 6 | ||||
-rw-r--r-- | meta/conf/machine/spitz.conf | 4 |
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 \ | |||
202 | IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" | 202 | IMAGE_CMD_cramfs = "mkcramfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cramfs ${EXTRA_IMAGECMD}" |
203 | IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" | 203 | IMAGE_CMD_ext2 = "genext2fs -b ${IMAGE_ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext2 ${EXTRA_IMAGECMD}" |
204 | 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" | 204 | 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" |
205 | IMAGE_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" | ||
206 | IMAGE_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" | ||
205 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" | 207 | IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" |
206 | IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" | 208 | IMAGE_CMD_squashfs-lzma = "mksquashfs-lzma ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend" |
207 | IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -jcvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar.bz2 ." | 209 | IMAGE_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" | |||
217 | IMAGE_DEPENDS_cramfs = "cramfs-native" | 219 | IMAGE_DEPENDS_cramfs = "cramfs-native" |
218 | IMAGE_DEPENDS_ext2 = "genext2fs-native" | 220 | IMAGE_DEPENDS_ext2 = "genext2fs-native" |
219 | IMAGE_DEPENDS_ext2.gz = "genext2fs-native" | 221 | IMAGE_DEPENDS_ext2.gz = "genext2fs-native" |
222 | IMAGE_DEPENDS_ext3 = "genext2fs-native" | ||
223 | IMAGE_DEPENDS_ext3.gz = "genext2fs-native" | ||
220 | IMAGE_DEPENDS_squashfs = "squashfs-tools-native" | 224 | IMAGE_DEPENDS_squashfs = "squashfs-tools-native" |
221 | IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" | 225 | IMAGE_DEPENDS_squashfs-lzma = "squashfs-lzma-tools-native" |
222 | EXTRA_IMAGEDEPENDS = "" | 226 | EXTRA_IMAGEDEPENDS = "" |
@@ -434,6 +438,8 @@ PCMCIA_MANAGER ?= "pcmcia-cs" | |||
434 | MACHINE_TASK_PROVIDER ?= "task-bootstrap" | 438 | MACHINE_TASK_PROVIDER ?= "task-bootstrap" |
435 | IMAGE_ROOTFS_SIZE_ext2 ?= "65536" | 439 | IMAGE_ROOTFS_SIZE_ext2 ?= "65536" |
436 | IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" | 440 | IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536" |
441 | IMAGE_ROOTFS_SIZE_ext3 ?= "65536" | ||
442 | IMAGE_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 | |||
8 | PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" | 8 | PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" |
9 | 9 | ||
10 | PACKAGE_EXTRA_ARCHS += "iwmmxt" | 10 | PACKAGE_EXTRA_ARCHS += "iwmmxt" |
11 | IMAGE_FSTYPES ?= "tar.gz ext2" | 11 | IMAGE_FSTYPES ?= "tar.gz ext3" |
12 | IMAGE_ROOTFS_SIZE_ext2 = "200000" | 12 | IMAGE_ROOTFS_SIZE_ext3 = "200000" |
13 | 13 | ||
14 | ROOT_FLASH_SIZE = "100" | 14 | ROOT_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, |