From 526a965c33fb8fca5e7b2492c91645f9d8cb8ea3 Mon Sep 17 00:00:00 2001
From: Mihai Prica <prica.mihai@gmail.com>
Date: Tue, 23 Jul 2013 10:56:00 +0300
Subject: python-horizon: Fix bindir search path

An error occurs because horizon searches for lessc in
/usr/lib/python2.7/site-packages/bin while this is
installed in /usr/share/bin.

Signed-off-by: Mihai Prica <prica.mihai@gmail.com>
---
 .../python/python-horizon/fix_bindir_path.patch           | 15 +++++++++++++++
 .../recipes-devtools/python/python-horizon_2013.1.2.bb    |  3 +++
 2 files changed, 18 insertions(+)
 create mode 100644 meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch

(limited to 'meta-openstack/recipes-devtools/python')

diff --git a/meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch b/meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch
new file mode 100644
index 0000000..c9d0b1a
--- /dev/null
+++ b/meta-openstack/recipes-devtools/python/python-horizon/fix_bindir_path.patch
@@ -0,0 +1,15 @@
+Upstream-Status: Inappropriate [configuration]
+
+Index: horizon-2013.1.2/openstack_dashboard/settings.py
+===================================================================
+--- horizon-2013.1.2.orig/openstack_dashboard/settings.py
++++ horizon-2013.1.2/openstack_dashboard/settings.py
+@@ -29,7 +29,7 @@ warnings.formatwarning = lambda message,
+                                 '%s: %s' % (category.__name__, message)
+ 
+ ROOT_PATH = os.path.dirname(os.path.abspath(__file__))
+-BIN_DIR = os.path.abspath(os.path.join(ROOT_PATH, '..', 'bin'))
++BIN_DIR = os.path.abspath(os.path.join(ROOT_PATH, 'bin'))
+ 
+ if ROOT_PATH not in sys.path:
+     sys.path.append(ROOT_PATH)
diff --git a/meta-openstack/recipes-devtools/python/python-horizon_2013.1.2.bb b/meta-openstack/recipes-devtools/python/python-horizon_2013.1.2.bb
index 5e222db..fcf3e38 100644
--- a/meta-openstack/recipes-devtools/python/python-horizon_2013.1.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-horizon_2013.1.2.bb
@@ -25,6 +25,7 @@ SRCNAME = "horizon"
 
 SRC_URI = "https://launchpad.net/horizon/grizzly/${PV}/+download/${SRCNAME}-${PV}.tar.gz \
     file://horizon.init \
+    file://fix_bindir_path.patch \
     "
 
 SRC_URI[md5sum] = "23db8455f768c830485ef283c06f0e65"
@@ -51,6 +52,8 @@ do_install_append() {
         sed 's:@PYTHON_SITEPACKAGES@:${PYTHON_SITEPACKAGES_DIR}:' ${WORKDIR}/horizon.init >${WORKDIR}/horizon
         install -m 0755 ${WORKDIR}/horizon ${D}${sysconfdir}/init.d/horizon
     fi
+
+    mv ${D}${datadir}/bin ${DASHBOARD_DIR}/bin
 }
 
 PACKAGES += "${SRCNAME}"
-- 
cgit v1.2.3-54-g00ecf