From 87cfc0db1ed6fe381a5ed5f0016d8c3344a31a11 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 9 Jan 2017 18:52:11 +0200 Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in a short-circuited way. Upstream permits short-circuiting only for local testing; Yocto on the other hand produces rpms that way by design. Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Alexander Kanavin --- build/pack.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/build/pack.c b/build/pack.c index 1261cdbba..bb2d6f4f6 100644 --- a/build/pack.c +++ b/build/pack.c @@ -595,10 +595,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating) headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); } - if (cheating) { - (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1"); - } - { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL); char *binRpm, *binDir; binRpm = headerFormat(pkg->header, binFormat, &errorString); -- 2.11.0