diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch')
-rw-r--r-- | meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch index 80e2f0fad7..4029233fb7 100644 --- a/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch +++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 87cfc0db1ed6fe381a5ed5f0016d8c3344a31a11 Mon Sep 17 00:00:00 2001 | 1 | From f39c28eb52f12ae6e82db360ffd5a903ac8faca5 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Mon, 9 Jan 2017 18:52:11 +0200 | 3 | Date: Mon, 9 Jan 2017 18:52:11 +0200 |
4 | Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in | 4 | Subject: [PATCH] Do not add an unsatisfiable dependency when building rpms in |
@@ -9,25 +9,23 @@ hand produces rpms that way by design. | |||
9 | 9 | ||
10 | Upstream-Status: Inappropriate [oe-core specific] | 10 | Upstream-Status: Inappropriate [oe-core specific] |
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
12 | |||
12 | --- | 13 | --- |
13 | build/pack.c | 4 ---- | 14 | build/pack.c | 4 ---- |
14 | 1 file changed, 4 deletions(-) | 15 | 1 file changed, 4 deletions(-) |
15 | 16 | ||
16 | diff --git a/build/pack.c b/build/pack.c | 17 | diff --git a/build/pack.c b/build/pack.c |
17 | index 1261cdbba..bb2d6f4f6 100644 | 18 | index e6cec1816..810cd7351 100644 |
18 | --- a/build/pack.c | 19 | --- a/build/pack.c |
19 | +++ b/build/pack.c | 20 | +++ b/build/pack.c |
20 | @@ -595,10 +595,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating) | 21 | @@ -724,10 +724,6 @@ static rpmRC packageBinary(rpmSpec spec, Package pkg, const char *cookie, int ch |
21 | headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); | 22 | headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); |
22 | } | 23 | } |
24 | |||
25 | - if (cheating) { | ||
26 | - (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1"); | ||
27 | - } | ||
28 | - | ||
29 | if ((rc = getPkgFilename(pkg->header, filename))) | ||
30 | return rc; | ||
23 | 31 | ||
24 | - if (cheating) { | ||
25 | - (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1"); | ||
26 | - } | ||
27 | - | ||
28 | { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL); | ||
29 | char *binRpm, *binDir; | ||
30 | binRpm = headerFormat(pkg->header, binFormat, &errorString); | ||
31 | -- | ||
32 | 2.11.0 | ||
33 | |||