summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorAndre McCurdy <armccurdy@gmail.com>2017-11-14 11:39:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-30 10:49:21 +0000
commitda2e7e006de50939dee7aa5e080c0193b71f9fc9 (patch)
tree8b346c4252299d48534f2401ebb01884673ef388 /meta/recipes-core/systemd
parent974ee3d70729e6b2812b7a21e8c27694f05b4cad (diff)
downloadpoky-da2e7e006de50939dee7aa5e080c0193b71f9fc9.tar.gz
systemd: use consistent indenting and coding style in do_install()
Make the polkit fixup etc at the end of do_install() more consistent with the rest of the function. Also indent do_install_ptest() with tabs instead of spaces to make do_install_ptest() consistent with do_install(). (From OE-Core rev: 7a188e646a7a713ec5eab73580de624dc61f2936) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb49
1 files changed, 24 insertions, 25 deletions
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 1e2377a49f..d4e0b1f01e 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -219,7 +219,6 @@ do_install() {
219 # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable 219 # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable
220 touch ${D}${sysconfdir}/machine-id 220 touch ${D}${sysconfdir}/machine-id
221 221
222
223 install -d ${D}${sysconfdir}/udev/rules.d/ 222 install -d ${D}${sysconfdir}/udev/rules.d/
224 install -d ${D}${sysconfdir}/tmpfiles.d 223 install -d ${D}${sysconfdir}/tmpfiles.d
225 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ 224 install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/
@@ -275,39 +274,39 @@ do_install() {
275 fi 274 fi
276 install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install 275 install -Dm 0755 ${S}/src/systemctl/systemd-sysv-install.SKELETON ${D}${systemd_unitdir}/systemd-sysv-install
277 276
278 # If polkit is setup fixup permissions and ownership 277 # If polkit is setup fixup permissions and ownership
279 if [ "${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'polkit', '', d)}" = "polkit" ] ; then 278 if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then
280 if [ -d ${D}${datadir}/polkit-1/rules.d ] ; then 279 if [ -d ${D}${datadir}/polkit-1/rules.d ]; then
281 chmod 700 ${D}${datadir}/polkit-1/rules.d 280 chmod 700 ${D}${datadir}/polkit-1/rules.d
282 chown polkitd:root ${D}${datadir}/polkit-1/rules.d 281 chown polkitd:root ${D}${datadir}/polkit-1/rules.d
283 fi 282 fi
284 fi 283 fi
285} 284}
286 285
287do_install_ptest () { 286do_install_ptest () {
288 # install data files needed for tests 287 # install data files needed for tests
289 install -d ${D}${PTEST_PATH}/tests/test 288 install -d ${D}${PTEST_PATH}/tests/test
290 cp -rfL ${S}/test/* ${D}${PTEST_PATH}/tests/test 289 cp -rfL ${S}/test/* ${D}${PTEST_PATH}/tests/test
291 # python is disabled for systemd, thus removing these python testing scripts 290 # python is disabled for systemd, thus removing these python testing scripts
292 rm ${D}${PTEST_PATH}/tests/test/*.py 291 rm ${D}${PTEST_PATH}/tests/test/*.py
293 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/tests/test/udev-test.pl 292 sed -i 's/"tree"/"ls"/' ${D}${PTEST_PATH}/tests/test/udev-test.pl
294 293
295 install -d ${D}${PTEST_PATH}/tests/catalog 294 install -d ${D}${PTEST_PATH}/tests/catalog
296 install ${S}/catalog/* ${D}${PTEST_PATH}/tests/catalog/ 295 install ${S}/catalog/* ${D}${PTEST_PATH}/tests/catalog/
297 296
298 install -D ${S}/build-aux/test-driver ${D}${PTEST_PATH}/tests/build-aux/test-driver 297 install -D ${S}/build-aux/test-driver ${D}${PTEST_PATH}/tests/build-aux/test-driver
299 298
300 install -d ${D}${PTEST_PATH}/tests/rules 299 install -d ${D}${PTEST_PATH}/tests/rules
301 install ${B}/rules/* ${D}${PTEST_PATH}/tests/rules/ 300 install ${B}/rules/* ${D}${PTEST_PATH}/tests/rules/
302 301
303 # This directory needs to be there for udev-test.pl to work. 302 # This directory needs to be there for udev-test.pl to work.
304 install -d ${D}${libdir}/udev/rules.d 303 install -d ${D}${libdir}/udev/rules.d
305 304
306 # install actual test binaries 305 # install actual test binaries
307 install -m 0755 ${B}/test-* ${D}${PTEST_PATH}/tests/ 306 install -m 0755 ${B}/test-* ${D}${PTEST_PATH}/tests/
308 install -m 0755 ${B}/.libs/test-* ${D}${PTEST_PATH}/tests/ 307 install -m 0755 ${B}/.libs/test-* ${D}${PTEST_PATH}/tests/
309 308
310 install ${B}/Makefile ${D}${PTEST_PATH}/tests/ 309 install ${B}/Makefile ${D}${PTEST_PATH}/tests/
311} 310}
312 311
313python populate_packages_prepend (){ 312python populate_packages_prepend (){