diff options
| -rw-r--r-- | meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc | 2 | ||||
| -rw-r--r-- | meta-openstack/recipes-support/salt/salt_3000.bb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc b/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc index b6a9c3c2..3de5845b 100644 --- a/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc +++ b/meta-openstack/recipes-dbs/postgresql/postgresql_openstack.inc @@ -35,7 +35,7 @@ do_install_append() { sed -e "s:%SYSCONFIGDIR%:${sysconfdir}:g" -i ${PG_INIT_SERVICE_FILE} # Update PGDATA throughout - files="${D}${localstatedir}/lib/${BPN}/.bash_profile" + files="${D}${localstatedir}/lib/${BPN}/.profile" files="$files ${D}${systemd_unitdir}/system/postgresql.service" files="$files ${D}${bindir}/${BPN}-setup" files="$files ${D}${sysconfdir}/init.d/${BPN}-server" diff --git a/meta-openstack/recipes-support/salt/salt_3000.bb b/meta-openstack/recipes-support/salt/salt_3000.bb index c2bc8da0..5ddb42bb 100644 --- a/meta-openstack/recipes-support/salt/salt_3000.bb +++ b/meta-openstack/recipes-support/salt/salt_3000.bb @@ -104,7 +104,7 @@ RRECOMMENDS_${PN}-common = "lsb" RSUGGESTS_${PN}-common = "python3-mako python3-git" RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)" CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}" -FILES_${PN}-common = "${bindir}/${PN}-call ${libdir}/python3.7/ ${CONFFILES_${PN}-common}" +FILES_${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}" SUMMARY_${PN}-ssh = "remote manager to administer servers via salt" DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \ @@ -128,7 +128,7 @@ FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_u SUMMARY_${PN}-master = "remote manager to administer servers via salt" DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller." -RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack" +RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-distro" RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}" RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}" CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master ${sysconfdir}/${PN}/master" |