2 files changed, 37 insertions, 45 deletions

diff --git a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend
index 034dce2d..ccbc19e2 100644
--- a/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend
@@ -1,53 +1,43 @@
-DEPENDS = " \
-    dtc \
+SUMMARY = "Device Tree Lopper"
+DESCRIPTION = "Tool for manipulation of system device tree files"
+LICENSE = "BSD-3-Clause"
+SECTION = "bootloader"
+
+FILESEXTRAPATHS:append := ":${THISDIR}/lopper"
+
+SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master;protocol=https"
+SRCREV = "f70eb86385f49545070a84ad756902b3cd607e21"
+S = "${WORKDIR}/git"
+
+PV="v1.0.2+git${SRCPV}"
+
+LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619"
+
+RDEPENDS:${PN} = " \
+    python3-core \
     python3-dtc \
-    python3-flask \
-    python3-flask-restful \
-    python3-six \
-    python3-pandas \
-    python3-ruamel-yaml \
-    python3-anytree \
-    python3-pyyaml \
     python3-humanfriendly \
-"
-
-RDEPENDS:${PN} += " \
-    python3-flask \
-    python3-flask-restful \
-    python3-six \
-    python3-pandas \
     python3-ruamel-yaml \
     python3-anytree \
+    python3-six \
     python3-pyyaml \
-"
+    "
 
-SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master"
-SRCREV = "17350a773a73c426a826e32e4e093effc718ecf5"
-
-do_install() {
-    install -d "${D}/${bindir}"
-    install -d "${D}/${datadir}/${BPN}"
+inherit setuptools3
 
-    install -m 0644 "${S}/README.md" "${D}/${datadir}/${BPN}"
-    install -m 0644 "${S}/README-architecture.md" "${D}/${datadir}/${BPN}"
-    install -m 0644 "${S}/README.pydoc" "${D}/${datadir}/${BPN}"
-    install -m 0644 "${S}/LICENSE.md" "${D}/${datadir}/${BPN}"
+INHIBIT_PACKAGE_STRIP = "1"
 
-    install -d "${D}/${datadir}/${BPN}/assists"
-    cp -r "${S}/lopper/assists/"* "${D}/${datadir}/${BPN}/assists/"
-
-    install -d "${D}/${datadir}/${BPN}/lops"
-    install -m 0644 "${S}/lopper/lops/"* "${D}/${datadir}/${BPN}/lops/"
-
-    install -d "${D}/${datadir}/${BPN}/device-trees"
-    install -m 0644 "${S}/device-trees/"* "${D}/${datadir}/${BPN}/device-trees/"
+do_install() {
+        distutils3_do_install
 
-    install -m 0644 "${S}/lopper/"lopper.ini "${D}/${datadir}/${BPN}/"
+        # we have to remove the vendor'd libfdt, since an attempt to strip it
+        # will be made, and it will fail in a cross environment.
+        rm -rf ${D}/${PYTHON_SITEPACKAGES_DIR}/${BPN}/vendor
+}
 
-    install -m 0755 "${S}/"lopper*.py "${D}/${datadir}/${BPN}/"
-    sed -i 's,#!/usr/bin/python3,#!/usr/bin/env python3,' ${D}/${datadir}/${BPN}/lopper.py
-    sed -i 's,#!/usr/bin/python3,#!/usr/bin/env python3,' ${D}/${datadir}/${BPN}/lopper_sanity.py
+BBCLASSEXTEND = "native nativesdk"
 
-    datadir_relpath=${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}
-    ln -s "${datadir_relpath}/${BPN}/lopper.py" "${D}/${bindir}/"
+python() {
+    d.delVarFlag('do_configure', 'noexec')
+    d.delVarFlag('do_compile', 'noexec')
 }
diff --git a/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
index 77456376..38ec473b 100644
--- a/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
+++ b/meta-xilinx-core/recipes-kernel/lopper/xilinx-lops.bb
@@ -14,14 +14,16 @@ LIC_FILES_CHKSUM = "file://lop-microblaze-yocto.dts;endline=8;md5=a0e89d39fa397e
 
 S = "${WORKDIR}"
 
+inherit python3-dir
+
 do_configure[noexec] = '1'
 do_compile[noexec] = '1'
 
 do_install() {
-        mkdir -p ${D}/${datadir}/lopper/lops
-        cp ${S}/lop-microblaze-yocto.dts ${D}/${datadir}/lopper/lops/.
-        cp ${S}/lop-xilinx-id-cpus.dts   ${D}/${datadir}/lopper/lops/.
+        mkdir -p ${D}/${PYTHON_SITEPACKAGES_DIR}/lopper/lops
+        cp ${S}/lop-microblaze-yocto.dts ${D}/${PYTHON_SITEPACKAGES_DIR}/lopper/lops/.
+        cp ${S}/lop-xilinx-id-cpus.dts   ${D}/${PYTHON_SITEPACKAGES_DIR}/lopper/lops/.
 }
 
-FILES:${PN} += "${datadir}/lopper/lops"
+FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}/lopper/lops"
 BBCLASSEXTEND = "native nativesdk"