summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-11-29 15:35:36 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-12-06 12:31:06 +0000
commit4190b027b43c358a21a1fa5662f1231e650c61d4 (patch)
tree25ed65ee28363dc32da997293cd5fc1be70554ca
parent81dded6e9565734c7afe8b8dd89617305ab69bb0 (diff)
downloadpoky-4190b027b43c358a21a1fa5662f1231e650c61d4.tar.gz
python-smartpm: don't create /var/tmp on every rpm database open
This directory if present in the rootfs interferes with proper installation of base-files and doesn't seem to need to be there for smart/rpm to work in any case. (From OE-Core rev: 54d227e97ff3498fc2149f96f1ca40452ad21a32) 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-tmpdir.patch30
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb1
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-tmpdir.patch b/meta/recipes-devtools/python/python-smartpm/smart-tmpdir.patch
new file mode 100644
index 0000000000..2f09ce9248
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-tmpdir.patch
@@ -0,0 +1,30 @@
1backends/rpm: remove creation of /var/tmp
2
3This doesn't appear to be needed, and breaks installation of base-files
4in OpenEmbedded (since that is a symlink installed as part of the
5package).
6
7Upstream-Status: Pending
8
9Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
10
11diff --git a/smart/backends/rpm/base.py b/smart/backends/rpm/base.py
12index 234c844..127354d 100644
13--- a/smart/backends/rpm/base.py
14+++ b/smart/backends/rpm/base.py
15@@ -82,12 +82,6 @@ def getTS(new=False):
16 else:
17 iface.warning(_("Initialized new rpm database at %s")
18 % getTS.root)
19- tmpdir = os.path.join(getTS.root, "var/tmp")
20- if not os.path.isdir(tmpdir):
21- try:
22- os.makedirs(tmpdir)
23- except OSError:
24- pass
25 if new:
26 if sysconf.get("rpm-dbpath"):
27 rpm.addMacro('_dbpath', "/" + sysconf.get("rpm-dbpath"))
28--
291.7.9.5
30
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 2d0f7cd641..9ec7c7a4ec 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -20,6 +20,7 @@ SRC_URI = "\
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-md-parse.patch \ 22 file://smart-rpm-md-parse.patch \
23 file://smart-tmpdir.patch \
23 " 24 "
24 25
25SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" 26SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"