31 lines
1003 B
Diff
31 lines
1003 B
Diff
|
From 86e585cc0dd06dfa20f584af8b59d52a59accb45 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||
|
|
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 <alex.kanavin@gmail.com>
|
||
|
|
---
|
||
|
|
build/pack.c | 4 ----
|
||
|
|
1 file changed, 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/build/pack.c b/build/pack.c
|
||
|
|
index f7dac6d9a..f382c7da0 100644
|
||
|
|
--- a/build/pack.c
|
||
|
|
+++ b/build/pack.c
|
||
|
|
@@ -711,10 +711,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch
|
||
|
|
headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
|
||
|
|
}
|
||
|
|
|
||
|
|
- if (cheating) {
|
||
|
|
- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");
|
||
|
|
- }
|
||
|
|
-
|
||
|
|
if ((rc = getPkgFilename(pkg->header, filename)))
|
||
|
|
return rc;
|
||
|
|
|