[PATCH 1/2] pigz: provide gzip

[PATCH 1/2] pigz: provide gzip

[Ross Burton]

As pigz has the same command line interface to gzip, it should PROVIDE/RPROVIDE
gzip.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-extended/pigz/pigz_2.4.bb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-extended/pigz/pigz_2.4.bb b/meta/recipes-extended/pigz/pigz_2.4.bb
index 8c65ec34f06..a173268eaa8 100644
--- a/meta/recipes-extended/pigz/pigz_2.4.bb
+++ b/meta/recipes-extended/pigz/pigz_2.4.bb
@@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline
 SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz"
 SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df"
 SRC_URI[sha256sum] = "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73"
-PROVIDES_class-native += "gzip-native"
 
 # Point this at the homepage in case /fossils/ isn't updated
 UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/"
 UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar"
 
+PROVIDES = "gzip"
 DEPENDS = "zlib"
 
 EXTRA_OEMAKE = "-e MAKEFLAGS="
@@ -38,6 +38,8 @@ do_install_append_class-native() {
 	ln -nsf gzip ${D}${bindir}/zcat
 }
 
+RPROVIDES_${PN} = "gzip"
+
 ALTERNATIVE_PRIORITY = "110"
 ALTERNATIVE_${PN} = "gunzip gzip zcat"
 ALTERNATIVE_${PN}_class-nativesdk = ""
-- 
2.11.0

[PATCH 2/2] default-providers: use pigz as gzip

[Ross Burton]

As pigz is compatible with gzip but faster, prefer to use pigz.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/conf/distro/include/default-providers.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc
index 2be3378773c..1dac58c9d50 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -54,6 +54,8 @@ PREFERRED_PROVIDER_nativesdk-openssl ?= "nativesdk-openssl"
 PREFERRED_PROVIDER_pkgconfig ?= "pkgconfig"
 PREFERRED_PROVIDER_nativesdk-pkgconfig ?= "nativesdk-pkgconfig"
 PREFERRED_PROVIDER_pkgconfig-native ?= "pkgconfig-native"
+
+PREFERRED_RPROVIDER_gzip ?= "pigz"
 PREFERRED_RPROVIDER_initd-functions ?= "initscripts"
 
 PREFERRED_PROVIDER_nativesdk-mesa ?= "nativesdk-mesa"
-- 
2.11.0

✗ patchtest: failure for "pigz: provide gzip..." and 1 more

[Patchwork]

== Series Details ==

Series: "pigz: provide gzip..." and 1 more
Revision: 1
URL   : https://patchwork.openembedded.org/series/18286/
State : failure

== Summary ==


Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:



* Issue             Series does not apply on top of target branch [test_series_merge_on_head] 
  Suggested fix    Rebase your series on top of targeted branch
  Targeted branch  master (currently at c724a2feae)



If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).

---
Guidelines:     https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite:     http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe

Re: [PATCH 1/2] pigz: provide gzip

[Richard Purdie]

On Fri, 2019-06-21 at 10:55 +0100, Ross Burton wrote:
> As pigz has the same command line interface to gzip, it should
> PROVIDE/RPROVIDE
> gzip.
> 
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-extended/pigz/pigz_2.4.bb | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/recipes-extended/pigz/pigz_2.4.bb b/meta/recipes-
> extended/pigz/pigz_2.4.bb
> index 8c65ec34f06..a173268eaa8 100644
> --- a/meta/recipes-extended/pigz/pigz_2.4.bb
> +++ b/meta/recipes-extended/pigz/pigz_2.4.bb
> @@ -11,12 +11,12 @@ LIC_FILES_CHKSUM = "
> file://pigz.c;md5=9ae6dee8ceba9610596ed0ada493d142;beginline
>  SRC_URI = "http://zlib.net/${BPN}/fossils/${BP}.tar.gz"
>  SRC_URI[md5sum] = "def2f6e19d9d8231445adc1349d346df"
>  SRC_URI[sha256sum] =
> "a4f816222a7b4269bd232680590b579ccc72591f1bb5adafcd7208ca77e14f73"
> -PROVIDES_class-native += "gzip-native"
>  
>  # Point this at the homepage in case /fossils/ isn't updated
>  UPSTREAM_CHECK_URI = "http://zlib.net/${BPN}/"
>  UPSTREAM_CHECK_REGEX = "pigz-(?P<pver>.*)\.tar"
>  
> +PROVIDES = "gzip"
>  DEPENDS = "zlib"
>  
>  EXTRA_OEMAKE = "-e MAKEFLAGS="
> @@ -38,6 +38,8 @@ do_install_append_class-native() {
>  	ln -nsf gzip ${D}${bindir}/zcat
>  }
>  
> +RPROVIDES_${PN} = "gzip"
> +

The RPROVIDES is fine, not sure the PROVIDES is going to work though as
bitbake handles things a little differently.

It throws errors on the AB:

https://autobuilder.yoctoproject.org/typhoon/#/builders/62/builds/734

Initialising tasks...ERROR: Multiple .bb files are due to be built which each provide gzip:
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/pigz/pigz_2.4.bb
A list of tasks depending on these providers is shown and may help explain where the dependency comes from.
/home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb has unique dependees:
  
/home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/pigz/pigz_2.4.bb has unique dependees:
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/ltp/ltp_20190115.bb:do_package_write_rpm
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb:do_package_write_ipk
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/ltp/ltp_20190115.bb:do_package_qa
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/ltp/ltp_20190115.bb:do_package_write_deb
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/ltp/ltp_20190115.bb:do_package_write_ipk
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/ltp/ltp_20190115.bb:do_build
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb:do_build
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-sato/images/core-image-sato-sdk.bb:do_build
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-sato/images/core-image-sato-sdk.bb:do_rootfs
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb:do_build
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb:do_package_write_rpm
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb:do_package_write_deb
  /home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb:do_package_qa
It could be that one recipe provides something the other doesn't and should. The following provider and runtime provider differences may be helpful.
/home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb has unique provides:
  
/home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/gzip/gzip_1.10.bb has unique rprovides:
  gzip-ptest
  gzip-dbg
  gzip-src
  gzip-dev
  ^gzip-locale-.*
  gzip-locale
  gzip-doc
  gzip-staticdev
/home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/pigz/pigz_2.4.bb has unique provides:
  pigz
/home/pokybuild/yocto-worker/edgerouter/build/meta/recipes-extended/pigz/pigz_2.4.bb has unique rprovides:
  pigz-dbg
  pigz-locale
  pigz-dev
  pigz-doc
  ^pigz-locale-.*
  pigz-staticdev
  pigz-src
  pigz
done.

Cheers,

Richard