From 58d9c4e4babbefecc187be2d7f1b812b76d6efc9 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 30 Sep 2014 10:16:54 -0700 Subject: rpm: add version 4.11.2 add patch to remove db3 from configure.ac add inherit pkgconfig (From OE-Core rev: 9a17f938e738a16a1ef9a00be6a8317d71f92573) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../rpm/rpm-4.11.2/disable_shortcircuited.patch | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch (limited to 'meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch') 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 new file mode 100644 index 0000000000..7a646de373 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm-4.11.2/disable_shortcircuited.patch @@ -0,0 +1,23 @@ +Upstream-Status: Pending + +Signed-off-by: Saul Wold +Signed-off-by: Ronan Le Martret + + +Index: rpm-4.11.2/build/pack.c +=================================================================== +--- rpm-4.11.2.orig/build/pack.c ++++ rpm-4.11.2/build/pack.c +@@ -571,9 +571,9 @@ rpmRC packageBinaries(rpmSpec spec, cons + headerPutBin(pkg->header, RPMTAG_SOURCEPKGID, spec->sourcePkgId,16); + } + +- if (cheating) { +- (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1"); +- } ++// if (cheating) { ++// (void) rpmlibNeedsFeature(pkg, "ShortCircuited", "4.9.0-1"); ++// } + + { char *binFormat = rpmGetPath("%{_rpmfilename}", NULL); + char *binRpm, *binDir; -- cgit v1.2.3-54-g00ecf