summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-dbs/postgresql/postgresql.inc
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2018-11-23 09:43:19 -0200
committerKhem Raj <raj.khem@gmail.com>2018-11-26 09:38:14 -0800
commit103939fecd540e048a00b2f6e44bc2e05431d023 (patch)
tree4e55b7657c933a1b8693711a4e581109067bb5eb /meta-oe/recipes-dbs/postgresql/postgresql.inc
parent0f2535455ea76ec532eea5cf460f1c9a26cf4f9b (diff)
downloadmeta-openembedded-103939fecd540e048a00b2f6e44bc2e05431d023.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>
Diffstat (limited to 'meta-oe/recipes-dbs/postgresql/postgresql.inc')
-rw-r--r--meta-oe/recipes-dbs/postgresql/postgresql.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-oe/recipes-dbs/postgresql/postgresql.inc
index 3bf71f02e..dc8522454 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"
25 25
26SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \ 26SRC_URI = "http://ftp.postgresql.org/pub/source/v${PV}/${BP}.tar.bz2 \
27 file://postgresql.init \ 27 file://postgresql.init \
28 file://postgresql-bashprofile \ 28 file://postgresql-profile \
29 file://postgresql.pam \ 29 file://postgresql.pam \
30 file://postgresql-setup \ 30 file://postgresql-setup \
31 file://postgresql.service \ 31 file://postgresql.service \
@@ -155,7 +155,7 @@ usernum = "28"
155groupnum = "28" 155groupnum = "28"
156USERADD_PACKAGES = "${PN}" 156USERADD_PACKAGES = "${PN}"
157USERADD_PARAM_${PN} = "-M -g postgres -o -r -d ${localstatedir}/lib/${BPN} \ 157USERADD_PARAM_${PN} = "-M -g postgres -o -r -d ${localstatedir}/lib/${BPN} \
158 -s /bin/bash -c 'PostgreSQL Server' -u ${usernum} postgres" 158 -s /bin/sh -c 'PostgreSQL Server' -u ${usernum} postgres"
159GROUPADD_PARAM_${PN} = "-g ${groupnum} -o -r postgres" 159GROUPADD_PARAM_${PN} = "-g ${groupnum} -o -r postgres"
160 160
161INITSCRIPT_PACKAGES = "${PN}" 161INITSCRIPT_PACKAGES = "${PN}"
@@ -182,7 +182,7 @@ do_install_append() {
182 install -m 0755 ${WORKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup 182 install -m 0755 ${WORKDIR}/${BPN}-setup ${D}${bindir}/${BPN}-setup
183 install -d -m 700 ${D}${localstatedir}/lib/${BPN}/data 183 install -d -m 700 ${D}${localstatedir}/lib/${BPN}/data
184 install -d -m 700 ${D}${localstatedir}/lib/${BPN}/backups 184 install -d -m 700 ${D}${localstatedir}/lib/${BPN}/backups
185 install -m 644 ${WORKDIR}/${BPN}-bashprofile ${D}${localstatedir}/lib/${BPN}/.bash_profile 185 install -m 644 ${WORKDIR}/${BPN}-profile ${D}${localstatedir}/lib/${BPN}/.profile
186 chown -R postgres:postgres ${D}${localstatedir}/lib/${BPN} 186 chown -R postgres:postgres ${D}${localstatedir}/lib/${BPN}
187 # multiple server config directory 187 # multiple server config directory
188 install -d -m 700 ${D}${sysconfdir}/default/${BPN} 188 install -d -m 700 ${D}${sysconfdir}/default/${BPN}
@@ -222,7 +222,7 @@ RPROVIDES_${PN}-dbg += "libecpg-compat-dbg \
222 222
223FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ 223FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \
224 ${localstatedir}/lib/${BPN}/data ${localstatedir}/lib/${BPN}/backups \ 224 ${localstatedir}/lib/${BPN}/data ${localstatedir}/lib/${BPN}/backups \
225 ${localstatedir}/lib/${BPN}/.bash_profile ${sysconfdir}/default/${BPN} \ 225 ${localstatedir}/lib/${BPN}/.profile ${sysconfdir}/default/${BPN} \
226 ${libdir}/${BPN}/dict_snowball.so ${libdir}/${BPN}/plpgsql.so \ 226 ${libdir}/${BPN}/dict_snowball.so ${libdir}/${BPN}/plpgsql.so \
227 ${libdir}/${BPN}/euc2004_sjis2004.so \ 227 ${libdir}/${BPN}/euc2004_sjis2004.so \
228 ${libdir}/${BPN}/libpqwalreceiver.so \ 228 ${libdir}/${BPN}/libpqwalreceiver.so \