summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-11-29 15:41:02 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:06 +0000
commitb3744b7ead92ad618c2e1b5ad5dcda6f85b8f779 (patch)
treea2664b90fb81ab0977502e18545d3698a5edcb86
parent8d9ee074a407b3178c8a57b4d311b5e1fc71a551 (diff)
downloadpoky-b3744b7ead92ad618c2e1b5ad5dcda6f85b8f779.tar.gz
python-smartpm: allow setting arbitrary macros in smart config
Add support for an rpm-extra-macros config option which can be used to define some extra macros that need to be set for rootfs construction to work on the host and that don't really warrant their own specific named config options to be created. (From OE-Core rev: 0564f7bbe8e06868e107b70d5abbf3dd6c113bad) 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>
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch27
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb1
2 files changed, 28 insertions, 0 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
new file mode 100644
index 0000000000..30cb1767dd
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-rpm-extra-macros.patch
@@ -0,0 +1,27 @@
1backends/rpm: implement rpm-extra-macros option
2
3Allow defining extra macros in the smart configuration to be passed
4to rpm before opening the database.
5
6Upstream-Status: Pending
7
8Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
9
10diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py
11index 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--
261.7.9.5
27
diff --git a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
index 72a307d2b7..4694d517aa 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -19,6 +19,7 @@ SRC_URI = "\
19 file://smartpm-rpm5-nodig.patch \ 19 file://smartpm-rpm5-nodig.patch \
20 file://smart-rpm-root.patch \ 20 file://smart-rpm-root.patch \
21 file://smart-recommends.patch \ 21 file://smart-recommends.patch \
22 file://smart-rpm-extra-macros.patch \
22 file://smart-dflags.patch \ 23 file://smart-dflags.patch \
23 file://smart-rpm-md-parse.patch \ 24 file://smart-rpm-md-parse.patch \
24 file://smart-tmpdir.patch \ 25 file://smart-tmpdir.patch \