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-08 13:13:17 +0100 |
| commit | 5fc580fc444e45d00de0e50d32b6e6e0b2e6b7ea (patch) | |
| tree | 484aff4471a7d3f81f73422c9c1a72131e9ec7a5 /meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch | |
| parent | cb8fc7521cdaaa7b8f82a0c6dfc6526778c99099 (diff) | |
| download | openembedded-core-contrib-5fc580fc444e45d00de0e50d32b6e6e0b2e6b7ea.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.
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 @@ -backends/rpm: implement rpm-extra-macros option - -Allow defining extra macros in the smart configuration to be passed -to rpm before opening the database. - -Upstream-Status: Pending - -Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> - -diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py -index b9e9cb2..234c844 100644 ---- a/smart/backends/rpm/base.py -+++ b/smart/backends/rpm/base.py -@@ -53,6 +53,10 @@ def rpm_join_dbpath(root, dbpath): - return os.path.join(root, dbpath) - - def getTS(new=False): -+ if sysconf.get("rpm-extra-macros"): -+ for key, value in sysconf.get("rpm-extra-macros").items(): -+ rpm.addMacro(key, str(value)) -+ - rpm_root = os.path.abspath(sysconf.get("rpm-root", "/")) - if not hasattr(getTS, "ts") or getTS.root != rpm_root: - getTS.root = rpm_root --- -1.7.9.5 - |