From b7a25fbd651f0b43c9147a71192c7e22ba40e21d Mon Sep 17 00:00:00 2001 From: "Dennis E. Mungai" Date: Sat, 10 Nov 2018 09:41:59 +0300 Subject: [PATCH 1/2] Rename distcc_3.2.bb to distcc_ Patchwork changes: 1. Renames distcc_3.2.bb to distcc_3.2-maint.bb to match the correct branch upstream. See https://github.com/distcc/distcc/tree/3.2-maint. 2. Let's set `SRCREV = "${AUTOREV}"` as it should just work. This should fix the build error encountered when building Yocto for Xilinx based on the R2018.2 release. --- .../distcc/{distcc_3.2.bb => distcc_3.2-maint.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/distcc/{distcc_3.2.bb => distcc_3.2-maint.bb} (97%) diff --git a/meta/recipes-devtools/distcc/distcc_3.2.bb b/meta/recipes-devtools/distcc/distcc_3.2-maint.bb similarity index 97% rename from meta/recipes-devtools/distcc/distcc_3.2.bb rename to meta/recipes-devtools/distcc/distcc_3.2-maint.bb index b6da65a582..6122c8d164 100644 --- a/meta/recipes-devtools/distcc/distcc_3.2.bb +++ b/meta/recipes-devtools/distcc/distcc_3.2-maint.bb @@ -21,7 +21,7 @@ SRC_URI = "git://github.com/distcc/distcc.git;branch=${PV} \ file://distccmon-gnome.desktop \ file://distcc \ file://distcc.service" -SRCREV = "d8b18df3e9dcbe4f092bed565835d3975e99432c" +SRCREV = "${AUTOREV}" S = "${WORKDIR}/git" UPSTREAM_VERSION_UNKNOWN = "1" From ba870147d9e33d4feecc06b912babe73d951a84a Mon Sep 17 00:00:00 2001 From: "Dennis E. Mungai" Date: Sun, 11 Nov 2018 06:37:23 +0300 Subject: [PATCH 2/2] Remove an invalid configuration option ----disable-pump-mode The configuration --disable-pump-mode has been deprecated in the aforementioned branch, 3.2-maint. Enabling it here results in a QA warning raised by yocto's bitbake. --- meta/recipes-devtools/distcc/distcc_3.2-maint.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/distcc/distcc_3.2-maint.bb b/meta/recipes-devtools/distcc/distcc_3.2-maint.bb index 6122c8d164..66939ff451 100644 --- a/meta/recipes-devtools/distcc/distcc_3.2-maint.bb +++ b/meta/recipes-devtools/distcc/distcc_3.2-maint.bb @@ -27,7 +27,7 @@ UPSTREAM_VERSION_UNKNOWN = "1" inherit autotools pkgconfig update-rc.d useradd systemd -EXTRA_OECONF += "--disable-Werror PYTHON='' --disable-pump-mode" +EXTRA_OECONF += "--disable-Werror PYTHON=''" USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "--system \