<div dir="ltr"><div dir="ltr">On Mon, 2 Dec 2019 at 23:46, akuster808 <<a href="mailto:akuster808@gmail.com">akuster808@gmail.com</a>> wrote:<br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
On 12/2/19 9:54 AM, Alexander Kanavin wrote:<br>
> Drop patches that were merged upstream.<br>
><br>
> 0001-mono-find-provides-requires-do-not-use-monodis-from-.patch<br>
> modifies a file that was removed upstream.<br>
><br>
> Add a 0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch<br>
> as unfortunately the new parallel file classification feature from<br>
> upstream trips over somewhere in libmagic when inspected files are<br>
> compressed:<br>
> <a href="https://github.com/rpm-software-management/rpm/issues/756" rel="noreferrer" target="_blank">https://github.com/rpm-software-management/rpm/issues/756</a><br>
<br>
is this series v2 or a resent?<br></blockquote><div><br></div><div>It's a v2, addressing feedback I got.</div><div><br></div><div>Alex<br></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">
><br>
> Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> ---<br>
> ...satisfiable-dependency-when-building.patch | 28 +-<br>
> ...lib-rpm-as-the-installation-path-for.patch | 14 +-<br>
> ...kage-building-into-a-separate-functi.patch | 84 -----<br>
> ...es-requires-do-not-use-monodis-from-.patch | 58 ---<br>
> ...-run-file-classification-in-parallel.patch | 65 ++++<br>
> ...ry-package-creation-via-thread-pools.patch | 127 -------<br>
> ...e-operations-over-string-pools-threa.patch | 207 -----------<br>
> ...ove-static-local-variables-from-buil.patch | 336 ------------------<br>
> .../rpm/{<a href="http://rpm_4.14.2.1.bb" rel="noreferrer" target="_blank">rpm_4.14.2.1.bb</a> => <a href="http://rpm_4.15.1.bb" rel="noreferrer" target="_blank">rpm_4.15.1.bb</a>} | 15 +-<br>
> 9 files changed, 90 insertions(+), 844 deletions(-)<br>
> delete mode 100644 meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch<br>
> delete mode 100644 meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch<br>
> create mode 100644 meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch<br>
> delete mode 100644 meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch<br>
> delete mode 100644 meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch<br>
> delete mode 100644 meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch<br>
> rename meta/recipes-devtools/rpm/{<a href="http://rpm_4.14.2.1.bb" rel="noreferrer" target="_blank">rpm_4.14.2.1.bb</a> => <a href="http://rpm_4.15.1.bb" rel="noreferrer" target="_blank">rpm_4.15.1.bb</a>} (90%)<br>
><br>
> diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch<br>
> index 80e2f0fad70..4029233fb70 100644<br>
> --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch<br>
> +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch<br>
> @@ -1,4 +1,4 @@<br>
> -From 87cfc0db1ed6fe381a5ed5f0016d8c3344a31a11 Mon Sep 17 00:00:00 2001<br>
> +From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001<br>
> From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> Date: Mon, 9 Jan 2017 18:52:11 +0200<br>
> Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in<br>
> @@ -9,25 +9,23 @@ hand produces rpms that way by design.<br>
> <br>
> Upstream-Status: Inappropriate [oe-core specific]<br>
> Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +<br>
> ---<br>
> build/pack.c | 4 ----<br>
> 1 file changed, 4 deletions(-)<br>
> <br>
> diff --git a/build/pack.c b/build/pack.c<br>
> -index 1261cdbba..bb2d6f4f6 100644<br>
> +index e6cec1816..810cd7351 100644<br>
> --- a/build/pack.c<br>
> +++ b/build/pack.c<br>
> -@@ -595,10 +595,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> - headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);<br>
> - }<br>
> +@@ -724,10 +724,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch<br>
> + headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);<br>
> + }<br>
> + <br>
> +- if (cheating) {<br>
> +- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");<br>
> +- }<br>
> +-<br>
> + if ((rc = getPkgFilename(pkg->header, filename)))<br>
> + return rc;<br>
> <br>
> -- if (cheating) {<br>
> -- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");<br>
> -- }<br>
> -- <br>
> - { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL);<br>
> - char *binRpm, *binDir;<br>
> - binRpm = headerFormat(pkg->header, binFormat, &errorString);<br>
> --- <br>
> -2.11.0<br>
> -<br>
> diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch<br>
> index 82e7328757f..52440d68180 100644<br>
> --- a/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch<br>
> +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-hardcode-lib-rpm-as-the-installation-path-for.patch<br>
> @@ -1,4 +1,4 @@<br>
> -From bd08eb0ae1312f347f49949481daa7c923752df2 Mon Sep 17 00:00:00 2001<br>
> +From 2f3d1619b6510bc131c4375827caf912559f0fa2 Mon Sep 17 00:00:00 2001<br>
> From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> Date: Mon, 27 Feb 2017 09:43:30 +0200<br>
> Subject: [PATCH] Do not hardcode "lib/rpm" as the installation path for<br>
> @@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> 3 files changed, 4 insertions(+), 4 deletions(-)<br>
> <br>
> diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -index 09af7c4..9bd6903 100644<br>
> +index d3aeab86e..1a1f3f91f 100644<br>
> --- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> +++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -@@ -1055,7 +1055,7 @@ else<br>
> +@@ -1086,7 +1086,7 @@ else<br>
> usrprefix=$prefix<br>
> fi<br>
> <br>
> @@ -27,10 +27,10 @@ index 09af7c4..9bd6903 100644<br>
> <br>
> AC_SUBST(OBJDUMP)<br>
> diff --git a/<a href="http://macros.in" rel="noreferrer" target="_blank">macros.in</a> b/<a href="http://macros.in" rel="noreferrer" target="_blank">macros.in</a><br>
> -index a3aa7a9..62cee5c 100644<br>
> +index fe9803aad..d128675bf 100644<br>
> --- a/<a href="http://macros.in" rel="noreferrer" target="_blank">macros.in</a><br>
> +++ b/<a href="http://macros.in" rel="noreferrer" target="_blank">macros.in</a><br>
> -@@ -970,7 +970,7 @@ package or when debugging this package.\<br>
> +@@ -985,7 +985,7 @@ package or when debugging this package.\<br>
> %_sharedstatedir %{_prefix}/com<br>
> %_localstatedir %{_prefix}/var<br>
> %_lib lib<br>
> @@ -40,7 +40,7 @@ index a3aa7a9..62cee5c 100644<br>
> %_infodir %{_datadir}/info<br>
> %_mandir %{_datadir}/man<br>
> diff --git a/<a href="http://rpm.am" rel="noreferrer" target="_blank">rpm.am</a> b/<a href="http://rpm.am" rel="noreferrer" target="_blank">rpm.am</a><br>
> -index 82c2d7c..6341b51 100644<br>
> +index 40b4ec55f..3139ce8f6 100644<br>
> --- a/<a href="http://rpm.am" rel="noreferrer" target="_blank">rpm.am</a><br>
> +++ b/<a href="http://rpm.am" rel="noreferrer" target="_blank">rpm.am</a><br>
> @@ -1,10 +1,10 @@<br>
> @@ -55,4 +55,4 @@ index 82c2d7c..6341b51 100644<br>
> +rpmconfigdir = $(libdir)/rpm<br>
> <br>
> # Libtool version (current-revision-age) for all our libraries<br>
> - rpm_version_info = 9:0:1<br>
> + rpm_version_info = 9:1:0<br>
> diff --git a/meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch b/meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch<br>
> deleted file mode 100644<br>
> index 6e44f0b7fc9..00000000000<br>
> --- a/meta/recipes-devtools/rpm/files/0001-Split-binary-package-building-into-a-separate-functi.patch<br>
> +++ /dev/null<br>
> @@ -1,84 +0,0 @@<br>
> -From 721a660a507d6d062e7aecafad886c643970a5d5 Mon Sep 17 00:00:00 2001<br>
> -From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -Date: Thu, 25 May 2017 18:15:27 +0300<br>
> -Subject: [PATCH 1/4] Split binary package building into a separate function<br>
> -<br>
> -So that it can be run as a thread pool task.<br>
> -<br>
> -Upstream-Status: Submitted [<a href="https://github.com/rpm-software-management/rpm/pull/226" rel="noreferrer" target="_blank">https://github.com/rpm-software-management/rpm/pull/226</a>]<br>
> -Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -<br>
> ----<br>
> - build/pack.c | 33 +++++++++++++++++++++------------<br>
> - 1 file changed, 21 insertions(+), 12 deletions(-)<br>
> -<br>
> -diff --git a/build/pack.c b/build/pack.c<br>
> -index 518f4e92a..ccfd614cc 100644<br>
> ---- a/build/pack.c<br>
> -+++ b/build/pack.c<br>
> -@@ -546,18 +546,13 @@ static rpmRC checkPackages(char *pkgcheck)<br>
> - return RPMRC_OK;<br>
> - }<br>
> - <br>
> --rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> -+static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int cheating, char** filename)<br>
> - {<br>
> -- rpmRC rc;<br>
> -- const char *errorString;<br>
> -- Package pkg;<br>
> -- char *pkglist = NULL;<br>
> --<br>
> -- for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {<br>
> -- char *fn;<br>
> -+ const char *errorString;<br>
> -+ rpmRC rc = RPMRC_OK;<br>
> - <br>
> - if (pkg->fileList == NULL)<br>
> -- continue;<br>
> -+ return rc;<br>
> - <br>
> - if ((rc = processScriptFiles(spec, pkg)))<br>
> - return rc;<br>
> -@@ -587,7 +582,7 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> - headerGetString(pkg->header, RPMTAG_NAME), errorString);<br>
> - return RPMRC_FAIL;<br>
> - }<br>
> -- fn = rpmGetPath("%{_rpmdir}/", binRpm, NULL);<br>
> -+ *filename = rpmGetPath("%{_rpmdir}/", binRpm, NULL);<br>
> - if ((binDir = strchr(binRpm, '/')) != NULL) {<br>
> - struct stat st;<br>
> - char *dn;<br>
> -@@ -609,14 +604,28 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> - free(binRpm);<br>
> - }<br>
> - <br>
> -- rc = writeRPM(pkg, NULL, fn, NULL);<br>
> -+ rc = writeRPM(pkg, NULL, *filename, NULL);<br>
> - if (rc == RPMRC_OK) {<br>
> - /* Do check each written package if enabled */<br>
> -- char *pkgcheck = rpmExpand("%{?_build_pkgcheck} ", fn, NULL);<br>
> -+ char *pkgcheck = rpmExpand("%{?_build_pkgcheck} ", *filename, NULL);<br>
> - if (pkgcheck[0] != ' ') {<br>
> - rc = checkPackages(pkgcheck);<br>
> - }<br>
> - free(pkgcheck);<br>
> -+ }<br>
> -+ return rc;<br>
> -+}<br>
> -+<br>
> -+rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> -+{<br>
> -+ rpmRC rc;<br>
> -+ Package pkg;<br>
> -+ char *pkglist = NULL;<br>
> -+<br>
> -+ for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {<br>
> -+ char *fn = NULL;<br>
> -+ rc = packageBinary(spec, pkg, cookie, cheating, &fn);<br>
> -+ if (rc == RPMRC_OK) {<br>
> - rstrcat(&pkglist, fn);<br>
> - rstrcat(&pkglist, " ");<br>
> - }<br>
> --- <br>
> -2.11.0<br>
> -<br>
> diff --git a/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch b/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch<br>
> deleted file mode 100644<br>
> index 24aa4c7ffff..00000000000<br>
> --- a/meta/recipes-devtools/rpm/files/0001-mono-find-provides-requires-do-not-use-monodis-from-.patch<br>
> +++ /dev/null<br>
> @@ -1,58 +0,0 @@<br>
> -From 43fbc3f53302a395463e8450ac81c53f623eec3f Mon Sep 17 00:00:00 2001<br>
> -From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -Date: Tue, 27 Aug 2019 17:42:34 +0200<br>
> -Subject: [PATCH] mono-find-provides/requires: do not use monodis from the host<br>
> -<br>
> -There was a host contamination issue here: if monodis was installed<br>
> -on the host, do_package would use that to resolve dependencies<br>
> -of mono libraries (and often fail in that). Without monodis,<br>
> -no dependencies are resolved, which is seemingly how things<br>
> -are supposed to work.<br>
> -<br>
> -Upstream-Status: Inappropriate [oe-core specific]<br>
> -Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> ----<br>
> - scripts/mono-find-provides | 8 ++++----<br>
> - scripts/mono-find-requires | 8 ++++----<br>
> - 2 files changed, 8 insertions(+), 8 deletions(-)<br>
> -<br>
> -diff --git a/scripts/mono-find-provides b/scripts/mono-find-provides<br>
> -index 9348457d3..b28872ffb 100644<br>
> ---- a/scripts/mono-find-provides<br>
> -+++ b/scripts/mono-find-provides<br>
> -@@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$"))<br>
> - build_bindir="$2/usr/bin"<br>
> - build_libdir="$2$3"<br>
> - <br>
> --if [ -x $build_bindir/monodis ]; then<br>
> -- monodis="$build_bindir/monodis"<br>
> -+if [ -x $build_bindir/monodis.bogus ]; then<br>
> -+ monodis="$build_bindir/monodis.bogus"<br>
> - export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}<br>
> --elif [ -x /usr/bin/monodis ]; then<br>
> -- monodis="/usr/bin/monodis"<br>
> -+elif [ -x /usr/bin/monodis.bogus ]; then<br>
> -+ monodis="/usr/bin/monodis.bogus"<br>
> - else<br>
> - exit 0;<br>
> - fi<br>
> -diff --git a/scripts/mono-find-requires b/scripts/mono-find-requires<br>
> -index ea58cae48..d270169e1 100644<br>
> ---- a/scripts/mono-find-requires<br>
> -+++ b/scripts/mono-find-requires<br>
> -@@ -18,11 +18,11 @@ monolist=($(printf "%s\n" "${filelist[@]}" | grep -E "\\.(exe|dll)\$"))<br>
> - build_bindir="$2/usr/bin"<br>
> - build_libdir="$2$3"<br>
> - <br>
> --if [ -x $build_bindir/monodis ]; then<br>
> -- monodis="$build_bindir/monodis"<br>
> -+if [ -x $build_bindir/monodis.bogus ]; then<br>
> -+ monodis="$build_bindir/monodis.bogus"<br>
> - export LD_LIBRARY_PATH=$build_libdir${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}<br>
> --elif [ -x /usr/bin/monodis ]; then<br>
> -- monodis="/usr/bin/monodis"<br>
> -+elif [ -x /usr/bin/monodis.bogus ]; then<br>
> -+ monodis="/usr/bin/monodis.bogus"<br>
> - else<br>
> - exit 0;<br>
> - fi<br>
> diff --git a/meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch b/meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch<br>
> new file mode 100644<br>
> index 00000000000..d8d338792d3<br>
> --- /dev/null<br>
> +++ b/meta/recipes-devtools/rpm/files/0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch<br>
> @@ -0,0 +1,65 @@<br>
> +From 93c3c7f043f62e96941274e957c4ad9432032af1 Mon Sep 17 00:00:00 2001<br>
> +From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +Date: Mon, 18 Nov 2019 16:22:56 +0100<br>
> +Subject: [PATCH] rpmfc.c: do not run file classification in parallel<br>
> +<br>
> +This is causing freezes with libmagic when the file in question is compressed:<br>
> +<a href="https://github.com/rpm-software-management/rpm/issues/756" rel="noreferrer" target="_blank">https://github.com/rpm-software-management/rpm/issues/756</a><br>
> +<br>
> +Upstream-Status: Inappropriate [upstream wants a proper fix]<br>
> +Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> +---<br>
> + build/rpmfc.c | 8 --------<br>
> + 1 file changed, 8 deletions(-)<br>
> +<br>
> +diff --git a/build/rpmfc.c b/build/rpmfc.c<br>
> +index 3db7a9352..17afdd57a 100644<br>
> +--- a/build/rpmfc.c<br>
> ++++ b/build/rpmfc.c<br>
> +@@ -680,7 +680,6 @@ static void rpmfcAttributes(rpmfc fc, int ix, const char *ftype, const char *ful<br>
> + /* Add attributes on libmagic type & path pattern matches */<br>
> + if (matches(&(*attr)->incl, ftype, path, is_executable)) {<br>
> + argvAddTokens(&fc->fattrs[ix], (*attr)->name);<br>
> +- #pragma omp critical(fahash)<br>
> + fattrHashAddEntry(fc->fahash, attr-fc->atypes, ix);<br>
> + }<br>
> + }<br>
> +@@ -1105,7 +1104,6 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)<br>
> + /* Build (sorted) file class dictionary. */<br>
> + fc->cdict = rpmstrPoolCreate();<br>
> + <br>
> +- #pragma omp parallel<br>
> + {<br>
> + /* libmagic is not thread-safe, each thread needs to a private handle */<br>
> + magic_t ms = magic_open(msflags);<br>
> +@@ -1113,15 +1111,12 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)<br>
> + if (ms == NULL) {<br>
> + rpmlog(RPMLOG_ERR, _("magic_open(0x%x) failed: %s\n"),<br>
> + msflags, strerror(errno));<br>
> +- #pragma omp cancel parallel<br>
> + }<br>
> + <br>
> + if (magic_load(ms, NULL) == -1) {<br>
> + rpmlog(RPMLOG_ERR, _("magic_load failed: %s\n"), magic_error(ms));<br>
> +- #pragma omp cancel parallel<br>
> + }<br>
> + <br>
> +- #pragma omp for ordered reduction(+:nerrors)<br>
> + for (int ix = 0; ix < fc->nfiles; ix++) {<br>
> + rpmsid ftypeId;<br>
> + const char * ftype;<br>
> +@@ -1185,14 +1180,11 @@ rpmRC rpmfcClassify(rpmfc fc, ARGV_t argv, rpm_mode_t * fmode)<br>
> + fc->fcolor[ix] = fcolor;<br>
> + <br>
> + /* Add to file class dictionary and index array */<br>
> +- #pragma omp ordered<br>
> + if (fcolor != RPMFC_WHITE && (fcolor & RPMFC_INCLUDE)) {<br>
> + ftypeId = rpmstrPoolId(fc->cdict, ftype, 1);<br>
> +- #pragma omp atomic<br>
> + fc->fknown++;<br>
> + } else {<br>
> + ftypeId = rpmstrPoolId(fc->cdict, "", 1);<br>
> +- #pragma omp atomic<br>
> + fc->fwhite++;<br>
> + }<br>
> + /* Pool id's start from 1, for headers we want it from 0 */<br>
> diff --git a/meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch b/meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch<br>
> deleted file mode 100644<br>
> index d10041c2e14..00000000000<br>
> --- a/meta/recipes-devtools/rpm/files/0002-Run-binary-package-creation-via-thread-pools.patch<br>
> +++ /dev/null<br>
> @@ -1,127 +0,0 @@<br>
> -From 513200cf76758de4668312c628d6362bdabfaf4b Mon Sep 17 00:00:00 2001<br>
> -From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -Date: Thu, 25 May 2017 19:30:20 +0300<br>
> -Subject: [PATCH 1/3] Run binary package creation via thread pools.<br>
> -<br>
> -Upstream-Status: Submitted [<a href="https://github.com/rpm-software-management/rpm/pull/226" rel="noreferrer" target="_blank">https://github.com/rpm-software-management/rpm/pull/226</a>]<br>
> -Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -<br>
> ----<br>
> - build/pack.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++-----------<br>
> - <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 3 +++<br>
> - 2 files changed, 70 insertions(+), 14 deletions(-)<br>
> -<br>
> -diff --git a/build/pack.c b/build/pack.c<br>
> -index ccfd614cc..ed5b9ab4e 100644<br>
> ---- a/build/pack.c<br>
> -+++ b/build/pack.c<br>
> -@@ -616,25 +616,78 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch<br>
> - return rc;<br>
> - }<br>
> - <br>
> --rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> -+struct binaryPackageTaskData<br>
> - {<br>
> -- rpmRC rc;<br>
> - Package pkg;<br>
> -+ char *filename;<br>
> -+ rpmRC result;<br>
> -+ struct binaryPackageTaskData *next;<br>
> -+};<br>
> -+<br>
> -+static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const char *cookie, int cheating)<br>
> -+{<br>
> -+ struct binaryPackageTaskData *tasks = NULL;<br>
> -+ struct binaryPackageTaskData *task = NULL;<br>
> -+ struct binaryPackageTaskData *prev = NULL;<br>
> -+<br>
> -+ for (Package pkg = spec->packages; pkg != NULL; pkg = pkg->next) {<br>
> -+ task = rcalloc(1, sizeof(*task));<br>
> -+ task->pkg = pkg;<br>
> -+ if (pkg == spec->packages) {<br>
> -+ // the first package needs to be processed ahead of others, as they copy<br>
> -+ // changelog data from it, and so otherwise data races would happen<br>
> -+ task->result = packageBinary(spec, pkg, cookie, cheating, &(task->filename));<br>
> -+ rpmlog(RPMLOG_NOTICE, _("Finished binary package job, result %d, filename %s\n"), task->result, task->filename);<br>
> -+ tasks = task;<br>
> -+ }<br>
> -+ if (prev != NULL) {<br>
> -+ prev->next = task;<br>
> -+ }<br>
> -+ prev = task;<br>
> -+ }<br>
> -+<br>
> -+ #pragma omp parallel<br>
> -+ #pragma omp single<br>
> -+ // re-declaring task variable is necessary, or older gcc versions will produce code that segfaults<br>
> -+ for (struct binaryPackageTaskData *task = tasks; task != NULL; task = task->next) {<br>
> -+ if (task != tasks)<br>
> -+ #pragma omp task<br>
> -+ {<br>
> -+ task->result = packageBinary(spec, task->pkg, cookie, cheating, &(task->filename));<br>
> -+ rpmlog(RPMLOG_NOTICE, _("Finished binary package job, result %d, filename %s\n"), task->result, task->filename);<br>
> -+ }<br>
> -+ }<br>
> -+<br>
> -+ return tasks;<br>
> -+}<br>
> -+<br>
> -+static void freeBinaryPackageTasks(struct binaryPackageTaskData* tasks)<br>
> -+{<br>
> -+ while (tasks != NULL) {<br>
> -+ struct binaryPackageTaskData* next = tasks->next;<br>
> -+ rfree(tasks->filename);<br>
> -+ rfree(tasks);<br>
> -+ tasks = next;<br>
> -+ }<br>
> -+}<br>
> -+<br>
> -+rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> -+{<br>
> - char *pkglist = NULL;<br>
> - <br>
> -- for (pkg = spec->packages; pkg != NULL; pkg = pkg->next) {<br>
> -- char *fn = NULL;<br>
> -- rc = packageBinary(spec, pkg, cookie, cheating, &fn);<br>
> -- if (rc == RPMRC_OK) {<br>
> -- rstrcat(&pkglist, fn);<br>
> -- rstrcat(&pkglist, " ");<br>
> -- }<br>
> -- free(fn);<br>
> -- if (rc != RPMRC_OK) {<br>
> -- pkglist = _free(pkglist);<br>
> -- return rc;<br>
> -- }<br>
> -+ struct binaryPackageTaskData *tasks = runBinaryPackageTasks(spec, cookie, cheating);<br>
> -+<br>
> -+ for (struct binaryPackageTaskData *task = tasks; task != NULL; task = task->next) {<br>
> -+ if (task->result == RPMRC_OK) {<br>
> -+ rstrcat(&pkglist, task->filename);<br>
> -+ rstrcat(&pkglist, " ");<br>
> -+ } else {<br>
> -+ _free(pkglist);<br>
> -+ freeBinaryPackageTasks(tasks);<br>
> -+ return RPMRC_FAIL;<br>
> -+ }<br>
> - }<br>
> -+ freeBinaryPackageTasks(tasks);<br>
> - <br>
> - /* Now check the package set if enabled */<br>
> - if (pkglist != NULL) {<br>
> -diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -index a506ec819..59fa0acaf 100644<br>
> ---- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -+++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
> -@@ -17,6 +17,9 @@ AC_DISABLE_STATIC<br>
> - <br>
> - PKG_PROG_PKG_CONFIG<br>
> - <br>
> -+AC_OPENMP<br>
> -+RPMCFLAGS="$OPENMP_CFLAGS $RPMCFLAGS"<br>
> -+<br>
> - dnl Checks for programs.<br>
> - AC_PROG_CXX<br>
> - AC_PROG_AWK<br>
> --- <br>
> -2.11.0<br>
> -<br>
> diff --git a/meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch b/meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch<br>
> deleted file mode 100644<br>
> index c348ae5330e..00000000000<br>
> --- a/meta/recipes-devtools/rpm/files/0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch<br>
> +++ /dev/null<br>
> @@ -1,207 +0,0 @@<br>
> -From c80892f17e44331206c8318d53b63bb6a99554d0 Mon Sep 17 00:00:00 2001<br>
> -From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -Date: Tue, 30 May 2017 13:58:30 +0300<br>
> -Subject: [PATCH 3/4] rpmstrpool.c: make operations over string pools<br>
> - thread-safe<br>
> -<br>
> -Otherwise multithreaded rpm building explodes in various ways due<br>
> -to data races.<br>
> -<br>
> -Upstream-Status: Submitted [<a href="https://github.com/rpm-software-management/rpm/pull/226" rel="noreferrer" target="_blank">https://github.com/rpm-software-management/rpm/pull/226</a>]<br>
> -Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -<br>
> ----<br>
> - rpmio/rpmstrpool.c | 56 +++++++++++++++++++++++++++++++++++++++++++++---------<br>
> - 1 file changed, 47 insertions(+), 9 deletions(-)<br>
> -<br>
> -diff --git a/rpmio/rpmstrpool.c b/rpmio/rpmstrpool.c<br>
> -index 30a57eb10..58ba95a02 100644<br>
> ---- a/rpmio/rpmstrpool.c<br>
> -+++ b/rpmio/rpmstrpool.c<br>
> -@@ -113,6 +113,8 @@ static poolHash poolHashCreate(int numBuckets)<br>
> - return ht;<br>
> - }<br>
> - <br>
> -+static const char * rpmstrPoolStrNoLock(rpmstrPool pool, rpmsid sid);<br>
> -+<br>
> - static void poolHashResize(rpmstrPool pool, int numBuckets)<br>
> - {<br>
> - poolHash ht = pool->hash;<br>
> -@@ -120,7 +122,7 @@ static void poolHashResize(rpmstrPool pool, int numBuckets)<br>
> - <br>
> - for (int i=0; i<ht->numBuckets; i++) {<br>
> - if (!ht->buckets[i].keyid) continue;<br>
> -- unsigned int keyHash = rstrhash(rpmstrPoolStr(pool, ht->buckets[i].keyid));<br>
> -+ unsigned int keyHash = rstrhash(rpmstrPoolStrNoLock(pool, ht->buckets[i].keyid));<br>
> - for (unsigned int j=0;;j++) {<br>
> - unsigned int hash = hashbucket(keyHash, j) % numBuckets;<br>
> - if (!buckets[hash].keyid) {<br>
> -@@ -149,7 +151,7 @@ static void poolHashAddHEntry(rpmstrPool pool, const char * key, unsigned int ke<br>
> - ht->buckets[hash].keyid = keyid;<br>
> - ht->keyCount++;<br>
> - break;<br>
> -- } else if (!strcmp(rpmstrPoolStr(pool, ht->buckets[hash].keyid), key)) {<br>
> -+ } else if (!strcmp(rpmstrPoolStrNoLock(pool, ht->buckets[hash].keyid), key)) {<br>
> - return;<br>
> - }<br>
> - }<br>
> -@@ -191,7 +193,7 @@ static void poolHashPrintStats(rpmstrPool pool)<br>
> - int maxcollisions = 0;<br>
> - <br>
> - for (i=0; i<ht->numBuckets; i++) {<br>
> -- unsigned int keyHash = rstrhash(rpmstrPoolStr(pool, ht->buckets[i].keyid));<br>
> -+ unsigned int keyHash = rstrhash(rpmstrPoolStrNoLock(pool, ht->buckets[i].keyid));<br>
> - for (unsigned int j=0;;j++) {<br>
> - unsigned int hash = hashbucket(keyHash, i) % ht->numBuckets;<br>
> - if (hash==i) {<br>
> -@@ -221,7 +223,7 @@ static void rpmstrPoolRehash(rpmstrPool pool)<br>
> - <br>
> - pool->hash = poolHashCreate(sizehint);<br>
> - for (int i = 1; i <= pool->offs_size; i++)<br>
> -- poolHashAddEntry(pool, rpmstrPoolStr(pool, i), i);<br>
> -+ poolHashAddEntry(pool, rpmstrPoolStrNoLock(pool, i), i);<br>
> - }<br>
> - <br>
> - rpmstrPool rpmstrPoolCreate(void)<br>
> -@@ -245,6 +247,8 @@ rpmstrPool rpmstrPoolCreate(void)<br>
> - <br>
> - rpmstrPool rpmstrPoolFree(rpmstrPool pool)<br>
> - {<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> - if (pool) {<br>
> - if (pool->nrefs > 1) {<br>
> - pool->nrefs--;<br>
> -@@ -260,18 +264,24 @@ rpmstrPool rpmstrPoolFree(rpmstrPool pool)<br>
> - free(pool);<br>
> - }<br>
> - }<br>
> -+ }<br>
> - return NULL;<br>
> - }<br>
> - <br>
> - rpmstrPool rpmstrPoolLink(rpmstrPool pool)<br>
> - {<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> - if (pool)<br>
> - pool->nrefs++;<br>
> -+ }<br>
> - return pool;<br>
> - }<br>
> - <br>
> - void rpmstrPoolFreeze(rpmstrPool pool, int keephash)<br>
> - {<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> - if (pool && !pool->frozen) {<br>
> - if (!keephash) {<br>
> - pool->hash = poolHashFree(pool->hash);<br>
> -@@ -281,16 +291,20 @@ void rpmstrPoolFreeze(rpmstrPool pool, int keephash)<br>
> - pool->offs_alloced * sizeof(*pool->offs));<br>
> - pool->frozen = 1;<br>
> - }<br>
> -+ }<br>
> - }<br>
> - <br>
> - void rpmstrPoolUnfreeze(rpmstrPool pool)<br>
> - {<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> - if (pool) {<br>
> - if (pool->hash == NULL) {<br>
> - rpmstrPoolRehash(pool);<br>
> - }<br>
> - pool->frozen = 0;<br>
> - }<br>
> -+ }<br>
> - }<br>
> - <br>
> - static rpmsid rpmstrPoolPut(rpmstrPool pool, const char *s, size_t slen, unsigned int hash)<br>
> -@@ -350,7 +364,7 @@ static rpmsid rpmstrPoolGet(rpmstrPool pool, const char * key, size_t keylen,<br>
> - return 0;<br>
> - }<br>
> - <br>
> -- s = rpmstrPoolStr(pool, ht->buckets[hash].keyid);<br>
> -+ s = rpmstrPoolStrNoLock(pool, ht->buckets[hash].keyid);<br>
> - /* pool string could be longer than keylen, require exact matche */<br>
> - if (strncmp(s, key, keylen) == 0 && s[keylen] == '\0')<br>
> - return ht->buckets[hash].keyid;<br>
> -@@ -373,27 +387,31 @@ static inline rpmsid strn2id(rpmstrPool pool, const char *s, size_t slen,<br>
> - rpmsid rpmstrPoolIdn(rpmstrPool pool, const char *s, size_t slen, int create)<br>
> - {<br>
> - rpmsid sid = 0;<br>
> --<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> - if (s != NULL) {<br>
> - unsigned int hash = rstrnhash(s, slen);<br>
> - sid = strn2id(pool, s, slen, hash, create);<br>
> - }<br>
> -+ }<br>
> - return sid;<br>
> - }<br>
> - <br>
> - rpmsid rpmstrPoolId(rpmstrPool pool, const char *s, int create)<br>
> - {<br>
> - rpmsid sid = 0;<br>
> --<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> - if (s != NULL) {<br>
> - size_t slen;<br>
> - unsigned int hash = rstrlenhash(s, &slen);<br>
> - sid = strn2id(pool, s, slen, hash, create);<br>
> - }<br>
> -+ }<br>
> - return sid;<br>
> - }<br>
> - <br>
> --const char * rpmstrPoolStr(rpmstrPool pool, rpmsid sid)<br>
> -+static const char * rpmstrPoolStrNoLock(rpmstrPool pool, rpmsid sid)<br>
> - {<br>
> - const char *s = NULL;<br>
> - if (pool && sid > 0 && sid <= pool->offs_size)<br>
> -@@ -401,12 +419,25 @@ const char * rpmstrPoolStr(rpmstrPool pool, rpmsid sid)<br>
> - return s;<br>
> - }<br>
> - <br>
> -+const char * rpmstrPoolStr(rpmstrPool pool, rpmsid sid)<br>
> -+{<br>
> -+ const char *s = NULL;<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> -+ s = rpmstrPoolStrNoLock(pool, sid);<br>
> -+ }<br>
> -+ return s;<br>
> -+}<br>
> -+<br>
> - size_t rpmstrPoolStrlen(rpmstrPool pool, rpmsid sid)<br>
> - {<br>
> - size_t slen = 0;<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> - if (pool && sid > 0 && sid <= pool->offs_size) {<br>
> - slen = strlen(pool->offs[sid]);<br>
> - }<br>
> -+ }<br>
> - return slen;<br>
> - }<br>
> - <br>
> -@@ -421,5 +452,12 @@ int rpmstrPoolStreq(rpmstrPool poolA, rpmsid sidA,<br>
> - <br>
> - rpmsid rpmstrPoolNumStr(rpmstrPool pool)<br>
> - {<br>
> -- return (pool != NULL) ? pool->offs_size : 0;<br>
> -+ rpmsid id = 0;<br>
> -+ #pragma omp critical(rpmstrpool)<br>
> -+ {<br>
> -+ if (pool) {<br>
> -+ id = pool->offs_size;<br>
> -+ }<br>
> -+ }<br>
> -+ return id;<br>
> - }<br>
> --- <br>
> -2.11.0<br>
> -<br>
> diff --git a/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch b/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch<br>
> deleted file mode 100644<br>
> index 652e30b3e4a..00000000000<br>
> --- a/meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch<br>
> +++ /dev/null<br>
> @@ -1,336 +0,0 @@<br>
> -From 792693bb90768cfde4898e8dd31ee1b5de803d2f Mon Sep 17 00:00:00 2001<br>
> -From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -Date: Thu, 8 Jun 2017 17:08:09 +0300<br>
> -Subject: [PATCH] build/pack.c: remove static local variables from buildHost()<br>
> - and getBuildTime()<br>
> -<br>
> -Their use is causing difficult to diagnoze data races when building multiple<br>
> -packages in parallel, and is a bad idea in general, as it also makes it more<br>
> -difficult to reason about code.<br>
> -<br>
> -Upstream-Status: Submitted [<a href="https://github.com/rpm-software-management/rpm/pull/226" rel="noreferrer" target="_blank">https://github.com/rpm-software-management/rpm/pull/226</a>]<br>
> -Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -<br>
> -Signed-off-by: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com" target="_blank">alex.kanavin@gmail.com</a>><br>
> -<br>
> ----<br>
> - build/build.c | 54 ++++++++++++++++++++++++++++--<br>
> - build/pack.c | 84 +++++++++--------------------------------------<br>
> - build/rpmbuild_internal.h | 8 +++--<br>
> - 3 files changed, 74 insertions(+), 72 deletions(-)<br>
> -<br>
> -diff --git a/build/build.c b/build/build.c<br>
> -index 13c3df2..b154f08 100644<br>
> ---- a/build/build.c<br>
> -+++ b/build/build.c<br>
> -@@ -6,6 +6,8 @@<br>
> - #include "system.h"<br>
> - <br>
> - #include <errno.h><br>
> -+#include <netdb.h><br>
> -+#include <time.h><br>
> - #include <sys/wait.h><br>
> - <br>
> - #include <rpm/rpmlog.h><br>
> -@@ -16,6 +18,50 @@<br>
> - <br>
> - #include "debug.h"<br>
> - <br>
> -+static rpm_time_t getBuildTime(void)<br>
> -+{<br>
> -+ rpm_time_t buildTime = 0;<br>
> -+ char *srcdate;<br>
> -+ time_t epoch;<br>
> -+ char *endptr;<br>
> -+<br>
> -+ srcdate = getenv("SOURCE_DATE_EPOCH");<br>
> -+ if (srcdate) {<br>
> -+ errno = 0;<br>
> -+ epoch = strtol(srcdate, &endptr, 10);<br>
> -+ if (srcdate == endptr || *endptr || errno != 0)<br>
> -+ rpmlog(RPMLOG_ERR, _("unable to parse SOURCE_DATE_EPOCH\n"));<br>
> -+ else<br>
> -+ buildTime = (int32_t) epoch;<br>
> -+ } else<br>
> -+ buildTime = (int32_t) time(NULL);<br>
> -+<br>
> -+ return buildTime;<br>
> -+}<br>
> -+<br>
> -+static char * buildHost(void)<br>
> -+{<br>
> -+ char* hostname;<br>
> -+ struct hostent *hbn;<br>
> -+ char *bhMacro;<br>
> -+<br>
> -+ bhMacro = rpmExpand("%{?_buildhost}", NULL);<br>
> -+ if (strcmp(bhMacro, "") != 0) {<br>
> -+ rasprintf(&hostname, "%s", bhMacro);<br>
> -+ } else {<br>
> -+ hostname = rcalloc(1024, sizeof(*hostname));<br>
> -+ (void) gethostname(hostname, 1024);<br>
> -+ hbn = gethostbyname(hostname);<br>
> -+ if (hbn)<br>
> -+ strcpy(hostname, hbn->h_name);<br>
> -+ else<br>
> -+ rpmlog(RPMLOG_WARNING,<br>
> -+ _("Could not canonicalize hostname: %s\n"), hostname);<br>
> -+ }<br>
> -+ free(bhMacro);<br>
> -+ return(hostname);<br>
> -+}<br>
> -+<br>
> - /**<br>
> - */<br>
> - static rpmRC doRmSource(rpmSpec spec)<br>
> -@@ -201,6 +247,9 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what)<br>
> - rpmRC rc = RPMRC_OK;<br>
> - int test = (what & RPMBUILD_NOBUILD);<br>
> - char *cookie = buildArgs->cookie ? xstrdup(buildArgs->cookie) : NULL;<br>
> -+ const char* host = buildHost();<br>
> -+ rpm_time_t buildTime = getBuildTime();<br>
> -+<br>
> - <br>
> - if (rpmExpandNumeric("%{?source_date_epoch_from_changelog}") &&<br>
> - getenv("SOURCE_DATE_EPOCH") == NULL) {<br>
> -@@ -269,11 +318,11 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what)<br>
> - goto exit;<br>
> - <br>
> - if (((what & RPMBUILD_PACKAGESOURCE) && !test) &&<br>
> -- (rc = packageSources(spec, &cookie)))<br>
> -+ (rc = packageSources(spec, &cookie, buildTime, host)))<br>
> - goto exit;<br>
> - <br>
> - if (((what & RPMBUILD_PACKAGEBINARY) && !test) &&<br>
> -- (rc = packageBinaries(spec, cookie, (didBuild == 0))))<br>
> -+ (rc = packageBinaries(spec, cookie, (didBuild == 0), buildTime, host)))<br>
> - goto exit;<br>
> - <br>
> - if ((what & RPMBUILD_CLEAN) &&<br>
> -@@ -293,6 +342,7 @@ static rpmRC buildSpec(BTA_t buildArgs, rpmSpec spec, int what)<br>
> - (void) unlink(spec->specFile);<br>
> - <br>
> - exit:<br>
> -+ free(host);<br>
> - free(cookie);<br>
> - spec->rootDir = NULL;<br>
> - if (rc != RPMRC_OK && rpmlogGetNrecs() > 0) {<br>
> -diff --git a/build/pack.c b/build/pack.c<br>
> -index df15876..17a4b09 100644<br>
> ---- a/build/pack.c<br>
> -+++ b/build/pack.c<br>
> -@@ -6,8 +6,6 @@<br>
> - #include "system.h"<br>
> - <br>
> - #include <errno.h><br>
> --#include <netdb.h><br>
> --#include <time.h><br>
> - #include <sys/wait.h><br>
> - <br>
> - #include <rpm/rpmlib.h> /* RPMSIGTAG*, rpmReadPackageFile */<br>
> -@@ -152,57 +150,6 @@ exit:<br>
> - return rc;<br>
> - }<br>
> - <br>
> --static rpm_time_t * getBuildTime(void)<br>
> --{<br>
> -- static rpm_time_t buildTime[1];<br>
> -- char *srcdate;<br>
> -- time_t epoch;<br>
> -- char *endptr;<br>
> --<br>
> -- if (buildTime[0] == 0) {<br>
> -- srcdate = getenv("SOURCE_DATE_EPOCH");<br>
> -- if (srcdate) {<br>
> -- errno = 0;<br>
> -- epoch = strtol(srcdate, &endptr, 10);<br>
> -- if (srcdate == endptr || *endptr || errno != 0)<br>
> -- rpmlog(RPMLOG_ERR, _("unable to parse SOURCE_DATE_EPOCH\n"));<br>
> -- else<br>
> -- buildTime[0] = (int32_t) epoch;<br>
> -- } else<br>
> -- buildTime[0] = (int32_t) time(NULL);<br>
> -- }<br>
> --<br>
> -- return buildTime;<br>
> --}<br>
> --<br>
> --static const char * buildHost(void)<br>
> --{<br>
> -- static char hostname[1024];<br>
> -- static int oneshot = 0;<br>
> -- struct hostent *hbn;<br>
> -- char *bhMacro;<br>
> --<br>
> -- if (! oneshot) {<br>
> -- bhMacro = rpmExpand("%{?_buildhost}", NULL);<br>
> -- if (strcmp(bhMacro, "") != 0 && strlen(bhMacro) < 1024) {<br>
> -- strcpy(hostname, bhMacro);<br>
> -- } else {<br>
> -- if (strcmp(bhMacro, "") != 0)<br>
> -- rpmlog(RPMLOG_WARNING, _("The _buildhost macro is too long\n"));<br>
> -- (void) gethostname(hostname, sizeof(hostname));<br>
> -- hbn = gethostbyname(hostname);<br>
> -- if (hbn)<br>
> -- strcpy(hostname, hbn->h_name);<br>
> -- else<br>
> -- rpmlog(RPMLOG_WARNING,<br>
> -- _("Could not canonicalize hostname: %s\n"), hostname);<br>
> -- }<br>
> -- free(bhMacro);<br>
> -- oneshot = 1;<br>
> -- }<br>
> -- return(hostname);<br>
> --}<br>
> --<br>
> - static rpmRC processScriptFiles(rpmSpec spec, Package pkg)<br>
> - {<br>
> - struct TriggerFileEntry *p;<br>
> -@@ -476,7 +423,8 @@ exit:<br>
> - * order to how the RPM format is laid on disk.<br>
> - */<br>
> - static rpmRC writeRPM(Package pkg, unsigned char ** pkgidp,<br>
> -- const char *fileName, char **cookie)<br>
> -+ const char *fileName, char **cookie,<br>
> -+ rpm_time_t buildTime, const char* buildHost)<br>
> - {<br>
> - FD_t fd = NULL;<br>
> - char * rpmio_flags = NULL;<br>
> -@@ -500,7 +448,7 @@ static rpmRC writeRPM(Package pkg, unsigned char ** pkgidp,<br>
> - <br>
> - /* Create and add the cookie */<br>
> - if (cookie) {<br>
> -- rasprintf(cookie, "%s %d", buildHost(), (int) (*getBuildTime()));<br>
> -+ rasprintf(cookie, "%s %d", buildHost, buildTime);<br>
> - headerPutString(pkg->header, RPMTAG_COOKIE, *cookie);<br>
> - }<br>
> - <br>
> -@@ -641,7 +589,7 @@ static rpmRC checkPackages(char *pkgcheck)<br>
> - return RPMRC_OK;<br>
> - }<br>
> - <br>
> --static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int cheating, char** filename)<br>
> -+static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int cheating, char** filename, rpm_time_t buildTime, const char* buildHost)<br>
> - {<br>
> - const char *errorString;<br>
> - rpmRC rc = RPMRC_OK;<br>
> -@@ -660,8 +608,8 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch<br>
> - headerCopyTags(spec->packages->header, pkg->header, copyTags);<br>
> - <br>
> - headerPutString(pkg->header, RPMTAG_RPMVERSION, VERSION);<br>
> -- headerPutString(pkg->header, RPMTAG_BUILDHOST, buildHost());<br>
> -- headerPutUint32(pkg->header, RPMTAG_BUILDTIME, getBuildTime(), 1);<br>
> -+ headerPutString(pkg->header, RPMTAG_BUILDHOST, buildHost);<br>
> -+ headerPutUint32(pkg->header, RPMTAG_BUILDTIME, &buildTime, 1);<br>
> - <br>
> - if (spec->sourcePkgId != NULL) {<br>
> - headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);<br>
> -@@ -699,7 +647,7 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch<br>
> - free(binRpm);<br>
> - }<br>
> - <br>
> -- rc = writeRPM(pkg, NULL, *filename, NULL);<br>
> -+ rc = writeRPM(pkg, NULL, *filename, NULL, buildTime, buildHost);<br>
> - if (rc == RPMRC_OK) {<br>
> - /* Do check each written package if enabled */<br>
> - char *pkgcheck = rpmExpand("%{?_build_pkgcheck} ", *filename, NULL);<br>
> -@@ -719,7 +667,7 @@ struct binaryPackageTaskData<br>
> - struct binaryPackageTaskData *next;<br>
> - };<br>
> - <br>
> --static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const char *cookie, int cheating)<br>
> -+static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const char *cookie, int cheating, rpm_time_t buildTime, char* buildHost)<br>
> - {<br>
> - struct binaryPackageTaskData *tasks = NULL;<br>
> - struct binaryPackageTaskData *task = NULL;<br>
> -@@ -731,7 +679,7 @@ static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const c<br>
> - if (pkg == spec->packages) {<br>
> - // the first package needs to be processed ahead of others, as they copy<br>
> - // changelog data from it, and so otherwise data races would happen<br>
> -- task->result = packageBinary(spec, pkg, cookie, cheating, &(task->filename));<br>
> -+ task->result = packageBinary(spec, pkg, cookie, cheating, &(task->filename), buildTime, buildHost);<br>
> - rpmlog(RPMLOG_NOTICE, _("Finished binary package job, result %d, filename %s\n"), task->result, task->filename);<br>
> - tasks = task;<br>
> - }<br>
> -@@ -748,7 +696,7 @@ static struct binaryPackageTaskData* runBinaryPackageTasks(rpmSpec spec, const c<br>
> - if (task != tasks)<br>
> - #pragma omp task<br>
> - {<br>
> -- task->result = packageBinary(spec, task->pkg, cookie, cheating, &(task->filename));<br>
> -+ task->result = packageBinary(spec, task->pkg, cookie, cheating, &(task->filename), buildTime, buildHost);<br>
> - rpmlog(RPMLOG_NOTICE, _("Finished binary package job, result %d, filename %s\n"), task->result, task->filename);<br>
> - }<br>
> - }<br>
> -@@ -766,11 +714,11 @@ static void freeBinaryPackageTasks(struct binaryPackageTaskData* tasks)<br>
> - }<br>
> - }<br>
> - <br>
> --rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> -+rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating, rpm_time_t buildTime, char* buildHost)<br>
> - {<br>
> - char *pkglist = NULL;<br>
> - <br>
> -- struct binaryPackageTaskData *tasks = runBinaryPackageTasks(spec, cookie, cheating);<br>
> -+ struct binaryPackageTaskData *tasks = runBinaryPackageTasks(spec, cookie, cheating, buildTime, buildHost);<br>
> - <br>
> - for (struct binaryPackageTaskData *task = tasks; task != NULL; task = task->next) {<br>
> - if (task->result == RPMRC_OK) {<br>
> -@@ -797,7 +745,7 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)<br>
> - return RPMRC_OK;<br>
> - }<br>
> - <br>
> --rpmRC packageSources(rpmSpec spec, char **cookie)<br>
> -+rpmRC packageSources(rpmSpec spec, char **cookie, rpm_time_t buildTime, char* buildHost)<br>
> - {<br>
> - Package sourcePkg = spec->sourcePackage;<br>
> - rpmRC rc;<br>
> -@@ -805,8 +753,8 @@ rpmRC packageSources(rpmSpec spec, char **cookie)<br>
> - <br>
> - /* Add some cruft */<br>
> - headerPutString(sourcePkg->header, RPMTAG_RPMVERSION, VERSION);<br>
> -- headerPutString(sourcePkg->header, RPMTAG_BUILDHOST, buildHost());<br>
> -- headerPutUint32(sourcePkg->header, RPMTAG_BUILDTIME, getBuildTime(), 1);<br>
> -+ headerPutString(sourcePkg->header, RPMTAG_BUILDHOST, buildHost);<br>
> -+ headerPutUint32(sourcePkg->header, RPMTAG_BUILDTIME, &buildTime, 1);<br>
> - headerPutUint32(sourcePkg->header, RPMTAG_SOURCEPACKAGE, &one, 1);<br>
> - <br>
> - /* XXX this should be %_srpmdir */<br>
> -@@ -814,7 +762,7 @@ rpmRC packageSources(rpmSpec spec, char **cookie)<br>
> - char *pkgcheck = rpmExpand("%{?_build_pkgcheck_srpm} ", fn, NULL);<br>
> - <br>
> - spec->sourcePkgId = NULL;<br>
> -- rc = writeRPM(sourcePkg, &spec->sourcePkgId, fn, cookie);<br>
> -+ rc = writeRPM(sourcePkg, &spec->sourcePkgId, fn, cookie, buildTime, buildHost);<br>
> - <br>
> - /* Do check SRPM package if enabled */<br>
> - if (rc == RPMRC_OK && pkgcheck[0] != ' ') {<br>
> -diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h<br>
> -index 439b7d3..07e8338 100644<br>
> ---- a/build/rpmbuild_internal.h<br>
> -+++ b/build/rpmbuild_internal.h<br>
> -@@ -427,19 +427,23 @@ rpmRC processSourceFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags);<br>
> - * @param spec spec file control structure<br>
> - * @param cookie build identifier "cookie" or NULL<br>
> - * @param cheating was build shortcircuited?<br>
> -+ * @param buildTime the build timestamp that goes into packages<br>
> -+ * @param buildHost the hostname where the build is happening<br>
> - * @return RPMRC_OK on success<br>
> - */<br>
> - RPM_GNUC_INTERNAL<br>
> --rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating);<br>
> -+rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating, rpm_time_t buildTime, char* buildHost);<br>
> - <br>
> - /** \ingroup rpmbuild<br>
> - * Generate source package.<br>
> - * @param spec spec file control structure<br>
> - * @retval cookie build identifier "cookie" or NULL<br>
> -+ * @param buildTime the build timestamp that goes into packages<br>
> -+ * @param buildHost the hostname where the build is happening<br>
> - * @return RPMRC_OK on success<br>
> - */<br>
> - RPM_GNUC_INTERNAL<br>
> --rpmRC packageSources(rpmSpec spec, char **cookie);<br>
> -+rpmRC packageSources(rpmSpec spec, char **cookie, rpm_time_t buildTime, char* buildHost);<br>
> - <br>
> - RPM_GNUC_INTERNAL<br>
> - int addLangTag(rpmSpec spec, Header h, rpmTagVal tag,<br>
> diff --git a/meta/recipes-devtools/rpm/<a href="http://rpm_4.14.2.1.bb" rel="noreferrer" target="_blank">rpm_4.14.2.1.bb</a> b/meta/recipes-devtools/rpm/<a href="http://rpm_4.15.1.bb" rel="noreferrer" target="_blank">rpm_4.15.1.bb</a><br>
> similarity index 90%<br>
> rename from meta/recipes-devtools/rpm/<a href="http://rpm_4.14.2.1.bb" rel="noreferrer" target="_blank">rpm_4.14.2.1.bb</a><br>
> rename to meta/recipes-devtools/rpm/<a href="http://rpm_4.15.1.bb" rel="noreferrer" target="_blank">rpm_4.15.1.bb</a><br>
> index c37330eb4c6..5896e78e734 100644<br>
> --- a/meta/recipes-devtools/rpm/<a href="http://rpm_4.14.2.1.bb" rel="noreferrer" target="_blank">rpm_4.14.2.1.bb</a><br>
> +++ b/meta/recipes-devtools/rpm/<a href="http://rpm_4.15.1.bb" rel="noreferrer" target="_blank">rpm_4.15.1.bb</a><br>
> @@ -24,7 +24,7 @@ HOMEPAGE = "<a href="http://www.rpm.org" rel="noreferrer" target="_blank">http://www.rpm.org</a>"<br>
> LICENSE = "GPL-2.0"<br>
> LIC_FILES_CHKSUM = "file://COPYING;md5=c0bf017c0fd1920e6158a333acabfd4a"<br>
> <br>
> -SRC_URI = "git://<a href="http://github.com/rpm-software-management/rpm;branch=rpm-4.14.x" rel="noreferrer" target="_blank">github.com/rpm-software-management/rpm;branch=rpm-4.14.x</a> \<br>
> +SRC_URI = "git://<a href="http://github.com/rpm-software-management/rpm;branch=rpm-4.15.x" rel="noreferrer" target="_blank">github.com/rpm-software-management/rpm;branch=rpm-4.15.x</a> \<br>
> file://0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch \<br>
> file://0001-Do-not-read-config-files-from-HOME.patch \<br>
> file://0001-When-cross-installing-execute-package-scriptlets-wit.patch \<br>
> @@ -34,18 +34,14 @@ SRC_URI = "git://<a href="http://github.com/rpm-software-management/rpm;branch=rpm-4.14.x" rel="noreferrer" target="_blank">github.com/rpm-software-management/rpm;branch=rpm-4.14.x</a> \<br>
> file://0001-Fix-build-with-musl-C-library.patch \<br>
> file://0001-Add-a-color-setting-for-mips64_n32-binaries.patch \<br>
> file://0011-Do-not-require-that-ELF-binaries-are-executable-to-b.patch \<br>
> - file://0001-Split-binary-package-building-into-a-separate-functi.patch \<br>
> - file://0002-Run-binary-package-creation-via-thread-pools.patch \<br>
> - file://0003-rpmstrpool.c-make-operations-over-string-pools-threa.patch \<br>
> - file://0004-build-pack.c-remove-static-local-variables-from-buil.patch \<br>
> file://0001-perl-disable-auto-reqs.patch \<br>
> file://0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch \<br>
> file://0016-rpmscript.c-change-logging-level-around-scriptlets-t.patch \<br>
> - file://0001-mono-find-provides-requires-do-not-use-monodis-from-.patch \<br>
> + file://0001-rpmfc.c-do-not-run-file-classification-in-parallel.patch \<br>
> "<br>
> <br>
> PE = "1"<br>
> -SRCREV = "4a9440006398646583f0d9ae1837dad2875013aa"<br>
> +SRCREV = "ab2179452c5be276a6b96c591afded485c7e58c3"<br>
> <br>
> S = "${WORKDIR}/git"<br>
> <br>
> @@ -59,7 +55,7 @@ export PYTHON_ABI<br>
> EXTRA_AUTORECONF_append = " --exclude=gnu-configize"<br>
> <br>
> EXTRA_OECONF_append = " --without-lua --enable-python"<br>
> -EXTRA_OECONF_append_libc-musl = " --disable-nls"<br>
> +EXTRA_OECONF_append_libc-musl = " --disable-nls --disable-openmp"<br>
> <br>
> # --sysconfdir prevents rpm from attempting to access machine-specific configuration in sysroot/etc; we need to have it in rootfs<br>
> #<br>
> @@ -125,8 +121,7 @@ do_install_append () {<br>
> ${D}/${libdir}/rpm/macros<br>
> <br>
> sed -i -e 's|/usr/bin/python|${USRBINPATH}/env ${PYTHON_PN}|' \<br>
> - ${D}${libdir}/rpm/pythondistdeps.py \<br>
> - ${D}${libdir}/rpm/python-macro-helper<br>
> + ${D}${libdir}/rpm/pythondistdeps.py<br>
> }<br>
> <br>
> FILES_${PN} += "${libdir}/rpm-plugins/*.so \<br>
<br>
</blockquote></div></div>