1From dc40261464de1a1799704967906f5bd113b53793 Mon Sep 17 00:00:00 2001 2From: Alexander Kanavin <alex.kanavin@gmail.com> 3Date: Mon, 9 Jan 2017 18:52:11 +0200 4Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in 5 a short-circuited way. 6 7Upstream permits short-circuiting only for local testing; Yocto on the other 8hand produces rpms that way by design. 9 10Upstream-Status: Inappropriate [oe-core specific] 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 12--- 13 build/pack.c | 4 ---- 14 1 file changed, 4 deletions(-) 15 16diff --git a/build/pack.c b/build/pack.c 17index eb9c7b3f1..fb1f1bed8 100644 18--- a/build/pack.c 19+++ b/build/pack.c 20@@ -712,10 +712,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch 21 headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); 22 } 23 24- if (cheating) { 25- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1"); 26- } 27- 28 if ((rc = getPkgFilename(pkg->header, filename))) 29 return rc; 30 31