diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-07-23 16:33:20 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-07-23 16:33:20 +0000 |
| commit | 75c94643bb584a4b086344309108d16bd208647f (patch) | |
| tree | f93d69ecf66f21304850924441204c9f29f930ca | |
| parent | c572384a554b8145058f530ebd0b83c3c66badb9 (diff) | |
| download | openembedded-core-75c94643bb584a4b086344309108d16bd208647f.tar.gz openembedded-core-75c94643bb584a4b086344309108d16bd208647f.tar.bz2 openembedded-core-75c94643bb584a4b086344309108d16bd208647f.tar.xz openembedded-core-75c94643bb584a4b086344309108d16bd208647f.zip | |
mtd-utils: Work with lzo 1.x for now
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2213 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -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, 29 insertions, 2 deletions
diff --git a/meta/packages/mtd/mtd-utils/lzo_1x.patch b/meta/packages/mtd/mtd-utils/lzo_1x.patch new file mode 100644 index 000000000..b882d9f50 --- /dev/null +++ b/meta/packages/mtd/mtd-utils/lzo_1x.patch @@ -0,0 +1,26 @@ +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 b7e242a33..cfbd38c71 100644 --- a/meta/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/meta/packages/mtd/mtd-utils_1.0.0+git.bb @@ -3,11 +3,12 @@ SECTION = "base" DEPENDS = "zlib lzo" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -PR = "r3" +PR = "r4" 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://fix-ignoreerrors-git.patch;patch=1 \ + file://lzo_1x.patch;patch=1" S = "${WORKDIR}/git/" |