Patchwork [v2] pigz: bump to 2.3.1

login
register
mail settings
Submitter Maxin B. John
Date Oct. 24, 2013, 11:40 a.m.
Message ID <1382614856-4421-1-git-send-email-maxin.john@enea.com>
Download mbox | patch
Permalink /patch/60461/
State New
Headers show

Comments

Maxin B. John - Oct. 24, 2013, 11:40 a.m.
From: "Maxin B. John" <maxin.john@enea.com>

Update pigz to latest release - 2.3.1
Drop ldflags.patch as it has been merged upstream

Signed-off-by: Maxin B. John <maxin.john@enea.com>
---
 meta/recipes-extended/pigz/files/ldflags.patch      |   19 -------------------
 meta/recipes-extended/pigz/pigz.inc                 |    6 +-----
 .../pigz/{pigz_2.3.bb => pigz_2.3.1.bb}             |    4 ++--
 3 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 meta/recipes-extended/pigz/files/ldflags.patch
 rename meta/recipes-extended/pigz/{pigz_2.3.bb => pigz_2.3.1.bb} (55%)

Patch

diff --git a/meta/recipes-extended/pigz/files/ldflags.patch b/meta/recipes-extended/pigz/files/ldflags.patch
deleted file mode 100644
index 8e531cc..0000000
--- a/meta/recipes-extended/pigz/files/ldflags.patch
+++ /dev/null
@@ -1,19 +0,0 @@ 
-Link using the bitbake LDFLAGS.
-
-Signed-off-by: Björn Stenberg <bjst@enea.com>
-
-Upstream-Status: Pending
-
-Index: pigz-2.3/Makefile
-===================================================================
---- pigz-2.3.orig/Makefile
-+++ pigz-2.3/Makefile
-@@ -3,7 +3,7 @@ CFLAGS=-O3 -Wall -Wextra
- 
- 
- pigz: pigz.o yarn.o zopfli/deflate.o zopfli/blocksplitter.o zopfli/tree.o zopfli/lz77.o zopfli/cache.o zopfli/hash.o zopfli/util.o zopfli/squeeze.o zopfli/katajainen.o
--	$(CC) -o pigz $^ -lpthread -lz
-+	$(CC) ${LDFLAGS} -o pigz $^ -lpthread -lz -lm
- 	ln -f pigz unpigz
- 
- pigz.o: pigz.c yarn.h zopfli/deflate.h zopfli/util.h
diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc
index 5ceaef2..355fb2a 100644
--- a/meta/recipes-extended/pigz/pigz.inc
+++ b/meta/recipes-extended/pigz/pigz.inc
@@ -7,10 +7,7 @@  HOMEPAGE = "http://zlib.net/pigz/"
 SECTION = "console/utils"
 LICENSE = "Zlib"
 
-PR = "r1"
-
-SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz \
-           file://ldflags.patch"
+SRC_URI = "http://zlib.net/pigz/pigz-${PV}.tar.gz"
 
 PROVIDES_class-native += "gzip-native"
 
@@ -33,4 +30,3 @@  ALTERNATIVE_${PN} = "gzip gunzip"
 ALTERNATIVE_LINK_NAME[gzip] = "${base_bindir}/gzip"
 ALTERNATIVE_LINK_NAME[gunzip] = "${base_bindir}/gunzip"
 ALTERNATIVE_PRIORITY = "80"
-
diff --git a/meta/recipes-extended/pigz/pigz_2.3.bb b/meta/recipes-extended/pigz/pigz_2.3.1.bb
similarity index 55%
rename from meta/recipes-extended/pigz/pigz_2.3.bb
rename to meta/recipes-extended/pigz/pigz_2.3.1.bb
index 724d00b..6e7c7f1 100644
--- a/meta/recipes-extended/pigz/pigz_2.3.bb
+++ b/meta/recipes-extended/pigz/pigz_2.3.1.bb
@@ -1,8 +1,8 @@ 
 require pigz.inc
 LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95"
 
-SRC_URI[md5sum] = "042e3322534f2c3d761736350cac303f"
-SRC_URI[sha256sum] = "74bbd5962f9420549fc987ddd1ccda692ec2b29d2d612fbbe26edf3fa348ff21"
+SRC_URI[md5sum] = "e803f8bc0770c7a5e96dccb1d2dd2aab"
+SRC_URI[sha256sum] = "629b0ce5422a3978f31742bf8275d0be2f84987140d18f390f1e3b4e46e0af54"
 
 NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}"