diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2007-07-25 08:49:02 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-07-25 08:49:02 +0000 |
| commit | f304c61e41c4b36551b9c92eb9f417bf29816427 (patch) | |
| tree | b7578d1ac1c9d352b8b0c5933d15b14e3bd57ad0 /packages | |
| parent | 3e64ab997be17ab3d0e33d6f775c3b844d22596a (diff) | |
mtd-utils: Updates after lzo patches merged upstream (from poky)
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/mtd/mtd-utils/lzo_1x.patch | 26 | ||||
| -rw-r--r-- | packages/mtd/mtd-utils_1.0.0+git.bb | 7 |
2 files changed, 29 insertions, 4 deletions
diff --git a/packages/mtd/mtd-utils/lzo_1x.patch b/packages/mtd/mtd-utils/lzo_1x.patch new file mode 100644 index 0000000000..b882d9f504 --- /dev/null +++ b/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/packages/mtd/mtd-utils_1.0.0+git.bb b/packages/mtd/mtd-utils_1.0.0+git.bb index 62a2c0630b..cfbd38c714 100644 --- a/packages/mtd/mtd-utils_1.0.0+git.bb +++ b/packages/mtd/mtd-utils_1.0.0+git.bb @@ -3,13 +3,12 @@ SECTION = "base" DEPENDS = "zlib lzo" HOMEPAGE = "http://www.linux-mtd.infradead.org/" LICENSE = "GPLv2" -PR = "r2" +PR = "r4" SRC_URI = "git://git.infradead.org/mtd-utils.git;protocol=git;tag=master \ - file://add_lzo.patch;patch=1 \ - file://favour_lzo.patch;patch=1 \ 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/" |