From b89be08350d3f73b1bbe7e8604a7e12d85ec90e2 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 26 Jun 2019 06:04:02 +0100 Subject: [PATCH 1/4] pigz: new package Co-Authored-By: CvH <1355173+CvH@users.noreply.github.com> --- packages/compress/pigz/package.mk | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 packages/compress/pigz/package.mk diff --git a/packages/compress/pigz/package.mk b/packages/compress/pigz/package.mk new file mode 100644 index 0000000000..4196cda0d7 --- /dev/null +++ b/packages/compress/pigz/package.mk @@ -0,0 +1,25 @@ +# SPDX-License-Identifier: GPL-2.0 +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) + +PKG_NAME="pigz" +PKG_VERSION="2.4" +PKG_SHA256="e228e7d18b34c4ece8d596eb6eee97bde533c6beedbb728d07d3abe90b4b1b52" +PKG_LICENSE="Other" +PKG_SITE="https://zlib.net/pigz/" +PKG_URL="https://github.com/madler/pigz/archive/v${PKG_VERSION}.tar.gz" +PKG_DEPENDS_HOST="make:host zlib:host" +PKG_LONGDESC="a parallel implementation of the gzip file compressor" +PKG_TOOLCHAIN="manual" + +make_host() { + make CPPFLAGS="${CPPFLAGS} -I${TOOLCHAIN}/include" \ + LDFLAGS="${LDFLAGS}" \ + CXX="${CXX}" \ + CC="${CC}" \ + pigz +} + +makeinstall_host() { + mkdir -p $TOOLCHAIN/bin + cp pigz ${TOOLCHAIN}/bin +} From 91dbd26d68ec79fd65b157fcaf719b644900aa19 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 26 Jun 2019 06:04:12 +0100 Subject: [PATCH 2/4] toolchain: build pigz:host --- packages/virtual/toolchain/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/virtual/toolchain/package.mk b/packages/virtual/toolchain/package.mk index 537758c8cc..d8c7acc605 100644 --- a/packages/virtual/toolchain/package.mk +++ b/packages/virtual/toolchain/package.mk @@ -1,11 +1,12 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv) PKG_NAME="toolchain" PKG_VERSION="" PKG_LICENSE="GPL" PKG_SITE="https://libreelec.tv" PKG_URL="" -PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host p7zip:host ninja:host meson:host" +PKG_DEPENDS_TARGET="configtools:host make:host xz:host sed:host pkg-config:host autoconf:host automake:host intltool:host libtool:host autoconf-archive:host gcc:host bison:host flex:host cmake:host xmlstarlet:host p7zip:host pigz:host ninja:host meson:host" PKG_SECTION="virtual" PKG_LONGDESC="LibreELEC.tv' toolchain to compile all packages" From d048fdc3ddaa915eef50e0e97bd91795c6451996 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 26 Jun 2019 06:22:57 +0100 Subject: [PATCH 3/4] glibc: use pigz when compressing charmap --- packages/devel/glibc/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index 90f7af9caf..d5a0c5d5e1 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -8,7 +8,7 @@ PKG_SHA256="f3eeb8d57e25ca9fc13c2af3dae97754f9f643bc69229546828e3a240e2af04b" PKG_LICENSE="GPL" PKG_SITE="http://www.gnu.org/software/libc/" PKG_URL="http://ftp.gnu.org/pub/gnu/glibc/$PKG_NAME-$PKG_VERSION.tar.xz" -PKG_DEPENDS_TARGET="ccache:host autotools:host linux:host gcc:bootstrap" +PKG_DEPENDS_TARGET="ccache:host autotools:host linux:host gcc:bootstrap pigz:host" PKG_DEPENDS_INIT="glibc" PKG_LONGDESC="The Glibc package contains the main C library." PKG_BUILD_FLAGS="-gold" @@ -125,7 +125,7 @@ post_makeinstall_target() { if [ "$PROJECT" = "Generic" ]; then mkdir -p $INSTALL/usr/share/i18n/charmaps cp -PR $PKG_BUILD/localedata/charmaps/UTF-8 $INSTALL/usr/share/i18n/charmaps - gzip $INSTALL/usr/share/i18n/charmaps/UTF-8 + pigz --best --force $INSTALL/usr/share/i18n/charmaps/UTF-8 fi if [ ! "$GLIBC_LOCALES" = yes ]; then From 9bb0b82abaa782fc5bfddba3411398e132da1958 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Wed, 26 Jun 2019 06:13:28 +0100 Subject: [PATCH 4/4] scripts/mkimage: use pigz when compressing image --- scripts/mkimage | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mkimage b/scripts/mkimage index 9de16df697..953026afb1 100755 --- a/scripts/mkimage +++ b/scripts/mkimage @@ -325,7 +325,7 @@ fi # gzip echo "image: compressing..." -gzip -f "${DISK}" +pigz --best --force "${DISK}" # set owner if [ -n "${SUDO_USER}" ]; then