diff options
author | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@intel.com> | 2022-01-06 23:59:39 +0300 |
commit | 32777eec25d2c527a62e5ffab90a3dfef35855aa (patch) | |
tree | 588a90a6fe9fb0b35c7ce23ea3bd79fa5151ccde /meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch | |
parent | 61f1ca1b31a9a1108e9e7f71e47fdc19beb0490b (diff) | |
parent | 5cc2f81c5b66da00cad24e18b0d23442af060c3f (diff) | |
download | openbmc-32777eec25d2c527a62e5ffab90a3dfef35855aa.tar.xz |
Merge tag '0.86' of firmware.bmc.openbmc.yocto.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, 0 insertions, 35 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 deleted file mode 100644 index e67c80488..000000000 --- a/meta-xilinx/meta-xilinx-pynq/recipes-devtool/python/python3-pynq/0002-Avoid-deleteing-notebooks.patch +++ /dev/null @@ -1,35 +0,0 @@ -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 - |