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>
This commit is contained in:
parent
1e9de52ca0
commit
03fce7358d
|
@ -17,14 +17,15 @@ Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
|
||||||
smart/backends/rpm/pm.py | 4 ++++
|
smart/backends/rpm/pm.py | 4 ++++
|
||||||
1 file changed, 4 insertions(+)
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
diff --git a/smart/backends/rpm/pm.py b/smart/backends/rpm/pm.py
|
Index: git/smart/backends/rpm/pm.py
|
||||||
index 5da9ee6..f0488ec 100644
|
===================================================================
|
||||||
--- a/smart/backends/rpm/pm.py
|
--- git.orig/smart/backends/rpm/pm.py
|
||||||
+++ b/smart/backends/rpm/pm.py
|
+++ git/smart/backends/rpm/pm.py
|
||||||
@@ -241,6 +241,10 @@ class RPMPackageManager(PackageManager):
|
@@ -233,6 +233,11 @@ class RPMPackageManager(PackageManager):
|
||||||
except AttributeError:
|
if sysconf.get("rpm-order"):
|
||||||
probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
|
ts.order()
|
||||||
|
probfilter = rpm.RPMPROB_FILTER_OLDPACKAGE
|
||||||
|
+
|
||||||
+ if sysconf.get("rpm-ignoresize", False):
|
+ if sysconf.get("rpm-ignoresize", False):
|
||||||
+ probfilter |= rpm.RPMPROB_FILTER_DISKNODES
|
+ probfilter |= rpm.RPMPROB_FILTER_DISKNODES
|
||||||
+ probfilter |= rpm.RPMPROB_FILTER_DISKSPACE
|
+ probfilter |= rpm.RPMPROB_FILTER_DISKSPACE
|
||||||
|
@ -32,6 +33,3 @@ index 5da9ee6..f0488ec 100644
|
||||||
if force or reinstall:
|
if force or reinstall:
|
||||||
probfilter |= rpm.RPMPROB_FILTER_REPLACEPKG
|
probfilter |= rpm.RPMPROB_FILTER_REPLACEPKG
|
||||||
probfilter |= rpm.RPMPROB_FILTER_REPLACEOLDFILES
|
probfilter |= rpm.RPMPROB_FILTER_REPLACEOLDFILES
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
||||||
|
|
|
@ -1,49 +0,0 @@
|
||||||
|
|
||||||
This patch checks for rpm5 related functions in order to allow rpm4
|
|
||||||
to work correctly. Currently the rpm4 archscore and filter work
|
|
||||||
differently enough that they need to be changed.
|
|
||||||
|
|
||||||
Upstream-Status: Inappropriate [OE-Core Specific]
|
|
||||||
|
|
||||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
|
||||||
|
|
||||||
Index: smart-1.4.1/smart/backends/rpm/base.py
|
|
||||||
===================================================================
|
|
||||||
--- smart-1.4.1.orig/smart/backends/rpm/base.py
|
|
||||||
+++ smart-1.4.1/smart/backends/rpm/base.py
|
|
||||||
@@ -338,10 +338,14 @@ class RPMObsoletes(Depends):
|
|
||||||
|
|
||||||
_SCOREMAP = {}
|
|
||||||
def getArchScore(arch, _sm=_SCOREMAP):
|
|
||||||
- if arch not in _sm:
|
|
||||||
- score = rpm.archscore(arch)
|
|
||||||
- _sm[arch] = score
|
|
||||||
- return _sm.get(arch, 0)
|
|
||||||
+ try:
|
|
||||||
+ rpm.platformscore(arch)
|
|
||||||
+ if arch not in _sm:
|
|
||||||
+ score = rpm.archscore(arch)
|
|
||||||
+ _sm[arch] = score
|
|
||||||
+ return _sm.get(arch, 0)
|
|
||||||
+ except AttributeError:
|
|
||||||
+ return 1
|
|
||||||
|
|
||||||
# TODO: Embed color into nameprovides and obsoletes relations.
|
|
||||||
_COLORMAP = {"noarch": 0, "x86_64": 2, "ppc64": 2, "s390x": 2, "sparc64": 2}
|
|
||||||
Index: smart-1.4.1/smart/backends/rpm/pm.py
|
|
||||||
===================================================================
|
|
||||||
--- smart-1.4.1.orig/smart/backends/rpm/pm.py
|
|
||||||
+++ smart-1.4.1/smart/backends/rpm/pm.py
|
|
||||||
@@ -235,6 +235,12 @@ class RPMPackageManager(PackageManager):
|
|
||||||
if sysconf.get("rpm-order"):
|
|
||||||
ts.order()
|
|
||||||
probfilter = rpm.RPMPROB_FILTER_OLDPACKAGE
|
|
||||||
+ try:
|
|
||||||
+ # Test for RPM5 function
|
|
||||||
+ rpm.platformscore("")
|
|
||||||
+ except AttributeError:
|
|
||||||
+ probfilter |= rpm.RPMPROB_FILTER_IGNOREARCH
|
|
||||||
+
|
|
||||||
if force or reinstall:
|
|
||||||
probfilter |= rpm.RPMPROB_FILTER_REPLACEPKG
|
|
||||||
probfilter |= rpm.RPMPROB_FILTER_REPLACEOLDFILES
|
|
|
@ -19,7 +19,6 @@ SRC_URI = "\
|
||||||
file://smart-channelsdir.patch \
|
file://smart-channelsdir.patch \
|
||||||
file://smart-attempt.patch \
|
file://smart-attempt.patch \
|
||||||
file://smart-attempt-fix.patch \
|
file://smart-attempt-fix.patch \
|
||||||
file://smart-rpm4-fixes.patch \
|
|
||||||
file://smart-add-for-rpm-ignoresize-check.patch \
|
file://smart-add-for-rpm-ignoresize-check.patch \
|
||||||
file://smart-already-installed-message.patch \
|
file://smart-already-installed-message.patch \
|
||||||
file://smart-set-noprogress-for-pycurl.patch \
|
file://smart-set-noprogress-for-pycurl.patch \
|
||||||
|
|
Loading…
Reference in New Issue