[isar-cip-core] swupdate: Clean up do_prepare_build

Commit Message

Jan Kiszka Sept. 11, 2020, 12:40 p.m. UTC

From: Jan Kiszka <[e-mail]>

Reformat and drop the unused DEBDIR var (which wouldn't work anyway due
to DEBDIR definition in Isar's bitbake.conf)

Signed-off-by: Jan Kiszka <[e-mail]>
---
 recipes-core/swupdate/swupdate.bb | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

Patch

diff --git a/recipes-core/swupdate/swupdate.bb b/recipes-core/swupdate/swupdate.bb
index 95cf73a..dd02cc2 100644
--- a/recipes-core/swupdate/swupdate.bb
+++ b/recipes-core/swupdate/swupdate.bb
@@ -39,16 +39,14 @@  TEMPLATE_FILES = "debian/changelog.tmpl debian/control.tmpl debian/rules.tmpl"
 TEMPLATE_VARS += "BUILD_DEB_DEPENDS DEFCONFIG DEBIAN_DEPENDS"
 
 do_prepare_build() {
-        DEBDIR=${S}/debian
-        cp -R ${WORKDIR}/debian ${S}
-
-        install -m 0644 ${WORKDIR}/${PN}.cfg ${S}/swupdate.cfg
-        install -m 0644 ${WORKDIR}/${DEFCONFIG}.gen ${S}/configs/${DEFCONFIG}
-
-        if ! grep -q "configs/${DEFCONFIG}" ${S}/.gitignore
-        then
-                echo "configs/${DEFCONFIG}" >> ${S}/.gitignore
-        fi
-        # luahandler
-        install -m 0644 ${WORKDIR}/${SWUPDATE_LUASCRIPT} ${S}
+    cp -R ${WORKDIR}/debian ${S}
+
+    install -m 0644 ${WORKDIR}/${PN}.cfg ${S}/swupdate.cfg
+    install -m 0644 ${WORKDIR}/${DEFCONFIG}.gen ${S}/configs/${DEFCONFIG}
+
+    if ! grep -q "configs/${DEFCONFIG}" ${S}/.gitignore; then
+        echo "configs/${DEFCONFIG}" >> ${S}/.gitignore
+    fi
+    # luahandler
+    install -m 0644 ${WORKDIR}/${SWUPDATE_LUASCRIPT} ${S}
 }