meta-fii: meta-mori: Uniform syntax for recipes
Update bitbake recipe format to make uniform with the following rules:
1) Generally bbappends should have layer(mori) overrides
2) Add uniform appending by using "append" instead of "+="
3) bb files (excluding bbappends) typically should not have "append"
phrase except for limited amount of variables
(RDEPENDS,DEPENDS,FILES, ...)
4) Wrap lines greater than 80 chars when applicable
5) Switch syntax for long list values over multiple lines to use
four-space indent
In addition, oe-stylize.py was applied to further refine recipe syntax.
Tested: Built successfully. Individual packages were tested for
functionality with no notable change.
Change-Id: I626c529373805aa696f7c574e10c1617493d4f61
Signed-off-by: Kyle Nieman <kyle.nieman@fii-na.com>
diff --git a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend
index 1eb8793..c351919 100644
--- a/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend
+++ b/meta-fii/meta-mori/recipes-phosphor/state/phosphor-state-manager_%.bbappend
@@ -1,19 +1,36 @@
FILESEXTRAPATHS:prepend:mori := "${THISDIR}/${PN}:"
-
DEPENDS:append:mori = " gpioplus"
-EXTRA_OEMESON:append = " -Dhost-gpios=enabled"
+
+SRC_URI:append:mori = " \
+ file://xyz.openbmc_project.State.Chassis@.service \
+ file://xyz.openbmc_project.State.Host@.service \
+"
+
+SYSTEMD_SERVICE:${PN}-host:append:mori = " phosphor-host-condition-gpio@.service"
+
+EXTRA_OEMESON:append:mori = " -Dhost-gpios=enabled"
+
+do_install:append:mori() {
+ install -d ${D}${systemd_system_unitdir}
+ install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Chassis@.service \
+ ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Chassis@.service
+ install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Host@.service \
+ ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Host@.service
+}
FILES:${PN}:append:mori = " ${systemd_system_unitdir}/*"
FILES:${PN}-host:append:mori = " ${bindir}/phosphor-host-condition-gpio"
-SYSTEMD_SERVICE:${PN}-host:append:mori = " phosphor-host-condition-gpio@.service"
+pkg_prerm:${PN}-obmc-targets:prepend:mori() {
+ LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service"
+ rm $LINK
+}
pkg_postinst:${PN}-obmc-targets:prepend:mori() {
mkdir -p $D$systemd_system_unitdir/multi-user.target.requires
LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service"
TARGET="../phosphor-host-condition-gpio@.service"
ln -s $TARGET $LINK
}
-
pkg_postinst:${PN}-obmc-targets:append:mori() {
rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/obmc-host-shutdown@0.target"
rm "$D$systemd_system_unitdir/obmc-host-reboot@0.target.requires/phosphor-reboot-host@0.service"
@@ -23,19 +40,3 @@
rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/obmc-host-stop@0.target"
rm "$D$systemd_system_unitdir/obmc-host-force-warm-reboot@0.target.requires/phosphor-reboot-host@0.service"
}
-
-pkg_prerm:${PN}-obmc-targets:prepend:mori() {
- LINK="$D$systemd_system_unitdir/multi-user.target.requires/phosphor-host-condition-gpio@0.service"
- rm $LINK
-}
-
-SRC_URI:append:mori = " \
- file://xyz.openbmc_project.State.Chassis@.service \
- file://xyz.openbmc_project.State.Host@.service \
- "
-
-do_install:append:mori() {
- install -d ${D}${systemd_system_unitdir}
- install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Chassis@.service ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Chassis@.service
- install -m 0644 ${WORKDIR}/xyz.openbmc_project.State.Host@.service ${D}${systemd_system_unitdir}/xyz.openbmc_project.State.Host@.service
-}