diff options
| author | Mark Wielaard <mark@klomp.org> | 2017-03-17 11:14:00 +0100 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-03-21 14:25:39 +0200 |
| commit | 5e82c7e8a8fc05195cdf622d0a120b9e70a9371b (patch) | |
| tree | 458c5795c82fcdfa7a84628e8ce60b58c8ed6627 | |
| parent | c9035d464a6ac3853b5dc705e0df1734ce915cd4 (diff) | |
| download | rpm-5e82c7e8a8fc05195cdf622d0a120b9e70a9371b.tar.gz | |
build/files.c (processPackageFiles): Don't call generateBuildIDs for noarch.
We don't want to do build-id processing for noarch packages. It might be
that noarch packages do contain architecture depended files, but those are
already handled by processBinaryFiles.
This fixes the building of openbios in fedora.
https://bugzilla.redhat.com/show_bug.cgi?id=1433129
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | build/files.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/build/files.c b/build/files.c index cc5d41cea..ef5f80fc8 100644 --- a/build/files.c +++ b/build/files.c @@ -2393,10 +2393,14 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, goto exit; #if HAVE_LIBDW - if (generateBuildIDs (&fl) != 0) { - rpmlog(RPMLOG_ERR, _("Generating build-id links failed\n")); - fl.processingFailed = 1; - goto exit; + /* Check build-ids and add build-ids links for files to package list. */ + const char *arch = headerGetString(pkg->header, RPMTAG_ARCH); + if (!rstreq(arch, "noarch")) { + if (generateBuildIDs (&fl) != 0) { + rpmlog(RPMLOG_ERR, _("Generating build-id links failed\n")); + fl.processingFailed = 1; + goto exit; + } } #endif |