diff options
| author | Leon Woestenberg <leon@sidebranch.com> | 2009-11-18 01:29:09 +0100 |
|---|---|---|
| committer | Leon Woestenberg <leon@sidebranch.com> | 2009-11-18 19:22:12 +0100 |
| commit | 1481ac48dd9d47cc6ac2749e1d68147553e76c7e (patch) | |
| tree | 4789902fcca97ca886d9af8cd030473bd76f2071 /conf | |
| parent | 96fa2bacf66afcb30903cea6a8ef3f612dbe2afc (diff) | |
squashfs-4.0: update squashfs-tools to include upstream LZMA inclusion.
In OpenEmbedded we used squashfs 4.0 with external patch for LZMA
compression support. In the meantime, squashfs has mainlined LZMA
support in its CVS version.
This patches switches to the upstream squashfs-tools and modifies
bitbake.conf to match the slightly different arguments to mksquashfs.
Signed-off-by: Leon Woestenberg <leon@sidebranch.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 2 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index ae3ff25f9d..4435fdd8bd 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -367,7 +367,7 @@ IMAGE_CMD_ext2.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${ROOT IMAGE_CMD_ext3 = "genext2fs -b ${ROOTFS_SIZE} -d ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3 ${EXTRA_IMAGECMD}; tune2fs -j ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3" IMAGE_CMD_ext3.gz = "install -d ${DEPLOY_DIR_IMAGE}/tmp.gz ; genext2fs -b ${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" IMAGE_CMD_squashfs = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs ${EXTRA_IMAGECMD} -noappend" -IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -lzma" +IMAGE_CMD_squashfs-lzma = "mksquashfs ${IMAGE_ROOTFS} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.squashfs-lzma ${EXTRA_IMAGECMD} -noappend -comp lzma" IMAGE_CMD_tar = "cd ${IMAGE_ROOTFS} && tar -cvf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.tar ." 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 ." diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 422145c8c2..4ea318fdbb 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -41,6 +41,7 @@ SRCDATE_rdesktop ?= "20080917" SRCDATE_roadster ?= "20060814" SRCDATE_rosetta ?= "20090514" SRCDATE_sctzap ?= "20060814" +SRCDATE_squashfs ?= "20091110" SRCDATE_tslib ?= "20051101" SRCDATE_waimea ?= "20060814" SRCDATE_xcompmgr ?= "20060814" |