diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2018-09-06 12:29:15 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-09-06 23:43:34 +0100 |
| commit | 4e4fc46589762914f10ae2fa41b614bcb32f9bb9 (patch) | |
| tree | 8b4b335ff1629126e1d70427b8471934d32a0c2d /meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch | |
| parent | dff0e6de970bb4c858c22874ea19328c670a4ad6 (diff) | |
| download | openembedded-core-4e4fc46589762914f10ae2fa41b614bcb32f9bb9.tar.gz | |
rpm: update to 4.14.2
Drop --disable-dbus option and patch: --disable-plugins is sufficient.
Drop upstreamed patches.
Drop a chunk of 0001-Do-not-reset-the-PATH-environment-variable-before-ru.patch, as upstream fixed the issue.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch')
| -rw-r--r-- | meta/recipes-devtools/rpm/files/0004-build-pack.c-remove-static-local-variables-from-buil.patch | 17 |
1 files changed, 7 insertions, 10 deletions
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 index 8989dcebd1..652e30b3e4 100644 --- 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 @@ -1,8 +1,8 @@ -From 8ce9fbab2990609bdace457e146160334e931c89 Mon Sep 17 00:00:00 2001 +From 792693bb90768cfde4898e8dd31ee1b5de803d2f Mon Sep 17 00:00:00 2001 From: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu, 8 Jun 2017 17:08:09 +0300 -Subject: [PATCH 14/15] build/pack.c: remove static local variables from - buildHost() and getBuildTime() +Subject: [PATCH] build/pack.c: remove static local variables from buildHost() + and getBuildTime() Their use is causing difficult to diagnoze data races when building multiple packages in parallel, and is a bad idea in general, as it also makes it more @@ -20,7 +20,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 3 files changed, 74 insertions(+), 72 deletions(-) diff --git a/build/build.c b/build/build.c -index 81152e53e..6001f9e52 100644 +index 13c3df2..b154f08 100644 --- a/build/build.c +++ b/build/build.c @@ -6,6 +6,8 @@ @@ -99,7 +99,7 @@ index 81152e53e..6001f9e52 100644 if (((what & RPMBUILD_PACKAGESOURCE) && !test) && - (rc = packageSources(spec, &cookie))) + (rc = packageSources(spec, &cookie, buildTime, host))) - return rc; + goto exit; if (((what & RPMBUILD_PACKAGEBINARY) && !test) && - (rc = packageBinaries(spec, cookie, (didBuild == 0)))) @@ -116,7 +116,7 @@ index 81152e53e..6001f9e52 100644 spec->rootDir = NULL; if (rc != RPMRC_OK && rpmlogGetNrecs() > 0) { diff --git a/build/pack.c b/build/pack.c -index df15876ff..17a4b0905 100644 +index df15876..17a4b09 100644 --- a/build/pack.c +++ b/build/pack.c @@ -6,8 +6,6 @@ @@ -305,7 +305,7 @@ index df15876ff..17a4b0905 100644 /* Do check SRPM package if enabled */ if (rc == RPMRC_OK && pkgcheck[0] != ' ') { diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h -index 439b7d3b5..07e8338ad 100644 +index 439b7d3..07e8338 100644 --- a/build/rpmbuild_internal.h +++ b/build/rpmbuild_internal.h @@ -427,19 +427,23 @@ rpmRC processSourceFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags); @@ -334,6 +334,3 @@ index 439b7d3b5..07e8338ad 100644 RPM_GNUC_INTERNAL int addLangTag(rpmSpec spec, Header h, rpmTagVal tag, --- -2.14.2 - |