diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2018-11-23 09:43:19 -0200 |
|---|---|---|
| committer |   Armin Kuster <akuster808@gmail.com> | 2019-02-04 21:11:45 -0800 |
| commit | 9d20db53be1131ecd9cc4ae968d44b8f79dab545 (patch) | |
| tree | 1ea792dca66e1ec197b3bf5f07c7933c05b83f54 | |
| parent | d3bb421fa1d1503b1ad216dd0a5fc6fa4a4a4494 (diff) | |
| download | meta-openembedded-contrib-9d20db53be1131ecd9cc4ae968d44b8f79dab545.tar.gz | |
postgresql: Allow successful run of postgresql-setup
The postgresql-setup utility log-in on postgres user to create the
database, however, the shell was set to bash and it wasn't being
installed as runtime dependency.
This rework this expectation to use busybox ash as shell and avoid the
new dependency
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta-oe/recipes-dbs/postgresql/files/postgresql-profile (renamed from meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile) | 0 | ||||
| -rw-r--r-- | meta-oe/recipes-dbs/postgresql/postgresql.inc | 8 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile b/meta-oe/recipes-dbs/postgresql/files/postgresql-profile index 1c931f37fd..1c931f37fd 100644 --- a/meta-oe/recipes-dbs/postgresql/files/postgresql-bashprofile +++ b/meta-oe/recipes-dbs/postgresql/files/postgresql-profile diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc index 3bf71f02e9..dc85224543 100644 --- a/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -25,7 +25,7 @@ ARM_INSTRUCTION_SET = "arm" SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ file://postgresql.init \ - file://postgresql-bashprofile \ + file://postgresql-profile \ file://postgresql.pam \ file://postgresql-setup \ file://postgresql.service \ @@ -155,7 +155,7 @@ usernum = "28" groupnum = "28" USERADD_PACKAGES = "${PN}" USERADD_PARAM_${PN} = "-M -g postgres -o -r -d ${localstatedir}/lib/${BPN} \ - -s /bin/bash -c 'PostgreSQL Server' -u ${usernum} postgres" + -s /bin/sh -c 'PostgreSQL Server' -u ${usernum} postgres" GROUPADD_PARAM_${PN} = "-g ${groupnum} -o -r postgres" INITSCRIPT_PACKAGES = "${PN}" @@ -182,7 +182,7 @@ do_install_append() { install -m 0755 ${WORKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup install -d -m 700 ${D}${localstatedir}/lib/${BPN}/data install -d -m 700 ${D}${localstatedir}/lib/${BPN}/backups - install -m 644 ${WORKDIR}/${BPN}-bashprofile ${D}${localstatedir}/lib/${BPN}/.bash_profile + install -m 644 ${WORKDIR}/${BPN}-profile ${D}${localstatedir}/lib/${BPN}/.profile chown -R postgres:postgres ${D}${localstatedir}/lib/${BPN} # multiple server config directory install -d -m 700 ${D}${sysconfdir}/default/${BPN} @@ -222,7 +222,7 @@ RPROVIDES_${PN}-dbg += "libecpg-compat-dbg \ FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ ${localstatedir}/lib/${BPN}/data ${localstatedir}/lib/${BPN}/backups \ - ${localstatedir}/lib/${BPN}/.bash_profile ${sysconfdir}/default/${BPN} \ + ${localstatedir}/lib/${BPN}/.profile ${sysconfdir}/default/${BPN} \ ${libdir}/${BPN}/dict_snowball.so ${libdir}/${BPN}/plpgsql.so \ ${libdir}/${BPN}/euc2004_sjis2004.so \ ${libdir}/${BPN}/libpqwalreceiver.so \ |