summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-missingok.patch43
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb3
2 files changed, 45 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch b/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch
new file mode 100644
index 0000000000..7e138696b8
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-missingok.patch
@@ -0,0 +1,43 @@
1backends/rpm: Identify recommended packages
2
3We identify and store recommended packages (and later throw that data away.)
4
5This is indended to be the starting work to add support for recommended
6packages to smart.
7
8Upstream-status: Inappropriate [ Code isn't finished! ]
9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11
12Index: smart-1.4.1/smart/backends/rpm/header.py
13===================================================================
14--- smart-1.4.1.orig/smart/backends/rpm/header.py
15+++ smart-1.4.1/smart/backends/rpm/header.py
16@@ -292,6 +292,7 @@ class RPMHeaderLoader(Loader):
17 f = [0]
18 elif type(f) != list:
19 f = [f]
20+ recdict = {}
21 reqdict = {}
22 for i in range(len(n)):
23 ni = n[i]
24@@ -308,10 +309,17 @@ class RPMHeaderLoader(Loader):
25 # RPMSENSE_SCRIPT_PREUN |
26 # RPMSENSE_SCRIPT_POST |
27 # RPMSENSE_SCRIPT_POSTUN == 7744
28- reqdict[(f[i]&7744 and PreReq or Req,
29- intern(ni), r, vi)] = True
30+ if (f[i]&rpm.RPMSENSE_MISSINGOK):
31+ print "Ignoring Recommend Dependency: %s" % (ni)
32+ recdict[(f[i]&7744 and PreReq or Req,
33+ intern(ni), r, vi)] = True
34+ else:
35+ reqdict[(f[i]&7744 and PreReq or Req,
36+ intern(ni), r, vi)] = True
37+ recargs = collapse_libc_requires(recdict.keys())
38 reqargs = collapse_libc_requires(reqdict.keys())
39 else:
40+ recargs = None
41 reqargs = None
42
43 n = h[1054] # RPMTAG_CONFLICTNAME
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
index bc0c1f9941..4314564cd8 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -11,13 +11,14 @@ LICENSE = "GPLv2"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
12 12
13DEPENDS = "python rpm" 13DEPENDS = "python rpm"
14PR = "r0" 14PR = "r1"
15SRCNAME = "smart" 15SRCNAME = "smart"
16 16
17SRC_URI = "\ 17SRC_URI = "\
18 http://launchpad.net/smart/trunk/${PV}/+download/${SRCNAME}-${PV}.tar.bz2 \ 18 http://launchpad.net/smart/trunk/${PV}/+download/${SRCNAME}-${PV}.tar.bz2 \
19 file://smartpm-rpm5-nodig.patch \ 19 file://smartpm-rpm5-nodig.patch \
20 file://smart-rpm-root.patch \ 20 file://smart-rpm-root.patch \
21 file://smart-missingok.patch \
21 " 22 "
22 23
23SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" 24SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"