From 12256ec829be54369f70cbce02c474faa7538352 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Mon, 11 Mar 2019 11:04:26 +0300 Subject: [PATCH] Don't ignore dependencies from /bin/sh to fix initial bootstrapping of chroot --- rpm-5.4.4-drop-base-dependencies.patch | 7 ++++--- rpm.spec | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/rpm-5.4.4-drop-base-dependencies.patch b/rpm-5.4.4-drop-base-dependencies.patch index c828235..19e34bb 100644 --- a/rpm-5.4.4-drop-base-dependencies.patch +++ b/rpm-5.4.4-drop-base-dependencies.patch @@ -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 2011-12-11 03:56:04.794169328 +0100 -@@ -48,6 +48,12 @@ int addReqProv(/*@unused@*/ Spec spec, H ++++ rpm-5.4.4/build/reqprov.c 2019-03-11 10:48:00.794169328 +0300 +@@ -48,6 +48,13 @@ int addReqProv(/*@unused@*/ Spec spec, H indextag = RPMTAG_TRIGGERINDEX; extra = Flags & RPMSENSE_TRIGGER; } else { +#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); + return 0; + } diff --git a/rpm.spec b/rpm.spec index b98ace8..75d29a7 100644 --- a/rpm.spec +++ b/rpm.spec @@ -61,7 +61,7 @@ Summary: The RPM package management system Name: rpm Epoch: 1 Version: %{libver}.%{minorver} -Release: %{?prereldate:0.%{prereldate}.}84 +Release: %{?prereldate:0.%{prereldate}.}85 License: LGPLv2.1+ Group: System/Configuration/Packaging Url: http://rpm5.org/