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

Don't ignore dependencies from /bin/sh to fix initial bootstrapping of chroot

Browse source
This commit is contained in:
Mikhail Novosyolov 2019-03-11 11:04:26 +03:00
parent 8b1543c3c1
commit 12256ec829
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
rpm-5.4.4-drop-base-dependencies.patch
View file

@ -1,11 +1,12 @@
--- rpm-5.4.4/build/reqprov.c.drop_basedeps~ 2011-12-11 03:55:58.958164657 +0100 --- rpm-5.4.4/build/reqprov.c.drop_basedeps~ 2011-12-11 03:55:58.958164657 +0100
+++ rpm-5.4.4/build/reqprov.c 2011-12-11 03:56:04.794169328 +0100 +++ rpm-5.4.4/build/reqprov.c 2019-03-11 10:48:00.794169328 +0300
@@ -48,6 +48,12 @@ int addReqProv(/*@unused@*/ Spec spec, H @@ -48,6 +48,13 @@ int addReqProv(/*@unused@*/ Spec spec, H
indextag = RPMTAG_TRIGGERINDEX; indextag = RPMTAG_TRIGGERINDEX;
extra = Flags & RPMSENSE_TRIGGER; extra = Flags & RPMSENSE_TRIGGER;
} else { } else {
+#if defined(RPM_VENDOR_MANDRIVA) +#if defined(RPM_VENDOR_MANDRIVA)
+ if (!strcmp(N, "/bin/sh") || !strcmp(N, "/sbin/ldconfig")) { + //if (!strcmp(N, "/bin/sh") || !strcmp(N, "/sbin/ldconfig")) {
+ if (!strcmp(N, "/sbin/ldconfig")) {
+ rpmlog(RPMLOG_DEBUG, "%s will be satisfied by glibc or it's dependencies, won't add dependency to package\n", N); + rpmlog(RPMLOG_DEBUG, "%s will be satisfied by glibc or it's dependencies, won't add dependency to package\n", N);
+ return 0; + return 0;
+ } + }

2
rpm.spec
View file

@ -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}.}84 Release: %{?prereldate:0.%{prereldate}.}85
License: LGPLv2.1+ License: LGPLv2.1+
Group: System/Configuration/Packaging Group: System/Configuration/Packaging
Url: http://rpm5.org/ Url: http://rpm5.org/