From 81616c60caa005e7bf10603d3f92f8b37451aeda Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@xilinx.com>
Date: Thu, 14 Oct 2021 11:40:10 -0700
Subject: lopper: move to bbappend, remove obsolete items

Lopper is now provided in meta-virtualization, but that version appears
to be a bit older then what we need.

For the python modules that were depended by lopper, many are no available
in native and nativesdk versions.  Remove unnecessary bbappends.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
---
 meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb    | 56 ----------------------
 .../recipes-kernel/lopper/lopper.bbappend          | 54 +++++++++++++++++++++
 2 files changed, 54 insertions(+), 56 deletions(-)
 delete mode 100644 meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
 create mode 100644 meta-xilinx-bsp/recipes-kernel/lopper/lopper.bbappend

(limited to 'meta-xilinx-bsp/recipes-kernel')

diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
deleted file mode 100644
index fc8dc755..00000000
--- a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bb
+++ /dev/null
@@ -1,56 +0,0 @@
-SUMMARY = "Device tree lopper"
-DESCRIPTION = "Tool to subset a system device tree"
-SECTION = "bootloader"
-LICENSE = "BSD-3-Clause"
-
-RDEPENDS:${PN} += " \
-    python3-core \
-    dtc \
-    python3-dtc \
-    python3-flask \
-    python3-flask-restful \
-    python3-six \
-    python3-pandas \
-    python3-ruamel-yaml \
-    python3-anytree \
-    python3-pyyaml \
-    python3-humanfriendly \
-"
-
-SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master"
-
-LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8e5f5f691f01c9fdfa7a7f2d535be619"
-
-SRCREV = "4fc085c4be031996e7f48dcaf03d0782989c8d58"
-
-S = "${WORKDIR}/git"
-
-do_configure() {
-	:
-}
-
-do_compile() {
-	sed -i 's,#!/usr/bin/python3,#!/usr/bin/env python3,' lopper.py
-	sed -i 's,#!/usr/bin/python3,#!/usr/bin/env python3,' lopper_sanity.py
-}
-
-do_install() {
-	datadirrelpath=${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}
-
-	mkdir -p ${D}/${bindir}
-	mkdir -p ${D}/${datadir}/lopper
-
-	cp -r ${S}/README* ${D}/${datadir}/lopper/.
-	cp -r ${S}/assists* ${D}/${datadir}/lopper/.
-	cp -r ${S}/lop* ${D}/${datadir}/lopper/.
-	cp -r ${S}/LICENSE* ${D}/${datadir}/lopper/.
-	cp -r ${S}/device-tree* ${D}/${datadir}/lopper/.
-	cp -r ${S}/.gitignore ${D}/${datadir}/lopper/.
-	if [ -f ${S}/*.dts ]; then
-		cp -rf ${S}/*.dts ${D}/${datadir}/lopper/.
-	fi
-
-	ln -s ${datadirrelpath}/lopper/lopper.py ${D}/${bindir}/.
-}
-
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bbappend b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bbappend
new file mode 100644
index 00000000..aa552fe5
--- /dev/null
+++ b/meta-xilinx-bsp/recipes-kernel/lopper/lopper.bbappend
@@ -0,0 +1,54 @@
+DEPENDS = " \
+    dtc \
+    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-pyyaml \
+"
+
+SRC_URI = "git://github.com/devicetree-org/lopper.git;branch=master"
+SRCREV = "4fc085c4be031996e7f48dcaf03d0782989c8d58"
+
+do_install() {
+    install -d "${D}/${bindir}"
+    install -d "${D}/${datadir}/${BPN}"
+
+    install -m 0644 "${S}/README" "${D}/${datadir}/${BPN}"
+    install -m 0644 "${S}/README-architecture.txt" "${D}/${datadir}/${BPN}"
+    install -m 0644 "${S}/README.pydoc" "${D}/${datadir}/${BPN}"
+    install -m 0644 "${S}/LICENSE.md" "${D}/${datadir}/${BPN}"
+
+    install -d "${D}/${datadir}/${BPN}/assists"
+    #install -m 0644 "${S}/assists/"* "${D}/${datadir}/${BPN}/assists/"
+    cp -r "${S}/assists/"* "${D}/${datadir}/${BPN}/assists/"
+
+    install -d "${D}/${datadir}/${BPN}/lops"
+    install -m 0644 "${S}/lops/"* "${D}/${datadir}/${BPN}/lops/"
+
+    install -d "${D}/${datadir}/${BPN}/device-trees"
+    install -m 0644 "${S}/device-trees/"* "${D}/${datadir}/${BPN}/device-trees/"
+
+    install -m 0644 "${S}/"lopper.ini "${D}/${datadir}/${BPN}/"
+
+    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
+
+    datadir_relpath=${@os.path.relpath(d.getVar('datadir'), d.getVar('bindir'))}
+    ln -s "${datadir_relpath}/${BPN}/lopper.py" "${D}/${bindir}/"
+}
-- 
cgit v1.2.3-54-g00ecf