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