mirror of
https://abf.rosa.ru/djam/rpm.git
synced 2025-02-23 18:33:04 +00:00
Recognize 'too many notes' in 'file' output - met this when building new java-1.8.0
This commit is contained in:
parent
43213f186d
commit
de1aebc5aa
2 changed files with 17 additions and 1 deletions
12
rpm-5.4.10-debuginfo-too-many-notes.patch
Normal file
12
rpm-5.4.10-debuginfo-too-many-notes.patch
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
diff -Naur rpm-5.4.10.orig/scripts/find-debuginfo.sh rpm-5.4.10/scripts/find-debuginfo.sh
|
||||||
|
--- rpm-5.4.10.orig/scripts/find-debuginfo.sh 2018-09-18 17:57:42.282867897 +0300
|
||||||
|
+++ rpm-5.4.10/scripts/find-debuginfo.sh 2018-09-18 17:59:49.826673106 +0300
|
||||||
|
@@ -193,7 +193,7 @@
|
||||||
|
find "$RPM_BUILD_ROOT" ! -path "${debugdir}/*.debug" -type f \
|
||||||
|
\( -perm -0100 -or -perm -0010 -or -perm -0001 \) \
|
||||||
|
-print | LANG=C sort |
|
||||||
|
-file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' |
|
||||||
|
+file -N -f - | sed -n -e 's/^\(.*\):[ ]*.*ELF.*, not stripped/\1/p' | sed 's/, too many notes (.*)//' |
|
||||||
|
xargs --no-run-if-empty stat -c '%h %D_%i %n' |
|
||||||
|
while read nlinks inum f; do
|
||||||
|
[ -n "$EXCLUDE_REGEXP" ] && grep -E -q "$EXCLUDE_REGEXP" <<< "$f" && \
|
6
rpm.spec
6
rpm.spec
|
@ -61,7 +61,7 @@ Summary: The RPM package management system
|
||||||
Name: rpm
|
Name: rpm
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: %{libver}.%{minorver}
|
Version: %{libver}.%{minorver}
|
||||||
Release: %{?prereldate:0.%{prereldate}.}79
|
Release: %{?prereldate:0.%{prereldate}.}80
|
||||||
License: LGPLv2.1+
|
License: LGPLv2.1+
|
||||||
Group: System/Configuration/Packaging
|
Group: System/Configuration/Packaging
|
||||||
Url: http://rpm5.org/
|
Url: http://rpm5.org/
|
||||||
|
@ -527,6 +527,9 @@ Patch517: rpm-5.4.10-qml-dependency-generator.patch
|
||||||
# Always detect Python egg-info files as text for pythonegg(xxx) Provides generation
|
# Always detect Python egg-info files as text for pythonegg(xxx) Provides generation
|
||||||
Patch518: rpm-5.4.10-fix-egg-info-provides.patch
|
Patch518: rpm-5.4.10-fix-egg-info-provides.patch
|
||||||
|
|
||||||
|
# On some modern files, 'file' reprots '... not stripped, too many notes'
|
||||||
|
Patch519: rpm-5.4.10-debuginfo-too-many-notes.patch
|
||||||
|
|
||||||
BuildRequires: autoconf >= 2.57
|
BuildRequires: autoconf >= 2.57
|
||||||
BuildRequires: bzip2-devel
|
BuildRequires: bzip2-devel
|
||||||
BuildRequires: automake >= 1.8
|
BuildRequires: automake >= 1.8
|
||||||
|
@ -1190,6 +1193,7 @@ This package contains the RPM API documentation generated in HTML format.
|
||||||
%patch516 -p1 -b .appdatadir~
|
%patch516 -p1 -b .appdatadir~
|
||||||
%patch517 -p1 -b .qmldeps~
|
%patch517 -p1 -b .qmldeps~
|
||||||
%patch518 -p1 -b .egg-info~
|
%patch518 -p1 -b .egg-info~
|
||||||
|
%patch519 -p1 -b .debug_notes~
|
||||||
|
|
||||||
#required by P55, P80, P81, P94..
|
#required by P55, P80, P81, P94..
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
|
Loading…
Add table
Reference in a new issue