From db61d8e2a7a3ebe46a3482bf3dfa191a1cfc43b7 Mon Sep 17 00:00:00 2001
From: Mark Hatle <mark.hatle@xilinx.com>
Date: Fri, 14 Jan 2022 15:57:22 -0800
Subject: core: Move lopper and python modules to dynamic-layers

Lopper comes from meta-virtualization, the python modules are required by
it and the related changes.

Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
---
 meta-xilinx-core/conf/layer.conf                   |  4 ++
 .../python/python3-flask-restful_%.bbappend        |  1 +
 .../python/python3-flask_%.bbappend                |  1 +
 .../python/python3-itsdangerous_%.bbappend         |  1 +
 .../python/python3-pandas_%.bbappend               |  1 +
 .../python/python3-werkzeug_%.bbappend             |  1 +
 .../recipes-kernel/lopper/lopper.bbappend          | 54 ++++++++++++++++++++++
 .../python/python3-flask-restful_%.bbappend        |  1 -
 .../python/python3-flask_%.bbappend                |  1 -
 .../python/python3-itsdangerous_%.bbappend         |  1 -
 .../python/python3-pandas_%.bbappend               |  1 -
 .../python/python3-werkzeug_%.bbappend             |  1 -
 .../recipes-kernel/lopper/lopper.bbappend          | 54 ----------------------
 13 files changed, 63 insertions(+), 59 deletions(-)
 create mode 100644 meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-flask-restful_%.bbappend
 create mode 100644 meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-flask_%.bbappend
 create mode 100644 meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-itsdangerous_%.bbappend
 create mode 100644 meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-pandas_%.bbappend
 create mode 100644 meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-werkzeug_%.bbappend
 create mode 100644 meta-xilinx-core/dynamic-layers/virtualization-layer/recipes-kernel/lopper/lopper.bbappend
 delete mode 100644 meta-xilinx-core/recipes-devtools/python/python3-flask-restful_%.bbappend
 delete mode 100644 meta-xilinx-core/recipes-devtools/python/python3-flask_%.bbappend
 delete mode 100644 meta-xilinx-core/recipes-devtools/python/python3-itsdangerous_%.bbappend
 delete mode 100644 meta-xilinx-core/recipes-devtools/python/python3-pandas_%.bbappend
 delete mode 100644 meta-xilinx-core/recipes-devtools/python/python3-werkzeug_%.bbappend
 delete mode 100644 meta-xilinx-core/recipes-kernel/lopper/lopper.bbappend

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index c505501f..db17c96b 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -14,6 +14,10 @@ openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.b
 openembedded-layer:${LAYERDIR}/dynamic-layers/openembedded-layer/recipes-*/*/*.bbappend \
 chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bb \
 chromium-browser-layer:${LAYERDIR}/dynamic-layers/chromium-browser-layer/recipes-*/*/*.bbappend \
+meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bb \
+meta-python:${LAYERDIR}/dynamic-layers/meta-python/recipes-*/*/*.bbappend \
+virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bb \
+virtualization-layer:${LAYERDIR}/dynamic-layers/virtualization-layer/recipes-*/*/*.bbappend \
 "
 
 LAYERDEPENDS_xilinx = "core"
diff --git a/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-flask-restful_%.bbappend b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-flask-restful_%.bbappend
new file mode 100644
index 00000000..608377e3
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-flask-restful_%.bbappend
@@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-flask_%.bbappend b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-flask_%.bbappend
new file mode 100644
index 00000000..608377e3
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-flask_%.bbappend
@@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-itsdangerous_%.bbappend b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-itsdangerous_%.bbappend
new file mode 100644
index 00000000..608377e3
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-itsdangerous_%.bbappend
@@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-pandas_%.bbappend b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-pandas_%.bbappend
new file mode 100644
index 00000000..608377e3
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-pandas_%.bbappend
@@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-werkzeug_%.bbappend b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-werkzeug_%.bbappend
new file mode 100644
index 00000000..608377e3
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/meta-python/recipes-devtools/python/python3-werkzeug_%.bbappend
@@ -0,0 +1 @@
+BBCLASSEXTEND = "native nativesdk"
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
new file mode 100644
index 00000000..aa552fe5
--- /dev/null
+++ b/meta-xilinx-core/dynamic-layers/virtualization-layer/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}/"
+}
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-flask-restful_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-flask-restful_%.bbappend
deleted file mode 100644
index 608377e3..00000000
--- a/meta-xilinx-core/recipes-devtools/python/python3-flask-restful_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-flask_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-flask_%.bbappend
deleted file mode 100644
index 608377e3..00000000
--- a/meta-xilinx-core/recipes-devtools/python/python3-flask_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-itsdangerous_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-itsdangerous_%.bbappend
deleted file mode 100644
index 608377e3..00000000
--- a/meta-xilinx-core/recipes-devtools/python/python3-itsdangerous_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-pandas_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-pandas_%.bbappend
deleted file mode 100644
index 608377e3..00000000
--- a/meta-xilinx-core/recipes-devtools/python/python3-pandas_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-devtools/python/python3-werkzeug_%.bbappend b/meta-xilinx-core/recipes-devtools/python/python3-werkzeug_%.bbappend
deleted file mode 100644
index 608377e3..00000000
--- a/meta-xilinx-core/recipes-devtools/python/python3-werkzeug_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-xilinx-core/recipes-kernel/lopper/lopper.bbappend b/meta-xilinx-core/recipes-kernel/lopper/lopper.bbappend
deleted file mode 100644
index aa552fe5..00000000
--- a/meta-xilinx-core/recipes-kernel/lopper/lopper.bbappend
+++ /dev/null
@@ -1,54 +0,0 @@
-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