summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJoshua Lock <joshua.g.lock@intel.com>2016-03-11 14:07:30 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:29 +0000
commit03fce7358deed578f4be13f54ddf87eeee35b909 (patch)
treeb0ed69021b03226ef93c9f4eb4e83e730369281c /meta
parent1e9de52ca0d3765ca47ec18fc9e71172257ff3c1 (diff)
downloadpoky-03fce7358deed578f4be13f54ddf87eeee35b909.tar.gz
smartpm: remove rpm4 patch
The RPM4 support we added to SMART doesn't appear to work, remove it as part of the removal of RPM4 from OE-Core. Refresh the smart-add-for-rpm-ignoresize-check.patch which was applied after smart-rpm4-fixes.patch and doesn't apply cleanly once that patch is removed. (From OE-Core rev: e1108fa41742e726aa578d0298fa6397b2663ff3) 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')
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch20
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-rpm4-fixes.patch49
-rw-r--r--meta/recipes-devtools/python/python-smartpm_git.bb1
3 files changed, 9 insertions, 61 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch b/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch
index 8a27f2583a..fe98d070d3 100644
--- a/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch
+++ b/meta/recipes-devtools/python/python-smartpm/smart-add-for-rpm-ignoresize-check.patch
@@ -17,14 +17,15 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
17 smart/backends/rpm/pm.py | 4 ++++ 17 smart/backends/rpm/pm.py | 4 ++++
18 1 file changed, 4 insertions(+) 18 1 file changed, 4 insertions(+)
19 19
20diff --git a/smart/backends/rpm/pm.py b/smart/backends/rpm/pm.py 20Index: git/smart/backends/rpm/pm.py
21index 5da9ee6..f0488ec 100644 21===================================================================
22--- a/smart/backends/rpm/pm.py 22--- git.orig/smart/backends/rpm/pm.py
23+++ b/smart/backends/rpm/pm.py 23+++ git/smart/backends/rpm/pm.py
24@@ -241,6 +241,10 @@ class RPMPackageManager(PackageManager): 24@@ -233,6 +233,11 @@ class RPMPackageManager(PackageManager):
25 except AttributeError: 25 if sysconf.get("rpm-order"):
26 probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH 26 ts.order()
27 27 probfilter = rpm.RPMPROB_FILTER_OLDPACKAGE
28+
28+ if sysconf.get("rpm-ignoresize", False): 29+ if sysconf.get("rpm-ignoresize", False):
29+ probfilter |= rpm.RPMPROB_FILTER_DISKNODES 30+ probfilter |= rpm.RPMPROB_FILTER_DISKNODES
30+ probfilter |= rpm.RPMPROB_FILTER_DISKSPACE 31+ probfilter |= rpm.RPMPROB_FILTER_DISKSPACE
@@ -32,6 +33,3 @@ index 5da9ee6..f0488ec 100644
32 if force or reinstall: 33 if force or reinstall:
33 probfilter |= rpm.RPMPROB_FILTER_REPLACEPKG 34 probfilter |= rpm.RPMPROB_FILTER_REPLACEPKG
34 probfilter |= rpm.RPMPROB_FILTER_REPLACEOLDFILES 35 probfilter |= rpm.RPMPROB_FILTER_REPLACEOLDFILES
35--
361.9.1
37
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-rpm4-fixes.patch b/meta/recipes-devtools/python/python-smartpm/smart-rpm4-fixes.patch
deleted file mode 100644
index 708ffe67d3..0000000000
--- a/meta/recipes-devtools/python/python-smartpm/smart-rpm4-fixes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1
2This patch checks for rpm5 related functions in order to allow rpm4
3to work correctly. Currently the rpm4 archscore and filter work
4differently enough that they need to be changed.
5
6Upstream-Status: Inappropriate [OE-Core Specific]
7
8Signed-off-by: Saul Wold <sgw@linux.intel.com>
9
10Index: smart-1.4.1/smart/backends/rpm/base.py
11===================================================================
12--- smart-1.4.1.orig/smart/backends/rpm/base.py
13+++ smart-1.4.1/smart/backends/rpm/base.py
14@@ -338,10 +338,14 @@ class RPMObsoletes(Depends):
15
16 _SCOREMAP = {}
17 def getArchScore(arch, _sm=_SCOREMAP):
18- if arch not in _sm:
19- score = rpm.archscore(arch)
20- _sm[arch] = score
21- return _sm.get(arch, 0)
22+ try:
23+ rpm.platformscore(arch)
24+ if arch not in _sm:
25+ score = rpm.archscore(arch)
26+ _sm[arch] = score
27+ return _sm.get(arch, 0)
28+ except AttributeError:
29+ return 1
30
31 # TODO: Embed color into nameprovides and obsoletes relations.
32 _COLORMAP = {"noarch": 0, "x86_64": 2, "ppc64": 2, "s390x": 2, "sparc64": 2}
33Index: smart-1.4.1/smart/backends/rpm/pm.py
34===================================================================
35--- smart-1.4.1.orig/smart/backends/rpm/pm.py
36+++ smart-1.4.1/smart/backends/rpm/pm.py
37@@ -235,6 +235,12 @@ class RPMPackageManager(PackageManager):
38 if sysconf.get("rpm-order"):
39 ts.order()
40 probfilter = rpm.RPMPROB_FILTER_OLDPACKAGE
41+ try:
42+ # Test for RPM5 function
43+ rpm.platformscore("")
44+ except AttributeError:
45+ probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
46+
47 if force or reinstall:
48 probfilter |= rpm.RPMPROB_FILTER_REPLACEPKG
49 probfilter |= rpm.RPMPROB_FILTER_REPLACEOLDFILES
diff --git a/meta/recipes-devtools/python/python-smartpm_git.bb b/meta/recipes-devtools/python/python-smartpm_git.bb
index 139bfd5802..d9a908db2e 100644
--- a/meta/recipes-devtools/python/python-smartpm_git.bb
+++ b/meta/recipes-devtools/python/python-smartpm_git.bb
@@ -19,7 +19,6 @@ SRC_URI = "\
19 file://smart-channelsdir.patch \ 19 file://smart-channelsdir.patch \
20 file://smart-attempt.patch \ 20 file://smart-attempt.patch \
21 file://smart-attempt-fix.patch \ 21 file://smart-attempt-fix.patch \
22 file://smart-rpm4-fixes.patch \
23 file://smart-add-for-rpm-ignoresize-check.patch \ 22 file://smart-add-for-rpm-ignoresize-check.patch \
24 file://smart-already-installed-message.patch \ 23 file://smart-already-installed-message.patch \
25 file://smart-set-noprogress-for-pycurl.patch \ 24 file://smart-set-noprogress-for-pycurl.patch \