allow the buildroot to be a symbolic link in check-files

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=681
This commit is contained in:
Michael Schröder 2024-12-17 10:00:45 +00:00 committed by Git OBS Bridge
parent cfcc684186
commit 583cc9f968
3 changed files with 18 additions and 1 deletions

10
buildroot-symlink.diff Normal file
View File

@ -0,0 +1,10 @@
--- scripts/check-files.orig 2024-12-17 09:47:18.016502845 +0000
+++ scripts/check-files 2024-12-17 09:50:09.872159687 +0000
@@ -27,6 +27,6 @@ trap "rm -f \"${FILES_DISK}\"" 0 2 3 5 1
# Find non-directory files in the build root and compare to the manifest.
# TODO: regex chars in last sed(1) expression should be escaped
-find "${RPM_BUILD_ROOT}" -type f -o -type l | LC_ALL=C sort > "${FILES_DISK}"
+find -H "${RPM_BUILD_ROOT}" -type f -o -type l | LC_ALL=C sort > "${FILES_DISK}"
LC_ALL=C sort | diff -d "${FILES_DISK}" - | sed -n -e 's!^\(-\|< \)'"${RPM_BUILD_ROOT}"'/usr/share/info/dir$!!' -e 's!^\(-\|< \)'"${RPM_BUILD_ROOT}"'\(.*\)$! \2!gp'

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 17 10:59:26 CET 2024 - mls@suse.de
- allow the buildroot to be a symbolic link in check-files
(needed for pesign-obs-integration)
-------------------------------------------------------------------
Mon Dec 16 11:55:23 CET 2024 - mls@suse.de

View File

@ -120,6 +120,7 @@ Patch140: 0001-Add-option-to-set-mtime-of-files-in-rpms.patch
Patch141: 0002-log-build-time-if-it-is-set-from-SOURCE_DATE_EPOCH.patch
Patch142: 0003-Error-out-on-a-missing-changelog-date.patch
Patch150: unshare.diff
Patch151: buildroot-symlink.diff
Patch6464: auto-config-update-aarch64-ppc64le.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
#
@ -234,7 +235,7 @@ rm -rf sqlite
%patch -P 140
%endif
%patch -P 141 -P 142
%patch -P 150
%patch -P 150 -P 151
%ifarch aarch64 ppc64le riscv64
%patch -P 6464