X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-stx%2Frecipes-core%2Fstx-gui%2Fstx-gui.bb;h=3c914d2b5b11cccb5f1b6c62224083f7d3158ac2;hb=refs%2Fchanges%2F25%2F4225%2F1;hp=5325f8599a6bec61aa0d1e223f2a1286927f2fc9;hpb=57fdea704bd62af847872c40508f00aa1d7cac60;p=pti%2Frtp.git diff --git a/meta-stx/recipes-core/stx-gui/stx-gui.bb b/meta-stx/recipes-core/stx-gui/stx-gui.bb index 5325f85..3c914d2 100644 --- a/meta-stx/recipes-core/stx-gui/stx-gui.bb +++ b/meta-stx/recipes-core/stx-gui/stx-gui.bb @@ -38,9 +38,9 @@ DEPENDS = "\ python-pbr-native \ " -#RDEPENDS_starlingx-dashboard += " \ -# openstack-dashboard \ -# " +RDEPENDS_starlingx-dashboard += " \ + python-django-horizon \ + " RDEPENDS_starlingx-dashboard_append = " \ ${PYTHON_PN}-cephclient \ @@ -61,17 +61,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 \ "