434eb9
Do not process build-ids for noarch packages.
@@ -0,0 +1,41 @@
|
|
1
|
+
From d406bde3e914cae2d794bbaab66aad6b7038b30e Mon Sep 17 00:00:00 2001
|
2
|
+
From: Mark Wielaard <mark@klomp.org>
|
3
|
+
Date: Fri, 17 Mar 2017 10:51:36 +0100
|
4
|
+
Subject: [PATCH] build/files.c (processPackageFiles): Don't call
|
5
|
+
generateBuildIDs for noarch.
|
6
|
+
|
7
|
+
We don't want to do build-id processing for noarch packages. It might be
|
8
|
+
that noarch packages do contain architecture depended files, but those are
|
9
|
+
already handled by processBinaryFiles.
|
10
|
+
|
11
|
+
Signed-off-by: Mark Wielaard <mark@klomp.org>
|
12
|
+
---
|
13
|
+
build/files.c | 12 ++++++++----
|
14
|
+
1 file changed, 8 insertions(+), 4 deletions(-)
|
15
|
+
|
16
|
+
diff --git a/build/files.c b/build/files.c
|
17
|
+
index 6021643..35b2dd0 100644
|
18
|
+
--- a/build/files.c
|
19
|
+
+++ b/build/files.c
|
20
|
+
@@ -2384,10 +2384,14 @@ static rpmRC processPackageFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags,
|
21
|
+
goto exit;
|
22
|
+
|
23
|
+
#if HAVE_LIBDW
|
24
|
+
- if (generateBuildIDs (&fl) != 0) {
|
25
|
+
- rpmlog(RPMLOG_ERR, _("Generating build-id links failed\n"));
|
26
|
+
- fl.processingFailed = 1;
|
27
|
+
- goto exit;
|
28
|
+
+ /* Check build-ids and add build-ids links for files to package list. */
|
29
|
+
+ const char *arch = headerGetString(pkg->header, RPMTAG_ARCH);
|
30
|
+
+ if (!rstreq(arch, "noarch")) {
|
31
|
+
+ if (generateBuildIDs (&fl) != 0) {
|
32
|
+
+ rpmlog(RPMLOG_ERR, _("Generating build-id links failed\n"));
|
33
|
+
+ fl.processingFailed = 1;
|
34
|
+
+ goto exit;
|
35
|
+
+ }
|
36
|
+
}
|
37
|
+
#endif
|
38
|
+
|
39
|
+
--
|
40
|
+
1.8.3.1
|
41
|
+
|
@@ -29,7 +29,7 @@
|
|
29
29
|
Summary: The RPM package management system
|
30
30
|
Name: rpm
|
31
31
|
Version: %{rpmver}
|
32
|
-
Release: %{?snapver:0.%{snapver}.}
|
32
|
+
Release: %{?snapver:0.%{snapver}.}11%{?dist}
|
33
33
|
Group: System Environment/Base
|
34
34
|
Url: http://www.rpm.org/
|
35
35
|
Source0: http://rpm.org/releases/%{srcdir}/%{name}-%{srcver}.tar.bz2
|
@@ -88,6 +88,7 @@ Patch262: 0013-missing_build_ids_terminate_build.patch
|
|
88
88
|
Patch263: 0014-generateBuildIDs-Fix-error-handling.patch
|
89
89
|
Patch264: 0015-reset-buildid-file-attrs.patch
|
90
90
|
Patch265: 0016-debugedit-replace-files.patch
|
91
|
+
Patch266: 0017-do-not-process-buildi-ds-for-noarch.patch
|
91
92
|
|
92
93
|
# OpenSSL backend
|
93
94
|
Patch300: 0001-Add-OpenSSL-support-for-digest-and-signatures.patch
|
@@ -592,6 +593,9 @@ exit 0
|
|
592
593
|
%doc doc/librpm/html/*
|
593
594
|
|
594
595
|
%changelog
|
596
|
+
* Fri Mar 17 2017 Mark Wielaard <mjw@redhat.com> - 4.13.0.1-11
|
597
|
+
- Do not process build-ids for noarch packages.
|
598
|
+
|
595
599
|
* Thu Mar 16 2017 Mark Wielaard <mjw@redhat.com> - 4.13.0.1-10
|
596
600
|
- Add fix for debugedit replace debug_line files.
|
597
601
|
|