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-rpm-extra-macros.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-rpm-extra-macros.patch')
| -rw-r--r-- | meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch b/meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch deleted file mode 100644 index 30cb1767dd..0000000000 --- a/meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch +++ /dev/null | |||
| @@ -1,27 +0,0 @@ | |||
| 1 | backends/rpm: implement rpm-extra-macros option | ||
| 2 | |||
| 3 | Allow defining extra macros in the smart configuration to be passed | ||
| 4 | to rpm before opening the database. | ||
| 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/base.py b/smart/backends/rpm/base.py | ||
| 11 | index b9e9cb2..234c844 100644 | ||
| 12 | --- a/smart/backends/rpm/base.py | ||
| 13 | +++ b/smart/backends/rpm/base.py | ||
| 14 | @@ -53,6 +53,10 @@ def rpm_join_dbpath(root, dbpath): | ||
| 15 | return os.path.join(root, dbpath) | ||
| 16 | |||
| 17 | def getTS(new=False): | ||
| 18 | + if sysconf.get("rpm-extra-macros"): | ||
| 19 | + for key, value in sysconf.get("rpm-extra-macros").items(): | ||
| 20 | + rpm.addMacro(key, str(value)) | ||
| 21 | + | ||
| 22 | rpm_root = os.path.abspath(sysconf.get("rpm-root", "/")) | ||
| 23 | if not hasattr(getTS, "ts") or getTS.root != rpm_root: | ||
| 24 | getTS.root = rpm_root | ||
| 25 | -- | ||
| 26 | 1.7.9.5 | ||
| 27 | |||
