From a6c2a2ce120a047d875ab1f1f9594403d1ff9dbc Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Mon, 21 Nov 2016 17:58:52 -0200 Subject: pigz: Update to version 2.3.4 - Change SRC_URI to fetch sources from Github archives. Pigz official site maintains only the latest tarball version and Github have all versions avaiable to download. - Remove patch link-order.patch. The following commit fix this issue: https://github.com/madler/pigz/commit/c3f91d1a12a6f Signed-off-by: Fabio Berton Signed-off-by: Ross Burton --- meta/recipes-extended/pigz/pigz/link-order.patch | 38 ------------------------ meta/recipes-extended/pigz/pigz_2.3.3.bb | 14 --------- meta/recipes-extended/pigz/pigz_2.3.4.bb | 12 ++++++++ 3 files changed, 12 insertions(+), 52 deletions(-) delete mode 100644 meta/recipes-extended/pigz/pigz/link-order.patch delete mode 100644 meta/recipes-extended/pigz/pigz_2.3.3.bb create mode 100644 meta/recipes-extended/pigz/pigz_2.3.4.bb (limited to 'meta/recipes-extended/pigz') diff --git a/meta/recipes-extended/pigz/pigz/link-order.patch b/meta/recipes-extended/pigz/pigz/link-order.patch deleted file mode 100644 index 4becc0e3fe..0000000000 --- a/meta/recipes-extended/pigz/pigz/link-order.patch +++ /dev/null @@ -1,38 +0,0 @@ -This patch avoids underlinking issues since we pass -lz via LDFLAGS but it appears -before pigz.o which needs symbols from libz however due to order linker happily discards libz - -Upstream-Status: Pending - -Signed-off-by: Khem Raj - -Index: pigz-2.3.3/Makefile -=================================================================== ---- pigz-2.3.3.orig/Makefile 2015-01-19 20:12:31.000000000 -0800 -+++ pigz-2.3.3/Makefile 2015-01-28 09:11:50.266669184 -0800 -@@ -5,7 +5,7 @@ - # use gcc and gmake on Solaris - - pigz: pigz.o yarn.o try.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) $(LDFLAGS) -o pigz $^ -lpthread -lm -+ $(CC) -o pigz $^ $(LDFLAGS) -lz -lpthread -lm - ln -f pigz unpigz - - pigz.o: pigz.c yarn.h try.h ${ZOPFLI}deflate.h ${ZOPFLI}util.h -@@ -35,7 +35,7 @@ - dev: pigz pigzt pigzn - - pigzt: pigzt.o yarnt.o try.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) $(LDFLAGS) -o pigzt $^ -lpthread -lm -+ $(CC) -o pigzt $^ $(LDFLAGS) -lz -lpthread -lm - - pigzt.o: pigz.c yarn.h try.h - $(CC) $(CFLAGS) -DDEBUG -g -c -o pigzt.o pigz.c -@@ -44,7 +44,7 @@ - $(CC) $(CFLAGS) -DDEBUG -g -c -o yarnt.o yarn.c - - pigzn: pigzn.o tryn.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) $(LDFLAGS) -o pigzn $^ -lm -+ $(CC) -o pigzn $^ $(LDFLAGS) -lz -lm - - pigzn.o: pigz.c try.h - $(CC) $(CFLAGS) -DDEBUG -DNOTHREAD -g -c -o pigzn.o pigz.c diff --git a/meta/recipes-extended/pigz/pigz_2.3.3.bb b/meta/recipes-extended/pigz/pigz_2.3.3.bb deleted file mode 100644 index b4fe831387..0000000000 --- a/meta/recipes-extended/pigz/pigz_2.3.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -require pigz.inc -LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" - -UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" -SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz" -SRC_URI += "file://link-order.patch" - -SRC_URI[md5sum] = "01d7a16cce77929cc1a78aa1bdfb68cb" -SRC_URI[sha256sum] = "4e8b67b432ce7907575a549f3e1cac4709781ba0f6b48afea9f59369846b509c" - -NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta/recipes-extended/pigz/pigz_2.3.4.bb b/meta/recipes-extended/pigz/pigz_2.3.4.bb new file mode 100644 index 0000000000..49d9d78b35 --- /dev/null +++ b/meta/recipes-extended/pigz/pigz_2.3.4.bb @@ -0,0 +1,12 @@ +require pigz.inc +LIC_FILES_CHKSUM = "file://pigz.c;beginline=7;endline=21;md5=a21d4075cb00ab4ca17fce5e7534ca95" + +UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/" +SRC_URI = "https://github.com/madler/pigz/archive/v${PV}.tar.gz" +SRC_URI[md5sum] = "c109057050b15edf3eb9bb4d0805235e" +SRC_URI[sha256sum] = "763f2fdb203aa0b7b640e63385e38e5dd4e5aaa041bc8e42aa96f2ef156b06e8" + +NATIVE_PACKAGE_PATH_SUFFIX = "/${PN}" + +BBCLASSEXTEND = "native nativesdk" + -- cgit v1.2.3