rpms/rpm
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

brp-strip: added patch to fix exclusion of /usr/lib/debug when buildroot contains a plus (+) symbol [release 4.18.0-2mamba;Sun Oct 09 2022]

Browse Source
This commit is contained in:
Silvan Calarco 2024-01-05 17:29:07 +01:00
parent c9e9a16a01
commit 06f286b44f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpm-4.18.0-brp-strip-fix-for-plus-in-buildroot.patch Normal file
View File

@ -0,0 +1,9 @@
--- rpm-4.18.0/scripts/brp-strip.orig 2022-10-09 14:16:22.271823915 +0200
+++ rpm-4.18.0/scripts/brp-strip 2022-10-09 14:16:31.961765809 +0200
@@ -13,5 +13,5 @@
esac
# Strip ELF binaries
-find "$RPM_BUILD_ROOT" -type f \! -regex "${RPM_BUILD_ROOT}/*usr/lib/debug.*" \! -name "*.go" -print0 | \
+find "$RPM_BUILD_ROOT" -type f \! -path "${RPM_BUILD_ROOT}/*usr/lib/debug*" \! -name "*.go" -print0 | \
xargs -0 -r -P$NCPUS -n32 sh -c "file \"\$@\" | sed -n -e 's/^\(.*\):[ ]*ELF.*, not stripped.*/\1/p' | grep -v 'no machine' | xargs -I\{\} $STRIP -g \{\}" ARG0

8
rpm.spec
View File

@ -17,7 +17,7 @@
Name: rpm Name: rpm
Epoch: 1 Epoch: 1
Version: 4.18.0 Version: 4.18.0
Release: 1mamba Release: 2mamba
Summary: The RPM Package Manager (RPM) is a powerful package management system Summary: The RPM Package Manager (RPM) is a powerful package management system
Group: System/Management Group: System/Management
Vendor: openmamba Vendor: openmamba
@ -44,6 +44,7 @@ Patch10: rpm-4.14.2.1-openmamba-buildroot.patch
Patch11: rpm-4.14.2.1-target-platform-gnu.patch Patch11: rpm-4.14.2.1-target-platform-gnu.patch
Patch12: rpm-4.17.0-find-lang-qt-fix.patch Patch12: rpm-4.17.0-find-lang-qt-fix.patch
Patch13: rpm-4.16.1.3-pythondistdeps-no-richdeps.patch Patch13: rpm-4.16.1.3-pythondistdeps-no-richdeps.patch
Patch14: rpm-4.18.0-brp-strip-fix-for-plus-in-buildroot.patch
License: LGPL License: LGPL
## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel BuildRequires: glibc-devel
@ -71,7 +72,6 @@ BuildRequires: libpopt-devel
BuildRequires: libpython3-devel BuildRequires: libpython3-devel
BuildRequires: libreadline-devel BuildRequires: libreadline-devel
BuildRequires: libsqlite-devel BuildRequires: libsqlite-devel
BuildRequires: libsystemd-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: libz-devel BuildRequires: libz-devel
BuildRequires: libzstd-devel BuildRequires: libzstd-devel
@ -144,6 +144,7 @@ This package should be installed if you want to develop Python programs that wil
%patch11 -p1 %patch11 -p1
%patch12 -p1 %patch12 -p1
#%patch13 -p1 #%patch13 -p1
%patch14 -p1
#sed -i "s|/usr/bin/python$|%{__python3}|" scripts/pythondistdeps.py #sed -i "s|/usr/bin/python$|%{__python3}|" scripts/pythondistdeps.py
@ -304,6 +305,9 @@ rm -f %{buildroot}%{_libdir}/librpm*.la
%{python3_sitearch}/rpm/* %{python3_sitearch}/rpm/*
%changelog %changelog
* Sun Oct 09 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 4.18.0-2mamba
- brp-strip: added patch to fix exclusion of /usr/lib/debug when buildroot contains a plus (+) symbol
* Fri Sep 23 2022 Automatic Build System <autodist@mambasoft.it> 4.18.0-1mamba * Fri Sep 23 2022 Automatic Build System <autodist@mambasoft.it> 4.18.0-1mamba
- automatic version update by autodist - automatic version update by autodist