diff options
author | Joshua Lock <joshua.g.lock@intel.com> | 2016-11-25 15:28:52 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2016-12-02 09:16:17 +0100 |
commit | efd3696e70a6603f1a45faa4a172433514f0a487 (patch) | |
tree | b72751ba93b050391db05a8e1be7506836b6d515 /meta-oe/recipes-support/postgresql | |
parent | 761639b9d7681c81dd69eaf3a37c32791d6e97fd (diff) | |
download | meta-openembedded-efd3696e70a6603f1a45faa4a172433514f0a487.tar.gz |
remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.
Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Diffstat (limited to 'meta-oe/recipes-support/postgresql')
-rw-r--r-- | meta-oe/recipes-support/postgresql/postgresql.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-support/postgresql/postgresql.inc b/meta-oe/recipes-support/postgresql/postgresql.inc index 454624caa..f720cbca2 100644 --- a/meta-oe/recipes-support/postgresql/postgresql.inc +++ b/meta-oe/recipes-support/postgresql/postgresql.inc | |||
@@ -91,7 +91,7 @@ python populate_packages_prepend() { | |||
91 | fpack="${PN}-" + name + "-dbg" + " " + fpack | 91 | fpack="${PN}-" + name + "-dbg" + " " + fpack |
92 | d.setVar('PACKAGES', fpack) | 92 | d.setVar('PACKAGES', fpack) |
93 | 93 | ||
94 | conf=(d.getVar('PACKAGECONFIG', True) or "").split() | 94 | conf=(d.getVar('PACKAGECONFIG') or "").split() |
95 | pack=d.getVar('PACKAGES', False) or "" | 95 | pack=d.getVar('PACKAGES', False) or "" |
96 | bb.debug(1, "PACKAGECONFIG=%s" % conf) | 96 | bb.debug(1, "PACKAGECONFIG=%s" % conf) |
97 | bb.debug(1, "PACKAGES1=%s" % pack ) | 97 | bb.debug(1, "PACKAGES1=%s" % pack ) |
@@ -105,7 +105,7 @@ python populate_packages_prepend() { | |||
105 | if "python" in conf: | 105 | if "python" in conf: |
106 | fill_more("plpython") | 106 | fill_more("plpython") |
107 | 107 | ||
108 | pack=d.getVar('PACKAGES', True) or "" | 108 | pack=d.getVar('PACKAGES') or "" |
109 | bb.debug(1, "PACKAGES2=%s" % pack) | 109 | bb.debug(1, "PACKAGES2=%s" % pack) |
110 | 110 | ||
111 | } | 111 | } |
@@ -191,7 +191,7 @@ do_install_append() { | |||
191 | # multiple server config directory | 191 | # multiple server config directory |
192 | install -d -m 700 ${D}${sysconfdir}/default/${BPN} | 192 | install -d -m 700 ${D}${sysconfdir}/default/${BPN} |
193 | 193 | ||
194 | if [ "${@d.getVar('enable_pam', True)}" = "pam" ]; then | 194 | if [ "${@d.getVar('enable_pam')}" = "pam" ]; then |
195 | install -d ${D}${sysconfdir}/pam.d | 195 | install -d ${D}${sysconfdir}/pam.d |
196 | install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql | 196 | install -m 644 ${WORKDIR}/postgresql.pam ${D}${sysconfdir}/pam.d/postgresql |
197 | fi | 197 | fi |
@@ -221,7 +221,7 @@ FILES_${PN} += "${sysconfdir}/init.d/${BPN}-server \ | |||
221 | ${libdir}/${BPN}/libpqwalreceiver.so \ | 221 | ${libdir}/${BPN}/libpqwalreceiver.so \ |
222 | ${libdir}/${BPN}/*_and_*.so \ | 222 | ${libdir}/${BPN}/*_and_*.so \ |
223 | ${@'${sysconfdir}/pam.d/postgresql' \ | 223 | ${@'${sysconfdir}/pam.d/postgresql' \ |
224 | if 'pam' == d.getVar('enable_pam', True) \ | 224 | if 'pam' == d.getVar('enable_pam') \ |
225 | else ''} \ | 225 | else ''} \ |
226 | " | 226 | " |
227 | 227 | ||