From 4b09f810c4e74d6e51638ce5d49eca183f1d560c Mon Sep 17 00:00:00 2001
From: Tom Hochstein <tom.hochstein@nxp.com>
Date: Fri, 14 Jun 2019 14:05:04 -0500
Subject: [PATCH] imx-dpu-g2d: Cleanup

- Fix order
- Fix SRC_URI warning to use BPN, not PN
- Remove redundant setting of S

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
---
 .../imx-dpu-g2d/imx-dpu-g2d_1.7.0.bb          | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.7.0.bb b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.7.0.bb
index d29c2827..a4ca208a 100644
--- a/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.7.0.bb
+++ b/recipes-graphics/imx-dpu-g2d/imx-dpu-g2d_1.7.0.bb
@@ -5,33 +5,26 @@
 DESCRIPTION = "GPU G2D library and apps for i.MX with 2D GPU and DPU"
 LICENSE = "Proprietary"
 LIC_FILES_CHKSUM = "file://COPYING;md5=80c0478f4339af024519b3723023fe28"
-
-RDEPENDS_${PN} = "libgal-imx libdrm"
-
 PROVIDES += "virtual/libg2d"
 
-SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true"
-
-S="${WORKDIR}/${PN}-${PV}"
-
-inherit fsl-eula-unpack
-
+SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true"
 SRC_URI[md5sum] = "a47ae6db002b47031e44d8402c40604e"
 SRC_URI[sha256sum] = "5a2785ba1f4e4ea6f61ab98f8408600adca9decd66511e6665023325184bf7e9"
 
-do_install () {
+inherit fsl-eula-unpack
 
+do_install () {
     install -d ${D}${libdir}
     install -d ${D}${includedir}
-
     cp -r ${S}/g2d/usr/lib/*.so* ${D}${libdir}
     cp -Pr ${S}/g2d/usr/include/* ${D}${includedir}
     cp -r ${S}/gpu-demos/opt ${D}
 }
 
-INSANE_SKIP_${PN} += "ldflags"
-
 FILES_${PN} = "${libdir}/libg2d* /opt"
 FILES_${PN}-dev = "${libdir}/libg2d${SOLIBSDEV} ${includedir}"
+INSANE_SKIP_${PN} += "ldflags"
+
+RDEPENDS_${PN} = "libgal-imx libdrm"
 
 COMPATIBLE_MACHINE = "(imxdpu)"
-- 
2.40.1