isp-imx: Normalize the recipe source folder

The source folder of the recipe is adjusted to the appshell sub-folder
to facilitate building of that folder. This causes complicated adjustments
for the license and patch files.

Restore the source folder to the default and use OECMAKE_SOURCEPATH to direct the
build to the appshell sub-folder.

Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
(cherry picked from commit 5910cd66fc290842218a17efffb4433026b27a52)

diff --git a/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb b/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb
index 1e363d132626400aae6652470b242ee71d224769..53894baf88f2560d8158f0c014e880642bf3af15 100644 (file)
--- a/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb
+++ b/recipes-bsp/isp-imx/isp-imx_4.2.2.11.0.bb
@@ -2,21 +2,22 @@
 
 DESCRIPTION = "i.MX Verisilicon Software ISP"
 LICENSE = "Proprietary"
-LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
+LIC_FILES_CHKSUM = "file://COPYING;md5=3c3fe2b904fd694f28d2f646ee16dddb"
 
 inherit fsl-eula-unpack cmake systemd
 
 SRC_URI = "${FSL_MIRROR}/${BPN}-${PV}.bin;fsl-eula=true \
-          file://0001-start_isp.sh-fix-test-to-be-generic.patch;patchdir=.. \
+          file://0001-start_isp.sh-fix-test-to-be-generic.patch \
 "
 
 SRC_URI[md5sum] = "75f79ba556c47172b9a0cbc3a877e604"
 SRC_URI[sha256sum] = "28e2ee909f29a256c4eac87ef8336932d90a88a2a183389ac0868212954af42c"
 
-S = "${WORKDIR}/${PN}-${PV}/appshell"
-
 DEPENDS = "python3 libdrm"
 
+# Build the sub-folder appshell
+OECMAKE_SOURCEPATH = "${S}/appshell"
+
 OECMAKE_GENERATOR = "Unix Makefiles"
 
 SYSTEMD_SERVICE_${PN} = "imx8-isp.service"