summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch')
-rw-r--r--meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch32
1 files changed, 0 insertions, 32 deletions
diff --git a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch b/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
deleted file mode 100644
index 724428414c..0000000000
--- a/meta/recipes-extended/libzypp/libzypp/libzypp-rpm549.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1commit 6c47ad415246cc3a3edac2e1637106d330574c85
2Author: Mark Hatle <mark.hatle@windriver.com>
3Date: Fri May 11 19:05:09 2012 -0500
4
5 RpmHeader.cc: RPM 5.4.9 integration
6
7 _RPMVSF_xxx - NODIGEST, NOSIGNATURES, NOHEADER, and NOPAYLOAD
8 are now obsolete and no longer supported.
9
10 Upstream-Status: Inappropriate [other]
11 OE version is too old, when we uprev if this patch is still need it
12 should be sent upstream at that time.
13
14 Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
15
16diff --git a/zypp/target/rpm/RpmHeader.cc b/zypp/target/rpm/RpmHeader.cc
17index 1224ecd..c96dae6 100644
18--- a/zypp/target/rpm/RpmHeader.cc
19+++ b/zypp/target/rpm/RpmHeader.cc
20@@ -230,10 +230,12 @@ RpmHeader::constPtr RpmHeader::readPackage( const Pathname & path_r,
21 librpmDb::globalInit();
22 rpmts ts = ::rpmtsCreate();
23 unsigned vsflag = RPMVSF_DEFAULT;
24+#if !defined(_RPM_5)
25 if ( verification_r & NODIGEST )
26 vsflag |= _RPMVSF_NODIGESTS;
27 if ( verification_r & NOSIGNATURE )
28 vsflag |= _RPMVSF_NOSIGNATURES;
29+#endif
30 ::rpmtsSetVSFlags( ts, rpmVSFlags(vsflag) );
31
32 Header nh = 0;