bab9bb6b69
Create new directories: ceph config config-files filesystem kernel kernel/kernel-modules ldap logging strorage-drivers tools utilities virt Retire directories: connectivity core devtools support extended Delete two packages: tgt irqbalance Relocated packages: base/ dhcp initscripts libevent lighttpd linuxptp memcached net-snmp novnc ntp openssh pam procps sanlock shadow sudo systemd util-linux vim watchdog ceph/ python-cephclient config/ facter puppet-4.8.2 puppet-modules filesystem/ e2fsprogs nfs-utils nfscheck kernel/ kernel-std kernel-rt kernel/kernel-modules/ mlnx-ofa_kernel ldap/ nss-pam-ldapd openldap logging/ syslog-ng logrotate networking/ lldpd iproute mellanox python-ryu mlx4-config python/ python-2.7.5 python-django python-gunicorn python-setuptools python-smartpm python-voluptuous security/ shim-signed shim-unsigned tboot strorage-drivers/ python-3parclient python-lefthandclient virt/ cloud-init libvirt libvirt-python qemu tools/ storage-topology vm-topology utilities/ tis-extensions namespace-utils nova-utils update-motd Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86 Story: 2002801 Task: 22687 Signed-off-by: Scott Little <scott.little@windriver.com>
28 lines
849 B
Diff
28 lines
849 B
Diff
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
|
|
|