From ded7be737c96742174f57b1d097740d0f3d9cb1a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Aug 2007 09:40:19 +0000 Subject: mtd-utils: lock down git rev --- packages/mtd/mtd-utils_1.0.0+git.bb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb index cfbd38c714..8b14faa1d6 100644 --- a/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/packages/mtd/mtd-utils_1.0.0+git.bb @@ -3,9 +3,15 @@ SECTION = "base" DEPENDS = "zlib lzo" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -PR = "r4" +PR = "r5" -SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=master \ +# This is the default package, thus we lock to a specific git version so +# upstream changes will not break builds. + +TAG = "9845d92440bd87739c89edd000fd6e0c47fab185" +# As of 2007/27/07, see http://git.infradead.org/?p=mtd-utils.git;a=shortlog + +SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=${TAG} \ file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ file://fix-ignoreerrors-git.patch;patch=1 \ file://lzo_1x.patch;patch=1" -- cgit v1.2.3 From 50b6e431ae4b64867b98f5ca4ae38265af863de7 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Thu, 30 Aug 2007 10:30:48 +0000 Subject: zaurus-2.6.inc: consistently suffix jffs2 images with jffs2 --- conf/machine/include/zaurus-2.6.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index aa9046ee5d..456555e51e 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -11,7 +11,7 @@ ERASEBLOCKSIZE_akita = "0x20000" EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" -IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}" +IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}" EXTRA_IMAGEDEPENDS += "zaurus-updater" @@ -69,4 +69,4 @@ zaurus_make_installkit () { } # Don't include kernels in standard images for Zaurus machines -RDEPENDS_kernel-base = "" \ No newline at end of file +RDEPENDS_kernel-base = "" -- cgit v1.2.3