testing/rpm
SHA256
3
0
Fork 0
forked from pool/rpm
Code Pull Requests Activity

tweak

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=599
This commit is contained in:
Michael Schröder 2022-02-18 13:47:06 +00:00 committed by Git OBS Bridge
parent 93f7afff8a
commit 0206be8e22
3 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-fix-minimize_writes.patch
View File

@ -1,16 +1,20 @@
From 03f146e955e099c24f7a49eff461645e1c0a0fd7 Fri 28 1 16:00:15 2022 commit 03f146e955e099c24f7a49eff461645e1c0a0fd7
From: Simon Vogl <simon.vogl@gmx.net> Author: Panu Matilainen <pmatilai@redhat.com>
Date: Fri, 28 Jan 2022 16:00:15 UTC Date: Thu Jan 13 11:25:30 2022 +0200
Subject: [PATCH] Fix minimize_writes not minimizing writes
A regression in commit 13f70e3 caused minimize_writes Fix minimize_writes not minimizing writes since 4.15 regression
to actually not minimize anything. FA_TOUCH needs different kind of verification, stat the file instead
to see if it needs creating afterall. Commit 13f70e3710b2df49a923cc6450ff4a8f86e65666 caused minimize_writes
to actually not minimize anything since fsmVerify() only "verifies"
the thing does NOT exist anymore when it exist. Sigh.
FA_TOUCH needs different kind of verification, stat the file instead
to see if it needs creating afterall. This is all soooo broken...
Fixes: #1881
diff --git a/lib/fsm.c b/lib/fsm.c --- lib/fsm.c.orig
index af0125db4..935a0a5c6 100644 +++ lib/fsm.c
--- a/lib/fsm.c
+++ b/lib/fsm.c
@@ -945,7 +945,12 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files, @@ -945,7 +945,12 @@ int rpmPackageFilesInstall(rpmts ts, rpmte te, rpmfiles files,
} }
/* Assume file does't exist when tmp suffix is in use */ /* Assume file does't exist when tmp suffix is in use */

3
rpm.changes
View File

@ -6,7 +6,8 @@ Tue Feb 1 12:47:02 UTC 2022 - Dirk Müller <dmueller@suse.com>
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 28 17:00:15 CEST 2022 - simon.vogl@gmx.net Fri Jan 28 17:00:15 CEST 2022 - simon.vogl@gmx.net
- Added 0001-fix-minimize_writes.patch to fix minimize_writes not working - Fix minimize_writes not minimizing writes since 4.15 regression
new patch: 0001-fix-minimize_writes.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller <dmueller@suse.com> Fri Jan 28 14:19:02 UTC 2022 - Dirk Müller <dmueller@suse.com>

8
rpm.spec
View File

@ -71,8 +71,6 @@ Source8: rpmconfigcheck
Source9: sysconfig.services-rpm Source9: sysconfig.services-rpm
Source12: baselibs.conf Source12: baselibs.conf
Source13: rpmconfigcheck.service Source13: rpmconfigcheck.service
# PATCH-FIX-UPSTREAM
Patch1: 0001-fix-minimize_writes.patch
# quilt patches start here # quilt patches start here
Patch5: usr-lib-sysimage-rpm.patch Patch5: usr-lib-sysimage-rpm.patch
Patch13: ignore-auxv.diff Patch13: ignore-auxv.diff
@ -120,6 +118,7 @@ Patch132: verbosearg.diff
Patch133: zstdpool.diff Patch133: zstdpool.diff
Patch134: zstdthreaded.diff Patch134: zstdthreaded.diff
Patch135: ocaml-cmxs.diff Patch135: ocaml-cmxs.diff
Patch136: 0001-fix-minimize_writes.patch
Patch200: finddebuginfo.diff Patch200: finddebuginfo.diff
Patch201: finddebuginfo-absolute-links.diff Patch201: finddebuginfo-absolute-links.diff
Patch202: debugsubpkg.diff Patch202: debugsubpkg.diff
@ -248,7 +247,7 @@ rm -rf sqlite
%patch -P 100 -P 102 -P 103 %patch -P 100 -P 102 -P 103
%patch -P 117 %patch -P 117
%patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134 %patch -P 122 -P 123 -P 131 -P 132 -P 133 -P 134
%patch -P 135 %patch -P 135 -P 136
# debugedit patches # debugedit patches
pushd debugedit-5.0 pushd debugedit-5.0
@ -264,9 +263,6 @@ popd
%patch6464 %patch6464
%endif %endif
# minimize_writes patch
%patch1 -p1
rm -f m4/libtool.m4 rm -f m4/libtool.m4
rm -f m4/lt*.m4 rm -f m4/lt*.m4