mirror of
https://git.yoctoproject.org/poky
synced 2026-02-05 16:28:43 +01:00
05b02d27d2
* Remove the following patches since the are already in the source: smart-config-ignore-all-recommends.patch smart-conflict-provider.patch smart-dflags.patch smart-filename-NAME_MAX.patch smart-flag-exclude-packages.patch smart-flag-ignore-recommends.patch smart-metadata-match.patch smart-multilib-fixes.patch smart-rpm-extra-macros.patch smart-rpm-md-parse.patch smart-rpm-root.patch smart-tmpdir.patch smart-yaml-error.patch * Update the following patches, part of the code are already in the source: smart-attempt.patch smart-improve-error-reporting.patch smart-recommends.patch smartpm-rpm5-nodig.patch * Use github and git repo as the SRC_URI. (From OE-Core rev: 5fc580fc444e45d00de0e50d32b6e6e0b2e6b7ea) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
60 lines
2.7 KiB
Diff
60 lines
2.7 KiB
Diff
RPM5 has removed support for RPMVSF_NOSIGNATURES
|
|
|
|
Patch smart to no longer use this flag
|
|
|
|
Upstream-Status: Pending
|
|
|
|
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
|
|
|
|
diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py
|
|
--- a/smart/backends/rpm/base.py
|
|
+++ b/smart/backends/rpm/base.py
|
|
@@ -63,11 +63,11 @@ def getTS(new=False):
|
|
if sysconf.get("rpm-dbpath"):
|
|
rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath"))
|
|
getTS.ts = rpm.ts(getTS.root)
|
|
- if not sysconf.get("rpm-check-signatures", False):
|
|
- if hasattr(rpm, '_RPMVSF_NOSIGNATURES'):
|
|
- getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
|
|
- else:
|
|
- raise Error, _("rpm requires checking signatures")
|
|
+ #if not sysconf.get("rpm-check-signatures", False):
|
|
+ # if hasattr(rpm, '_RPMVSF_NOSIGNATURES'):
|
|
+ # getTS.ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
|
|
+ # else:
|
|
+ # raise Error, _("rpm requires checking signatures")
|
|
rpm_dbpath = sysconf.get("rpm-dbpath", "var/lib/rpm")
|
|
dbdir = rpm_join_dbpath(getTS.root, rpm_dbpath)
|
|
if not os.path.isdir(dbdir):
|
|
@@ -89,11 +89,11 @@ def getTS(new=False):
|
|
if sysconf.get("rpm-dbpath"):
|
|
rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath"))
|
|
ts = rpm.ts(getTS.root)
|
|
- if not sysconf.get("rpm-check-signatures", False):
|
|
- if hasattr(rpm, '_RPMVSF_NOSIGNATURES'):
|
|
- ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
|
|
- else:
|
|
- raise Error, _("rpm requires checking signatures")
|
|
+ #if not sysconf.get("rpm-check-signatures", False):
|
|
+ # if hasattr(rpm, '_RPMVSF_NOSIGNATURES'):
|
|
+ # ts.setVSFlags(rpm._RPMVSF_NOSIGNATURES)
|
|
+ # else:
|
|
+ # raise Error, _("rpm requires checking signatures")
|
|
return ts
|
|
else:
|
|
return getTS.ts
|
|
diff --git a/smart/plugins/yumchannelsync.py b/smart/plugins/yumchannelsync.py
|
|
--- a/smart/plugins/yumchannelsync.py
|
|
+++ b/smart/plugins/yumchannelsync.py
|
|
@@ -56,8 +56,8 @@ def _getreleasever():
|
|
|
|
rpmroot = sysconf.get("rpm-root", "/")
|
|
ts = rpmUtils.transaction.initReadOnlyTransaction(root=rpmroot)
|
|
- if hasattr(rpm, '_RPMVSF_NOSIGNATURES') and hasattr(rpm, '_RPMVSF_NODIGESTS'):
|
|
- ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
|
|
+ #if hasattr(rpm, '_RPMVSF_NOSIGNATURES') and hasattr(rpm, '_RPMVSF_NODIGESTS'):
|
|
+ # ts.pushVSFlags(~(rpm._RPMVSF_NOSIGNATURES|rpm._RPMVSF_NODIGESTS))
|
|
releasever = None
|
|
# HACK: we're hard-coding the most used distros, will add more if needed
|
|
idx = ts.dbMatch('provides', 'fedora-release')
|