starlingx
/
meta-starlingx
Code Issues Proposed changes

stx-gui: put starlingx specific files to right pythonpath 

horizon is expecting pythonpath to be
    /usr/share/openstack-dashboard/openstack_dashboard/

so part of starlingx-dashboard files should be placed this
path instead of ${PYTHON_SITEPACKAGES_DIR}

Signed-off-by: Litao Gao <litao.gao@windriver.com>
Signed-off-by: Babak Sarashki <Babak.SarAshki@windriver.com>
This commit is contained in:
Litao Gao 2020-05-12 08:01:03 -04:00 committed by Babak Sarashki
parent 8c5697aafd
commit d21cfb3ffa
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta-stx-flock/stx-gui/stx-gui.bb
View File

@ -24,9 +24,9 @@ DEPENDS = "\
python-pbr-native \
"
#RDEPENDS_starlingx-dashboard += " \
# openstack-dashboard \
# "
RDEPENDS_starlingx-dashboard += " \
python-django-horizon \
"
RDEPENDS_starlingx-dashboard_append = " \
${PYTHON_PN}-cephclient \
@ -47,17 +47,22 @@ do_compile () {
do_install () {
cd ${S}/starlingx-dashboard/starlingx-dashboard
distutils_do_install
#install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/enabled/
#install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/themes/starlingx/
#install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d
#install -p -D -m 755 build/lib/starlingx_dashboard/enabled/* \
# ${D}/${datadir}/openstack-dashboard/openstack_dashboard/enabled/
#install -p -D -m 755 build/lib/starlingx_dashboard/themes/* \
# ${D}/${datadir}/openstack-dashboard/openstack_dashboard/themes/starlingx_dashboard
#install -p -D -m 755 build/lib/starlingx_dashboard/local/local_settings.d/* \
# ${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d
install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/enabled/
install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/themes/starlingx/
install -d -m 0755 ${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d
cp -ra ${D}${PYTHON_SITEPACKAGES_DIR}/starlingx_dashboard/enabled/* \
${D}/${datadir}/openstack-dashboard/openstack_dashboard/enabled/
cp -ra ${D}${PYTHON_SITEPACKAGES_DIR}/starlingx_dashboard/themes/starlingx/* \
${D}/${datadir}/openstack-dashboard/openstack_dashboard/themes/starlingx/
cp -ra ${D}${PYTHON_SITEPACKAGES_DIR}/starlingx_dashboard/local/local_settings.d/* \
${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d
# comment out this line with syntax error
sed -i -e 's|^OPENSTACK_NEUTRON_NETWORK|# &|' \
${D}/${datadir}/openstack-dashboard/openstack_dashboard/local/local_settings.d/_30_stx_local_settings.py
}
FILES_starlingx-dashboard = " \
${PYTHON_SITEPACKAGES_DIR} \
${datadir}/openstack-dashboard/openstack_dashboard \
"