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 <[email protected]>
rpm-software-management · Mar 21, 2017 · 5e82c7e · 5e82c7e
1 parent c9035d4
commit 5e82c7e
Showing 1 changed file with 8 additions and 4 deletions.
diff --git 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