From: Harrison Marcks hmarcks@thegoodpenguin.co.uk
Signed-off-by: Harrison Carter hcarter@thegoodpenguin.co.uk --- recipes-dbs/postgresql/postgresql-morello_9.6.bb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/recipes-dbs/postgresql/postgresql-morello_9.6.bb b/recipes-dbs/postgresql/postgresql-morello_9.6.bb index 6ca7934..20ed21c 100644 --- a/recipes-dbs/postgresql/postgresql-morello_9.6.bb +++ b/recipes-dbs/postgresql/postgresql-morello_9.6.bb @@ -1,6 +1,6 @@ require postgresql-morello.inc
-FILESEXTRAPATHS:prepend := "${THISDIR}/postgresql:${THISDIR}/cheri-patches:" +FILESEXTRAPATHS:prepend := "${THISDIR}/postgresql:${THISDIR}/cheri-patches:${THISDIR}/files:"
PVBASE = "9.6" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=87da2b84884860b71f5f24ab37e7da78" @@ -59,6 +59,9 @@ PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl-morello,"
export PRINTF_SIZE_T_SUPPORT="yes"
+PG_INIT_SERVICE_FILE = "${D}${systemd_unitdir}/system/postgresql-init.service" +PG_SERVICE_FILE = "${D}${systemd_unitdir}/system/postgresql.service" + do_install:append() {
install_dir="${D}" @@ -71,11 +74,11 @@ do_install:append() { sed -e "s:%DB_DATADIR%:${DB_DATADIR}:g" -i ${D_DEST_DIR}/postgresql-init sed -e "s:%PGINSTALLDIR%:${prefix}:g" -i ${D_DEST_DIR}/postgresql-init sed -e "s:%BINDIR%:${bindir}:g" -i ${D_DEST_DIR}/postgresql-init + sed -e "s:%SYSCONFDIR%:${sysconfdir}:g" -i ${D_DEST_DIR}/postgresql-init
install -d ${D}${systemd_unitdir}/system/
- PG_INIT_SERVICE_FILE=${D}${systemd_unitdir}/system/postgresql-init.service install -m 644 ${WORKDIR}/postgresql-init.service ${PG_INIT_SERVICE_FILE}
sed -e "s:%PGINSTALLDIR%:${prefix}:g" -i ${PG_INIT_SERVICE_FILE} @@ -85,8 +88,8 @@ do_install:append() {
sed -e "s:%DB_USER%:${DB_USER}:g" -i ${PG_INIT_SERVICE_FILE} sed -e "s:%DB_PASSWORD%:${DB_PASSWORD}:g" -i ${PG_INIT_SERVICE_FILE} + sed -e "s:%DB_ROOT_PASSWORD%:${DB_ROOT_PASSWORD}:g" -i ${PG_INIT_SERVICE_FILE}
- PG_SERVICE_FILE=${D}${systemd_unitdir}/system/postgresql.service install -m 644 ${WORKDIR}/postgresql-morello.service ${PG_SERVICE_FILE}
sed -e 's,%BINDIR%,${bindir},g' -i ${PG_SERVICE_FILE} @@ -152,4 +155,5 @@ FILES:${PN}-dbg += " \ ${libdir}/${BPN_POSTGRESQL}/pgxs/src/test/regress/test-schedule \ "
-FILES:${PN}-gdb-debug += "/gdb_debug" \ No newline at end of file +FILES:${PN}-gdb-debug += "/gdb_debug" +RPROVIDES:${PN} += "postgresql-setup"