lz4: version bump r127 -> r131

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

5 files changed, 32 insertions, 38 deletions

diff --git a/patches/lz4-r127/0001-Makefile-build-libs-by-default.patch b/patches/lz4-r127/0001-Makefile-build-libs-by-default.patch
deleted file mode 100644
index 2b8140c2d..000000000
--- a/patches/lz4-r127/0001-Makefile-build-libs-by-default.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Michael Olbrich <m.olbrich@pengutronix.de>
-Date: Sat, 28 Feb 2015 10:54:33 +0100
-Subject: [PATCH] Makefile: build libs by default
-
-Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
----
- Makefile | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index c48623954453..f0590b557fc9 100644
---- a/Makefile
-+++ b/Makefile
-@@ -69,12 +69,15 @@ TRAVIS_TARGET=$(LZ4_TRAVIS_CI_ENV)
- endif
- 
- 
--default: lz4programs
-+default: lz4libs lz4programs
- 
- all: 
- 	@cd $(LZ4DIR); $(MAKE) -e all
- 	@cd $(PRGDIR); $(MAKE) -e all
- 
-+lz4libs:
-+	@cd $(LZ4DIR); $(MAKE) -e
-+
- lz4programs:
- 	@cd $(PRGDIR); $(MAKE) -e
- 
diff --git a/patches/lz4-r127/series b/patches/lz4-r127/series
deleted file mode 100644
index 9e66ef821..000000000
--- a/patches/lz4-r127/series
+++ /dev/null
@@ -1,5 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Makefile-build-libs-by-default.patch
-0002-lib-Makefile-don-t-rebuild-lib-during-install.patch
-# a5ed033e129ae48475c63f25f44ded77  - git-ptx-patches magic
diff --git a/patches/lz4-r127/0002-lib-Makefile-don-t-rebuild-lib-during-install.patch b/patches/lz4-r131/0001-lib-Makefile-don-t-rebuild-lib-during-install.patch
index 3d17eb936..466c46c30 100644
--- a/patches/lz4-r127/0002-lib-Makefile-don-t-rebuild-lib-during-install.patch
+++ b/patches/lz4-r131/0001-lib-Makefile-don-t-rebuild-lib-during-install.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
  1 file changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/lib/Makefile b/lib/Makefile
-index faffb399842e..82a2561ad7e7 100644
+index 02ddd3b5f285..feaaa13525d8 100644
 --- a/lib/Makefile
 +++ b/lib/Makefile
-@@ -61,19 +61,19 @@ else
+@@ -60,19 +60,19 @@ else
  	SHARED_EXT_VER = $(SHARED_EXT).$(LIBVER)
  endif
  
@@ -37,7 +37,7 @@ index faffb399842e..82a2561ad7e7 100644
  
  clean:
  	@rm -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* liblz4.pc
-@@ -92,7 +92,7 @@ liblz4.pc: liblz4.pc.in Makefile
+@@ -91,7 +91,7 @@ liblz4.pc: liblz4.pc.in Makefile
              -e 's|@VERSION@|$(VERSION)|' \
               $< >$@
  
diff --git a/patches/lz4-r131/0002-build-lz4c-by-default.patch b/patches/lz4-r131/0002-build-lz4c-by-default.patch
new file mode 100644
index 000000000..bf8cfe365
--- /dev/null
+++ b/patches/lz4-r131/0002-build-lz4c-by-default.patch
@@ -0,0 +1,24 @@
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Fri, 6 Nov 2015 17:33:05 +0100
+Subject: [PATCH] build lz4c by default
+
+otherwise it wil be build during 'make install'
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ programs/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/programs/Makefile b/programs/Makefile
+index f422902e0271..1e71f2e42a0f 100644
+--- a/programs/Makefile
++++ b/programs/Makefile
+@@ -64,7 +64,7 @@ TEST_TARGETS := test-native
+ FUZZER_TIME  := -T9mn
+ 
+ 
+-default: lz4
++default: lz4 lz4c
+ 
+ m32: lz4c32 fullbench32 fuzzer32 frametest32
+ 
diff --git a/patches/lz4-r131/series b/patches/lz4-r131/series
new file mode 100644
index 000000000..969952db9
--- /dev/null
+++ b/patches/lz4-r131/series
@@ -0,0 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-lib-Makefile-don-t-rebuild-lib-during-install.patch
+0002-build-lz4c-by-default.patch
+# b3c4066d184224140067867c994e02db  - git-ptx-patches magic