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