[oe-commits] org.oe.dev mtd-utils: Updates after lzo patches merged upstream (from poky)

[rpurdie commit]

mtd-utils: Updates after lzo patches merged upstream (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 9a8e382937007a29b221ed555179d037c1120e65
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9a8e382937007a29b221ed555179d037c1120e65
Files:
1
packages/mtd/mtd-utils/lzo_1x.patch
packages/mtd/mtd-utils_1.0.0+git.bb
Diffs:

#
# mt diff -r1277d41144edd2eca6be1e62b6811522136cbdad -r9a8e382937007a29b221ed555179d037c1120e65
#
# 
# 
# add_file "packages/mtd/mtd-utils/lzo_1x.patch"
#  content [381e4dae15e7c01d77c11e5676f207147e574277]
# 
# patch "packages/mtd/mtd-utils_1.0.0+git.bb"
#  from [c9e774dc79be470362b78c23161a10b8c00de9b4]
#    to [5a4eeda941b257100b2222655196333091e734a1]
# 
============================================================
--- packages/mtd/mtd-utils/lzo_1x.patch	381e4dae15e7c01d77c11e5676f207147e574277
+++ packages/mtd/mtd-utils/lzo_1x.patch	381e4dae15e7c01d77c11e5676f207147e574277
@@ -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;
============================================================
--- packages/mtd/mtd-utils_1.0.0+git.bb	c9e774dc79be470362b78c23161a10b8c00de9b4
+++ packages/mtd/mtd-utils_1.0.0+git.bb	5a4eeda941b257100b2222655196333091e734a1
@@ -1,15 +1,14 @@ LICENSE = "GPLv2"
 DESCRIPTION = "Tools for managing memory technology devices."
 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/"