From 35e3bc90ec3bae824804bd176b3128efdb5b4e2b Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 14 Nov 2012 18:46:56 +0000 Subject: python-smartpm: add support for recommends Implement support within Smart for handling RRECOMMENDS relationships between RPM packages as used by OE. This includes support within the base system for caching and resolving these relationships as well as specific support in the RPM backend for reading the information from packages, and reading the "missingok" flag added to createrepo for rpm-md feeds. Signed-off-by: Paul Eggleton Signed-off-by: Saul Wold --- .../python/python-smartpm/smart-missingok.patch | 43 ---------------------- 1 file changed, 43 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-smartpm/smart-missingok.patch (limited to 'meta/recipes-devtools/python/python-smartpm/smart-missingok.patch') diff --git a/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch b/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch deleted file mode 100644 index 7e138696b8..0000000000 --- a/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch +++ /dev/null @@ -1,43 +0,0 @@ -backends/rpm: Identify recommended packages - -We identify and store recommended packages (and later throw that data away.) - -This is indended to be the starting work to add support for recommended -packages to smart. - -Upstream-status: Inappropriate [ Code isn't finished! ] - -Signed-off-by: Mark Hatle - -Index: smart-1.4.1/smart/backends/rpm/header.py -=================================================================== ---- smart-1.4.1.orig/smart/backends/rpm/header.py -+++ smart-1.4.1/smart/backends/rpm/header.py -@@ -292,6 +292,7 @@ class RPMHeaderLoader(Loader): - f = [0] - elif type(f) != list: - f = [f] -+ recdict = {} - reqdict = {} - for i in range(len(n)): - ni = n[i] -@@ -308,10 +309,17 @@ class RPMHeaderLoader(Loader): - # RPMSENSE_SCRIPT_PREUN | - # RPMSENSE_SCRIPT_POST | - # RPMSENSE_SCRIPT_POSTUN == 7744 -- reqdict[(f[i]&7744 and PreReq or Req, -- intern(ni), r, vi)] = True -+ if (f[i]&rpm.RPMSENSE_MISSINGOK): -+ print "Ignoring Recommend Dependency: %s" % (ni) -+ recdict[(f[i]&7744 and PreReq or Req, -+ intern(ni), r, vi)] = True -+ else: -+ reqdict[(f[i]&7744 and PreReq or Req, -+ intern(ni), r, vi)] = True -+ recargs = collapse_libc_requires(recdict.keys()) - reqargs = collapse_libc_requires(reqdict.keys()) - else: -+ recargs = None - reqargs = None - - n = h[1054] # RPMTAG_CONFLICTNAME -- cgit v1.2.3