diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-12-08 00:38:17 +0300 |
commit | 8d6ae7f2a817751fad151168fa10ce28ee0869d8 (patch) | |
tree | 281032f7ec07c41589aa094bd165cc2a98f2d3a7 /meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch | |
parent | c16fb8893b19075db4bcf3b5bf33c1db8c3ca2bd (diff) | |
parent | 5da3c2284560a7e08ffafd03c5b5ba44a3242228 (diff) | |
download | openbmc-8d6ae7f2a817751fad151168fa10ce28ee0869d8.tar.xz |
Merge tag '0.26' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch')
-rw-r--r-- | meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch b/meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch new file mode 100644 index 000000000..e67c80488 --- /dev/null +++ b/meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch @@ -0,0 +1,35 @@ +From 70b38f8748779d57117bca3e37441e2223372293 Mon Sep 17 00:00:00 2001 +From: Peter Ogden <ogden@xilinx.com> +Date: Tue, 3 Mar 2020 06:23:26 -0500 +Subject: [PATCH 2/3] Avoid deleteing notebooks + +--- + setup.py | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index df1dada..95479e3 100644 +--- a/setup.py ++++ b/setup.py +@@ -36,6 +36,7 @@ from setuptools.command.build_ext import build_ext + from distutils.dir_util import copy_tree + from distutils.file_util import copy_file, move_file + from shutil import rmtree ++import shutil + import glob + import re + import subprocess +@@ -322,8 +323,8 @@ class BuildExtension(build_ext): + for ol in overlay_dirs: + src = os.path.join(board_folder, ol) + dst = os.path.join(self.build_lib, "pynq/overlays", ol) +- exclude_file_or_folder('notebooks', src) +- copy_tree(src, dst) ++ if not os.path.isdir(dst): ++ shutil.copytree(src, dst, ignore=shutil.ignore_patterns('notebooks')) + + def run(self): + if CPU_ARCH == ZYNQ_ARCH: +-- +2.7.4 + |