diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-11-29 15:38:00 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-06 12:31:06 +0000 |
| commit | 8d9ee074a407b3178c8a57b4d311b5e1fc71a551 (patch) | |
| tree | 4103934b69b219c225389967b93cf7fbe8e4a390 /meta/recipes-devtools/python/python-smartpm/smart-dflags.patch | |
| parent | 4190b027b43c358a21a1fa5662f1231e650c61d4 (diff) | |
| download | poky-8d9ee074a407b3178c8a57b4d311b5e1fc71a551.tar.gz | |
python-smartpm: support nolinktos and noparentdirs rpm options
Allowing us to turn on these options enables installation of base-files
which contains a symlink to /proc/mounts which is auto-detected as a
dependency and isn't provided by any other package.
(From OE-Core rev: 1f0ad78b8fa739f9a68ed4c7bfae2b6d8586fda2)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.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 | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-dflags.patch b/meta/recipes-devtools/python/python-smartpm/smart-dflags.patch new file mode 100644 index 0000000000..3f27262156 --- /dev/null +++ b/meta/recipes-devtools/python/python-smartpm/smart-dflags.patch | |||
| @@ -0,0 +1,40 @@ | |||
| 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 | diff --git a/smart/backends/rpm/pm.py b/smart/backends/rpm/pm.py | ||
| 11 | index 707a146..aec82e7 100644 | ||
| 12 | --- a/smart/backends/rpm/pm.py | ||
| 13 | +++ b/smart/backends/rpm/pm.py | ||
| 14 | @@ -106,6 +106,23 @@ class RPMPackageManager(PackageManager): | ||
| 15 | flags |= rpm.RPMTRANS_FLAG_TEST | ||
| 16 | ts.setFlags(flags) | ||
| 17 | |||
| 18 | + dflags = ts.setDFlags(0) | ||
| 19 | + if sysconf.get("rpm-noupgrade", False): | ||
| 20 | + dflags |= rpm.RPMDEPS_FLAG_NOUPGRADE | ||
| 21 | + if sysconf.get("rpm-norequires", False): | ||
| 22 | + dflags |= rpm.RPMDEPS_FLAG_NOREQUIRES | ||
| 23 | + if sysconf.get("rpm-noconflicts", False): | ||
| 24 | + dflags |= rpm.RPMDEPS_FLAG_NOCONFLICTS | ||
| 25 | + if sysconf.get("rpm-noobsoletes", False): | ||
| 26 | + dflags |= rpm.RPMDEPS_FLAG_NOOBSOLETES | ||
| 27 | + if sysconf.get("rpm-noparentdirs", False): | ||
| 28 | + dflags |= rpm.RPMDEPS_FLAG_NOPARENTDIRS | ||
| 29 | + if sysconf.get("rpm-nolinktos", False): | ||
| 30 | + dflags |= rpm.RPMDEPS_FLAG_NOLINKTOS | ||
| 31 | + if sysconf.get("rpm-nosuggest", False): | ||
| 32 | + dflags |= rpm.RPMDEPS_FLAG_NOSUGGEST | ||
| 33 | + ts.setDFlags(dflags) | ||
| 34 | + | ||
| 35 | # Set rpm verbosity level. | ||
| 36 | levelname = sysconf.get('rpm-log-level') | ||
| 37 | level = { | ||
| 38 | -- | ||
| 39 | 1.7.9.5 | ||
| 40 | |||
