From 71fc32743921d758778d6a6a5d12ca24ad9ef03a Mon Sep 17 00:00:00 2001
From: Max Krummenacher <max.krummenacher@toradex.com>
Date: Tue, 11 Sep 2018 10:10:34 +0200
Subject: snapd: cleanup

Replace a bunch of += assignments with = .
Put all RDEPENDS into one statement.
Cleanup indent to the prefered OE 4 spaces per level.

Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
---
 recipes-support/snapd/snapd_2.25.bb | 97 +++++++++++++++++++------------------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/recipes-support/snapd/snapd_2.25.bb b/recipes-support/snapd/snapd_2.25.bb
index 7ea5349..e1998e8 100644
--- a/recipes-support/snapd/snapd_2.25.bb
+++ b/recipes-support/snapd/snapd_2.25.bb
@@ -4,8 +4,8 @@ LICENSE = "GPL-3.0"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 SRC_URI = " \
-	https://github.com/snapcore/snapd/releases/download/${PV}/snapd_${PV}.vendor.tar.xz \
-	file://0001-cmd-make-rst2man-optional.patch \
+    https://github.com/snapcore/snapd/releases/download/${PV}/snapd_${PV}.vendor.tar.xz \
+    file://0001-cmd-make-rst2man-optional.patch \
 "
 
 SRC_URI[md5sum] = "453ffdc2ecdbb7058ac193f81ac37135"
@@ -13,27 +13,28 @@ SRC_URI[sha256sum] = "accd4c94049ce79443ff995c27111f3851e9896bbad502dd5d341f8847
 
 GO_IMPORT = "github.com/snapcore/snapd"
 
-DEPENDS += " \
-	virtual/${TARGET_PREFIX}go \
-	glib-2.0 \
-	python3-docutils-native \
-	udev \
-	xfsprogs \
+DEPENDS = " \
+    virtual/${TARGET_PREFIX}go \
+    glib-2.0 \
+    python3-docutils-native \
+    udev \
+    xfsprogs \
 "
 
-RDEPENDS_${PN} += " \
-	ca-certificates \
-	kernel-module-squashfs \
+RDEPENDS_${PN} = " \
+    ca-certificates \
+    kernel-module-squashfs \
+    squashfs-tools \
 "
 
 S = "${WORKDIR}/${PN}-${PV}"
 
 ARM_INSTRUCTION_SET = "arm"
 
-EXTRA_OECONF += " \
-	--disable-apparmor \
-	--disable-seccomp \
-	--libexecdir=${libdir}/snapd \
+EXTRA_OECONF = " \
+    --disable-apparmor \
+    --disable-seccomp \
+    --libexecdir=${libdir}/snapd \
 "
 
 inherit systemd go autotools pkgconfig python3native
@@ -45,52 +46,52 @@ AUTOTOOLS_SCRIPT_PATH = "${S}/cmd"
 SYSTEMD_SERVICE_${PN} = "snapd.service"
 
 do_configure_prepend() {
-	(cd ${S} ; ./mkversion.sh ${PV})
+    (cd ${S} ; ./mkversion.sh ${PV})
 }
+
 do_configure_append() {
-	go_do_configure
+    go_do_configure
 }
 
 do_compile() {
-	# Ensure we our component at the right place in our GOPATH
-	mkdir -p ${STAGING_LIBDIR}/${TARGET_SYS}/go/src/github.com/snapcore
-	ln -sf ${S} ${STAGING_LIBDIR}/${TARGET_SYS}/go/src/github.com/snapcore/snapd
+    # Ensure we our component at the right place in our GOPATH
+    mkdir -p ${STAGING_LIBDIR}/${TARGET_SYS}/go/src/github.com/snapcore
+    ln -sf ${S} ${STAGING_LIBDIR}/${TARGET_SYS}/go/src/github.com/snapcore/snapd
 
-	for d in snap snapd snap-exec snapctl; do
-		GOPATH=${STAGING_LIBDIR}/${TARGET_SYS}/go ${GO} build -x github.com/snapcore/snapd/cmd/$d
-	done
+    for d in snap snapd snap-exec snapctl; do
+        GOPATH=${STAGING_LIBDIR}/${TARGET_SYS}/go ${GO} build -x github.com/snapcore/snapd/cmd/$d
+    done
 
-	oe_runmake
+    oe_runmake
 }
 
 do_install() {
-	install -d ${D}${libdir}/snapd
-	install -d ${D}${bindir}
-	install -d ${D}${systemd_unitdir}/system
-	install -d ${D}/var/lib/snapd
-	install -d ${D}/var/lib/snapd/snaps
-	install -d ${D}/var/lib/snapd/lib/gl
-	install -d ${D}/var/lib/snapd/desktop
-	install -d ${D}/var/snap
-	install -d ${D}${sysconfdir}/profile.d
-
-	oe_runmake -C ${B} install DESTDIR=${D}
-	oe_runmake -C ${S}/data/systemd install DESTDIR=${D}
-
-	install -m 0755 ${B}/snapd ${D}${libdir}/snapd/
-	install -m 0755 ${B}/snap-exec ${D}${libdir}/snapd/
-	install -m 0755 ${B}/snap ${D}${bindir}
-	install -m 0755 ${B}/snapctl ${D}${bindir}
-
-	echo "PATH=\$PATH:/snap/bin" > ${D}${sysconfdir}/profile.d/20-snap.sh
+    install -d ${D}${libdir}/snapd
+    install -d ${D}${bindir}
+    install -d ${D}${systemd_unitdir}/system
+    install -d ${D}/var/lib/snapd
+    install -d ${D}/var/lib/snapd/snaps
+    install -d ${D}/var/lib/snapd/lib/gl
+    install -d ${D}/var/lib/snapd/desktop
+    install -d ${D}/var/snap
+    install -d ${D}${sysconfdir}/profile.d
+
+    oe_runmake -C ${B} install DESTDIR=${D}
+    oe_runmake -C ${S}/data/systemd install DESTDIR=${D}
+
+    install -m 0755 ${B}/snapd ${D}${libdir}/snapd/
+    install -m 0755 ${B}/snap-exec ${D}${libdir}/snapd/
+    install -m 0755 ${B}/snap ${D}${bindir}
+    install -m 0755 ${B}/snapctl ${D}${bindir}
+
+    echo "PATH=\$PATH:/snap/bin" > ${D}${sysconfdir}/profile.d/20-snap.sh
 }
 
-RDEPENDS_${PN} += "squashfs-tools"
 FILES_${PN} += " \
-	${systemd_unitdir}/system/ \
-	/var/lib/snapd \
-	/var/snap \
-	${baselib}/udev/snappy-app-dev \
+    ${systemd_unitdir}/system/ \
+    /var/lib/snapd \
+    /var/snap \
+    ${baselib}/udev/snappy-app-dev \
 "
 
 # ERROR: snapd-2.23.5-r0 do_package_qa: QA Issue: No GNU_HASH in the elf binary:
-- 
cgit v1.2.3