summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-12-30 18:38:11 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-14 14:42:16 +0000
commit27d56eeebd8197e359aae0a7ccac74cb55ff794d (patch)
treeb3cade20da193ee39424a6e410ddfcdd62bc38c8 /meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
parent381c8e634c22321f9c27fae5b6f35e4204840719 (diff)
downloadpoky-27d56eeebd8197e359aae0a7ccac74cb55ff794d.tar.gz
rpm: add a 4.x recipe
The dnf stack is written and tested against rpm 4.x. So if we want to use dnf for packaging, we should also use rpm 4 - there's simply too much work involved in making rpm 5 work with it due to significant API differences, and supporting that going forward. (From OE-Core rev: 2358e786ec8d1199d90e181eb5d8d00816f669b4) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch33
1 files changed, 33 insertions, 0 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
new file mode 100644
index 0000000000..80e2f0fad7
--- /dev/null
+++ b/meta/recipes-devtools/rpm/files/0001-Do-not-add-an-unsatisfiable-dependency-when-building.patch
@@ -0,0 +1,33 @@
1From 87cfc0db1ed6fe381a5ed5f0016d8c3344a31a11 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 1261cdbba..bb2d6f4f6 100644
18--- a/build/pack.c
19+++ b/build/pack.c
20@@ -595,10 +595,6 @@ rpmRC packageBinaries(rpmSpec spec, const char *cookie, int cheating)
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 { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL);
29 char *binRpm, *binDir;
30 binRpm = headerFormat(pkg->header, binFormat, &errorString);
31--
322.11.0
33