diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-08-08 14:49:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-08-08 14:49:01 +0000 |
| commit | f5223d94301e660252a510ac85399ea502602657 (patch) | |
| tree | e11d69e5ee9b715e79c18fdae35c93a44c3834a8 /meta/packages/mtd | |
| parent | fa86980349302a164be0bd2ff0a77e20ec9fa7f6 (diff) | |
| download | openembedded-core-f5223d94301e660252a510ac85399ea502602657.tar.gz openembedded-core-f5223d94301e660252a510ac85399ea502602657.tar.bz2 openembedded-core-f5223d94301e660252a510ac85399ea502602657.zip | |
lzo: Update to lzo 2.x
mtd-utils: Remove patch to use lzo 1.x
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2394 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/mtd')
| -rw-r--r-- | meta/packages/mtd/mtd-utils/lzo_1x.patch | 26 | ||||
| -rw-r--r-- | meta/packages/mtd/mtd-utils_1.0.0+git.bb | 5 |
2 files changed, 2 insertions, 29 deletions
diff --git a/meta/packages/mtd/mtd-utils/lzo_1x.patch b/meta/packages/mtd/mtd-utils/lzo_1x.patch deleted file mode 100644 index b882d9f504..0000000000 --- a/meta/packages/mtd/mtd-utils/lzo_1x.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: git/Makefile -=================================================================== ---- git.orig/Makefile -+++ git/Makefile -@@ -60,7 +60,7 @@ $(BUILDDIR)/mkfs.jffs2: $(BUILDDIR)/crc3 - $(BUILDDIR)/compr_zlib.o \ - $(BUILDDIR)/compr_lzo.o \ - $(BUILDDIR)/compr.o -- $(CC) $(LDFLAGS) -o $@ $^ -lz -llzo2 -+ $(CC) $(LDFLAGS) -o $@ $^ -lz -llzo - - $(BUILDDIR)/flash_eraseall: $(BUILDDIR)/crc32.o $(BUILDDIR)/flash_eraseall.o - $(CC) $(LDFLAGS) -o $@ $^ -Index: git/compr_lzo.c -=================================================================== ---- git.orig/compr_lzo.c -+++ git/compr_lzo.c -@@ -26,7 +26,7 @@ - #include <string.h> - #include <asm/types.h> - #include <linux/jffs2.h> --#include <lzo/lzo1x.h> -+#include <lzo1x.h> - #include "compr.h" - - extern int page_size; diff --git a/meta/packages/mtd/mtd-utils_1.0.0+git.bb b/meta/packages/mtd/mtd-utils_1.0.0+git.bb index cfbd38c714..1c92ac6f22 100644 --- a/meta/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/meta/packages/mtd/mtd-utils_1.0.0+git.bb @@ -3,12 +3,11 @@ 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 \ file://add-exclusion-to-mkfs-jffs2-git.patch;patch=1 \ - file://fix-ignoreerrors-git.patch;patch=1 \ - file://lzo_1x.patch;patch=1" + file://fix-ignoreerrors-git.patch;patch=1" S = "${WORKDIR}/git/" |