diff options
| author | Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> | 2022-10-25 13:02:45 -0600 |
|---|---|---|
| committer | Mark Hatle <mark.hatle@amd.com> | 2022-11-10 15:04:42 -0800 |
| commit | 8101d2c1b8961a1a3c999c4260431191119f8bfb (patch) | |
| tree | f60cb120652972987c473ba0896e7014de7cee35 /meta-xilinx-pynq/recipes-devtool/python | |
| parent | 144daf6db591a7af11312a65f55d4d3f74f324ab (diff) | |
| download | meta-xilinx-8101d2c1b8961a1a3c999c4260431191119f8bfb.tar.gz | |
meta-xilinx: Deprecate meta-xilinx-pynq layer
meta-xilinx-pynq is no longer supported from Yocto, hence deprecating
meta-xilinx-pynq layer.
Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com>
Signed-off-by: Mark Hatle <mark.hatle@amd.com>
Diffstat (limited to 'meta-xilinx-pynq/recipes-devtool/python')
5 files changed, 0 insertions, 132 deletions
diff --git a/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc b/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc deleted file mode 100644 index b35b98be..00000000 --- a/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc +++ /dev/null | |||
| @@ -1,44 +0,0 @@ | |||
| 1 | SUMMARY = "Xilinx PYNQ Library" | ||
| 2 | HOMEPAGE = "http://pynq.io" | ||
| 3 | LICENSE = "MIT" | ||
| 4 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b42e39ad2ddbad7e8ad47f3eee6feff5" | ||
| 5 | |||
| 6 | SRC_URI[md5sum] = "9950894100c20293e921090b76ca9f17" | ||
| 7 | SRC_URI[sha256sum] = "4f719e2753093d1e79931755c624d160cf342c03af49e027d09abe75bdc8e8c5" | ||
| 8 | |||
| 9 | RDEPENDS:${PN} += "\ | ||
| 10 | ${PYTHON_PN}-core \ | ||
| 11 | ${PYTHON_PN}-asyncio \ | ||
| 12 | ${PYTHON_PN}-cffi \ | ||
| 13 | ${PYTHON_PN}-json \ | ||
| 14 | ${PYTHON_PN}-math \ | ||
| 15 | ${PYTHON_PN}-mmap \ | ||
| 16 | ${PYTHON_PN}-multiprocessing \ | ||
| 17 | ${PYTHON_PN}-numpy \ | ||
| 18 | ${PYTHON_PN}-pycparser \ | ||
| 19 | ${PYTHON_PN}-resource \ | ||
| 20 | ${PYTHON_PN}-setuptools \ | ||
| 21 | ${PYTHON_PN}-threading \ | ||
| 22 | ${PYTHON_PN}-xml \ | ||
| 23 | ${PYTHON_PN}-audio \ | ||
| 24 | lmsensors-libsensors \ | ||
| 25 | libdrm \ | ||
| 26 | libcma \ | ||
| 27 | pynq-overlay \ | ||
| 28 | " | ||
| 29 | |||
| 30 | inherit xilinx-pynq | ||
| 31 | |||
| 32 | DEPENDS += " libdrm boost libcma" | ||
| 33 | |||
| 34 | SRC_URI += " \ | ||
| 35 | file://0001-Fix-3.6-ism-in-Xlnk-class.patch \ | ||
| 36 | file://0002-Avoid-deleteing-notebooks.patch \ | ||
| 37 | file://0003-Use-sysroot-for-Displayport-library.patch \ | ||
| 38 | " | ||
| 39 | |||
| 40 | FILESEXTRAPATHS:prepend := "${THISDIR}:" | ||
| 41 | |||
| 42 | do_install:append() { | ||
| 43 | rm -rf ${D}${PYNQ_NOTEBOOK_DIR}_* | ||
| 44 | } | ||
diff --git a/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0001-Fix-3.6-ism-in-Xlnk-class.patch b/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0001-Fix-3.6-ism-in-Xlnk-class.patch deleted file mode 100644 index d947a3a6..00000000 --- a/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0001-Fix-3.6-ism-in-Xlnk-class.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | From 940acab94a60708a9a9092579af52c1195f23fae Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Ogden <ogden@xilinx.com> | ||
| 3 | Date: Tue, 3 Mar 2020 06:21:03 -0500 | ||
| 4 | Subject: [PATCH 1/3] Fix 3.6-ism in Xlnk class | ||
| 5 | |||
| 6 | --- | ||
| 7 | pynq/xlnk.py | 2 +- | ||
| 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 9 | |||
| 10 | diff --git a/pynq/xlnk.py b/pynq/xlnk.py | ||
| 11 | index c07f1e5..a25e0e3 100644 | ||
| 12 | --- a/pynq/xlnk.py | ||
| 13 | +++ b/pynq/xlnk.py | ||
| 14 | @@ -423,7 +423,7 @@ class Xlnk: | ||
| 15 | for l in f.readlines(): | ||
| 16 | m = re.match('CmaTotal:[\\s]+([0-9]+) kB', l) | ||
| 17 | if m: | ||
| 18 | - return int(m[1]) * 1024 | ||
| 19 | + return int(m.group(1)) * 1024 | ||
| 20 | return 0 | ||
| 21 | |||
| 22 | def flush(self, bo, offset, vaddr, nbytes): | ||
| 23 | -- | ||
| 24 | 2.7.4 | ||
| 25 | |||
diff --git a/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch b/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch deleted file mode 100644 index e67c8048..00000000 --- a/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch +++ /dev/null | |||
| @@ -1,35 +0,0 @@ | |||
| 1 | From 70b38f8748779d57117bca3e37441e2223372293 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Ogden <ogden@xilinx.com> | ||
| 3 | Date: Tue, 3 Mar 2020 06:23:26 -0500 | ||
| 4 | Subject: [PATCH 2/3] Avoid deleteing notebooks | ||
| 5 | |||
| 6 | --- | ||
| 7 | setup.py | 5 +++-- | ||
| 8 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
| 9 | |||
| 10 | diff --git a/setup.py b/setup.py | ||
| 11 | index df1dada..95479e3 100644 | ||
| 12 | --- a/setup.py | ||
| 13 | +++ b/setup.py | ||
| 14 | @@ -36,6 +36,7 @@ from setuptools.command.build_ext import build_ext | ||
| 15 | from distutils.dir_util import copy_tree | ||
| 16 | from distutils.file_util import copy_file, move_file | ||
| 17 | from shutil import rmtree | ||
| 18 | +import shutil | ||
| 19 | import glob | ||
| 20 | import re | ||
| 21 | import subprocess | ||
| 22 | @@ -322,8 +323,8 @@ class BuildExtension(build_ext): | ||
| 23 | for ol in overlay_dirs: | ||
| 24 | src = os.path.join(board_folder, ol) | ||
| 25 | dst = os.path.join(self.build_lib, "pynq/overlays", ol) | ||
| 26 | - exclude_file_or_folder('notebooks', src) | ||
| 27 | - copy_tree(src, dst) | ||
| 28 | + if not os.path.isdir(dst): | ||
| 29 | + shutil.copytree(src, dst, ignore=shutil.ignore_patterns('notebooks')) | ||
| 30 | |||
| 31 | def run(self): | ||
| 32 | if CPU_ARCH == ZYNQ_ARCH: | ||
| 33 | -- | ||
| 34 | 2.7.4 | ||
| 35 | |||
diff --git a/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0003-Use-sysroot-for-Displayport-library.patch b/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0003-Use-sysroot-for-Displayport-library.patch deleted file mode 100644 index f250e4a2..00000000 --- a/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0003-Use-sysroot-for-Displayport-library.patch +++ /dev/null | |||
| @@ -1,25 +0,0 @@ | |||
| 1 | From 65e1134505235a60013d91c8b03401b8b4062cde Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Peter Ogden <ogden@xilinx.com> | ||
| 3 | Date: Tue, 3 Mar 2020 10:32:35 -0500 | ||
| 4 | Subject: [PATCH 3/3] Use sysroot for Displayport library | ||
| 5 | |||
| 6 | --- | ||
| 7 | pynq/lib/_pynq/_displayport/Makefile | 2 +- | ||
| 8 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 9 | |||
| 10 | diff --git a/pynq/lib/_pynq/_displayport/Makefile b/pynq/lib/_pynq/_displayport/Makefile | ||
| 11 | index 5567e34..7f1f7b7 100644 | ||
| 12 | --- a/pynq/lib/_pynq/_displayport/Makefile | ||
| 13 | +++ b/pynq/lib/_pynq/_displayport/Makefile | ||
| 14 | @@ -2,7 +2,7 @@ CC ?= gcc | ||
| 15 | CXX ?= g++ | ||
| 16 | |||
| 17 | OBJSC = displayport.o | ||
| 18 | -INC = -I${PYNQ_BUILD_ROOT}/usr/include/libdrm | ||
| 19 | +INC = -I=${PYNQ_BUILD_ROOT}/usr/include/libdrm | ||
| 20 | |||
| 21 | all: | ||
| 22 | $(CXX) -fPIC $(INC) -c -g -std=c++11 displayport.cpp $(CFLAGS) | ||
| 23 | -- | ||
| 24 | 2.7.4 | ||
| 25 | |||
diff --git a/meta-xilinx-pynq/recipes-devtool/python/python3-pynq_2.5.1.bb b/meta-xilinx-pynq/recipes-devtool/python/python3-pynq_2.5.1.bb deleted file mode 100644 index 5a904c8f..00000000 --- a/meta-xilinx-pynq/recipes-devtool/python/python3-pynq_2.5.1.bb +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | inherit pypi setuptools3 | ||
| 2 | require python-pynq.inc | ||
| 3 | |||
