summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Marinescu <bogdan.a.marinescu@intel.com>2013-04-08 18:02:38 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-08 16:57:03 +0100
commit02ae9b357676c904721d92a9c6f74ecc6b7a4476 (patch)
tree0b541b5b3785891e64dd2b2d99ea3523bf1a502b
parent4e46d6f2353b852f255500e774dc5653d3c7cd05 (diff)
downloadpoky-02ae9b357676c904721d92a9c6f74ecc6b7a4476.tar.gz
smart: disable CHANNELSDIR
Make CHANNELSDIR in smart empty, since this causes host contamination issues on some RPM-based hosts on which smart is already installed. [YOCTO #3881] (From OE-Core rev: 94e76a98b6cdafe9547630be159401ac1d8c5edd) Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/python/python-smartpm/smart-channelsdir.patch24
-rw-r--r--meta/recipes-devtools/python/python-smartpm_1.4.1.bb3
2 files changed, 26 insertions, 1 deletions
diff --git a/meta/recipes-devtools/python/python-smartpm/smart-channelsdir.patch b/meta/recipes-devtools/python/python-smartpm/smart-channelsdir.patch
new file mode 100644
index 0000000000..e621b33875
--- /dev/null
+++ b/meta/recipes-devtools/python/python-smartpm/smart-channelsdir.patch
@@ -0,0 +1,24 @@
1Make CHANNELSDIR in smart empty, since this causes host contamination issues
2on some RPM-based hosts on which smart is already installed.
3
4[YOCTO #3881]
5
6Upstream-Status: Inappropriate [embedded specific]
7
8diff --git a/smart/plugins/channelsync.py b/smart/plugins/channelsync.py
9index 3ba95ff..646d696 100644
10--- a/smart/plugins/channelsync.py
11+++ b/smart/plugins/channelsync.py
12@@ -23,7 +23,11 @@ from smart.channel import *
13 from smart import *
14 import os
15
16-CHANNELSDIR = "/etc/smart/channels/"
17+# For now, we leave the definition of CHANNELSDIR empty. This prevents smart
18+# from erroneously consider the build host's channels while setting up its
19+# channels [YOCTO #3881]. If this feature will be used in the future, CHANNELSDIR
20+# should be set to a proper value.
21+CHANNELSDIR = ""
22
23 def syncChannels(channelsdir, force=None):
24
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 d92933fa3a..001d9e4d02 100644
--- a/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
+++ b/meta/recipes-devtools/python/python-smartpm_1.4.1.bb
@@ -11,7 +11,7 @@ LICENSE = "GPLv2"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" 11LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
12 12
13DEPENDS = "python rpm" 13DEPENDS = "python rpm"
14PR = "r8" 14PR = "r9"
15SRCNAME = "smart" 15SRCNAME = "smart"
16 16
17SRC_URI = "\ 17SRC_URI = "\
@@ -27,6 +27,7 @@ SRC_URI = "\
27 file://smart-improve-error-reporting.patch \ 27 file://smart-improve-error-reporting.patch \
28 file://smart-multilib-fixes.patch \ 28 file://smart-multilib-fixes.patch \
29 file://smart-yaml-error.patch \ 29 file://smart-yaml-error.patch \
30 file://smart-channelsdir.patch \
30 " 31 "
31 32
32SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6" 33SRC_URI[md5sum] = "573ef32ba177a6b3c4bf7ef04873fcb6"