Djam/rpm
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/rpm.git synced 2025-02-23 10:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable generation of buildid provides

Browse source
This commit is contained in:
Denis Silakov 2013-09-23 10:48:07 +04:00
parent 862e0e7825
commit 5c168f7f32
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
rpm-5.4.10-disable-generation-of-buildid-provides.patch Normal file
View file

@ -0,0 +1,11 @@
--- rpm-5.4.10/lib/rpmds.c.buildid_deps~ 2013-01-23 03:39:17.232845754 +0100
+++ rpm-5.4.10/lib/rpmds.c 2013-01-23 03:38:37.428673897 +0100
@@ -3297,7 +3297,7 @@ fprintf(stderr, "*** rpmdsELF(%s, %d, %p
continue;
/*@notreached@*/ /*@switchbreak@*/ break;
case SHT_NOTE:
-#if defined(HAVE_GELF_GETNOTE) /* XXX OpenIndiana & older elfutils haven't. */
+#if defined(HAVE_GELF_GETNOTE) && !defined(RPM_VENDOR_MANDRIVA) /* XXX OpenIndiana & older elfutils haven't. */
if (!(shdr->sh_flags & SHF_ALLOC))
continue;
data = NULL;

19
rpm-5.4.10-dont-repackage-if-justdb-is-specified.patch Normal file
View file

@ -0,0 +1,19 @@
Index: rpm/lib/transaction.c
RCS File: /v/rpm/cvs/rpm/lib/transaction.c,v
rcsdiff -q -kk '-r1.429.2.12' '-r1.429.2.13' -u '/v/rpm/cvs/rpm/lib/transaction.c,v' 2>/dev/null
--- rpm/lib/transaction.c 2012/06/04 15:10:11 1.429.2.12
+++ rpm/lib/transaction.c 2012/12/04 18:48:32 1.429.2.13
@@ -2244,9 +2244,11 @@
}
/* ===============================================
- * Save removed files before erasing.
+ * Save removed files before erasing (w/o --justdb).
*/
- if (TSF_ISSET(tsflags, DIRSTASH) || TSF_ISSET(tsflags, REPACKAGE)) {
+ if ((TSF_ISSET(tsflags, DIRSTASH) || TSF_ISSET(tsflags, REPACKAGE))
+ && !TSF_ISSET(tsflags, JUSTDB))
+ {
xx = rpmtsRepackage(ts, numRemoved);
}