diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-07-08 00:23:48 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-09 18:00:18 +0100 |
commit | 05b02d27d2115c0af32988bb3b43286f7943471c (patch) | |
tree | 436f4bb3fef2875da1051a41630530b7aeafdae0 /meta/recipes-devtools/python/python-smartpm/smart-dflags.patch | |
parent | f9ac3f3e200e4fd0dfe0f45ddc606ce945ea0143 (diff) | |
download | poky-05b02d27d2115c0af32988bb3b43286f7943471c.tar.gz |
python-smartpm: 1.4.1 -> 1.5
* 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>
Diffstat (limited to 'meta/recipes-devtools/python/python-smartpm/smart-dflags.patch')
-rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-dflags.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-dflags.patch b/meta/recipes-devtools/python/python-smartpm/smart-dflags.patch deleted file mode 100644 index 531ea51cad..0000000000 --- a/meta/recipes-devtools/python/python-smartpm/smart-dflags.patch +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | backends/rpm: add support for setting dependency flags | ||
2 | |||
3 | This is useful for OpenEmbedded so that we can do the equivalent of | ||
4 | the --nolinktos and --noparentdirs rpm command line options. | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> | ||
9 | |||
10 | [sgw - Added try/catch for rpm4 since it does not have setDFlags() API] | ||
11 | |||
12 | Signed-off-by: Saul Wold <sgw@linux.intel.com> | ||
13 | |||
14 | |||
15 | Index: smart-1.4.1/smart/backends/rpm/pm.py | ||
16 | =================================================================== | ||
17 | --- smart-1.4.1.orig/smart/backends/rpm/pm.py | ||
18 | +++ smart-1.4.1/smart/backends/rpm/pm.py | ||
19 | @@ -106,6 +106,26 @@ class RPMPackageManager(PackageManager): | ||
20 | flags |= rpm.RPMTRANS_FLAG_TEST | ||
21 | ts.setFlags(flags) | ||
22 | |||
23 | + try: | ||
24 | + dflags = ts.setDFlags(0) | ||
25 | + if sysconf.get("rpm-noupgrade", False): | ||
26 | + dflags |= rpm.RPMDEPS_FLAG_NOUPGRADE | ||
27 | + if sysconf.get("rpm-norequires", False): | ||
28 | + dflags |= rpm.RPMDEPS_FLAG_NOREQUIRES | ||
29 | + if sysconf.get("rpm-noconflicts", False): | ||
30 | + dflags |= rpm.RPMDEPS_FLAG_NOCONFLICTS | ||
31 | + if sysconf.get("rpm-noobsoletes", False): | ||
32 | + dflags |= rpm.RPMDEPS_FLAG_NOOBSOLETES | ||
33 | + if sysconf.get("rpm-noparentdirs", False): | ||
34 | + dflags |= rpm.RPMDEPS_FLAG_NOPARENTDIRS | ||
35 | + if sysconf.get("rpm-nolinktos", False): | ||
36 | + dflags |= rpm.RPMDEPS_FLAG_NOLINKTOS | ||
37 | + if sysconf.get("rpm-nosuggest", False): | ||
38 | + dflags |= rpm.RPMDEPS_FLAG_NOSUGGEST | ||
39 | + ts.setDFlags(dflags) | ||
40 | + except AttributeError, ae: | ||
41 | + pass | ||
42 | + | ||
43 | # Set rpm verbosity level. | ||
44 | levelname = sysconf.get('rpm-log-level') | ||
45 | level = { | ||