summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-03-11 14:07:29 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:29 +0000
commit1e9de52ca0d3765ca47ec18fc9e71172257ff3c1 (patch)
treef75492bbcbdf527fd87155ea9bfafa969b895fd0 /meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch
parenta7dd04d15b0208c5d159abb7b40079c62aa60d78 (diff)
downloadpoky-1e9de52ca0d3765ca47ec18fc9e71172257ff3c1.tar.gz
rpm: remove RPM 4
RPM4 support is buggy and incomplete. As we don't have the resources or interest to maintain it this patch removes it. (From OE-Core rev: a6e7a86f1635be9a688c56c25e9d215ea4d2cc84) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch')
-rw-r--r--meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch23
1 files changed, 0 insertions, 23 deletions
diff --git a/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch b/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch
deleted file mode 100644
index 7a646de373..0000000000
--- a/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1Upstream-Status: Pending
2
3Signed-off-by: Saul Wold <sgw@linux.intel.com>
4Signed-off-by: Ronan Le Martret <ronan.lemartret@open.eurogiciel.org>
5
6
7Index: rpm-4.11.2/build/pack.c
8===================================================================
9--- rpm-4.11.2.orig/build/pack.c
10+++ rpm-4.11.2/build/pack.c
11@@ -571,9 +571,9 @@ rpmRC packageBinaries(rpmSpec spec, cons
12 headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16);
13 }
14
15- if (cheating) {
16- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");
17- }
18+// if (cheating) {
19+// (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1");
20+// }
21
22 { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL);
23 char *binRpm, *binDir;