Hello community, here is the log from the commit of package opae for openSUSE:Factory checked in at 2020-04-21 13:06:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opae (Old) and /work/SRC/openSUSE:Factory/.opae.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opae" Tue Apr 21 13:06:22 2020 rev:7 rq:795472 version:1.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/opae/opae.changes 2019-10-18 14:33:19.844255443 +0200 +++ /work/SRC/openSUSE:Factory/.opae.new.2738/opae.changes 2020-04-21 13:06:26.804307227 +0200 @@ -1,0 +2,12 @@ +Fri Apr 17 07:56:40 UTC 2020 - Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> + +- Update to 1.4.1-1 + - See RELEASE_NOTES for a complete list of changes +- Drop patches fixed upstream: + - opae-add-missing-lpthread.patch + - opae-fix-python-packaging.patch + - opae-fix-support-for-hwloc-2.patch +- Refresh opae-missing-shebang.patch against latest source +- Add opae-fix-linking-issue.patch to fix linking issues + +------------------------------------------------------------------- Old: ---- opae-1.3.21.0.4ec6dc67e795.tar.bz2 opae-add-missing-lpthread.patch opae-fix-python-packaging.patch opae-fix-support-for-hwloc-2.patch New: ---- opae-1.4.11.0.d5921e5b6b0b.tar.bz2 opae-fix-linking-issue.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opae.spec ++++++ --- /var/tmp/diff_new_pack.uWRDyj/_old 2020-04-21 13:06:27.616308847 +0200 +++ /var/tmp/diff_new_pack.uWRDyj/_new 2020-04-21 13:06:27.620308855 +0200 @@ -1,7 +1,7 @@ # # spec file for package opae # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,26 +16,28 @@ # -%define git_ver 1.0.4ec6dc67e795 +%define with_ase 0 +%define with_tests 0 +%define with_legacy 0 + +%define git_ver 1.0.d5921e5b6b0b %define lib_opae_major 1 %define lib_hssi_major 1 -%define lib_bmc_major 1 %define lib_ase_major 1 %define lib_bitstream_major 1 %define lib_fpgad_major 1 +%define lib_board_major 1 Name: opae -Version: 1.3.2 +Version: 1.4.1 Release: 0 Summary: Open Programmable Acceleration Engine License: Intel OR MIT Group: Development/Libraries/C and C++ -Url: https://github.com/OPAE/opae-sdk +URL: https://github.com/OPAE/opae-sdk Source0: %{name}-%{version}%{git_ver}.tar.bz2 -Patch0: opae-add-missing-lpthread.patch -Patch1: opae-missing-shebang.patch -Patch3: opae-fix-python-packaging.patch -Patch4: opae-fix-support-for-hwloc-2.patch +Patch0: opae-missing-shebang.patch +Patch1: opae-fix-linking-issue.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: boost-devel BuildRequires: cmake @@ -49,17 +51,24 @@ BuildRequires: libuuid-devel BuildRequires: ncurses-devel BuildRequires: python3-devel +BuildRequires: python3-pybind11-devel #Currently *only* builds on x86_64 ExclusiveArch: x86_64 +%if 0%{?with_legacy} Requires: libhssi-io%{lib_hssi_major} = %{version} +%endif Requires: libopae-c%{lib_opae_major} = %{version} %description OPAE is the Open Programmable Acceleration Engine, a software framework for managing and accessing programmable accelerators (FPGAs). -The OPAE SDK is a collection of libraries and tools to facilitate the +OPAE SDK is a collection of libraries and tools to facilitate the development of software applications and accelerators using OPAE. +It provides a library implementing the OPAE C API for presenting a +streamlined and easy-to-use interface for software applications to +discover, access, and manage FPGA devices and accelerators using +the OPAE software stack. %package devel Summary: Development files for OPAE SDK @@ -70,9 +79,12 @@ OPAE is the Open Programmable Acceleration Engine, a software framework for managing and accessing programmable accelerators (FPGAs). -The OPAE SDK is a collection of libraries and tools to facilitate the +OPAE SDK is a collection of libraries and tools to facilitate the development of software applications and accelerators using OPAE. -This package contains the development files. +It provides a library implementing the OPAE C API for presenting a +streamlined and easy-to-use interface for software applications to +discover, access, and manage FPGA devices and accelerators using +the OPAE software stack. %package -n libopae-c%{lib_opae_major} Summary: Open Programmable Acceleration Engine Libraries @@ -81,20 +93,23 @@ %description -n libopae-c%{lib_opae_major} Libraries for the Open Programmable Acceleration Engine Libraries tools. -%package -n libhssi-io%{lib_hssi_major} +%package -n libbitstream%{lib_bitstream_major} Summary: Open Programmable Acceleration Engine Libraries Group: System/Libraries -%description -n libhssi-io%{lib_hssi_major} +%description -n libbitstream%{lib_bitstream_major} Libraries for the Open Programmable Acceleration Engine Libraries tools. -%package -n libbmc%{lib_bmc_major} +%if 0%{?with_legacy} +%package -n libhssi-io%{lib_hssi_major} Summary: Open Programmable Acceleration Engine Libraries Group: System/Libraries -%description -n libbmc%{lib_bmc_major} +%description -n libhssi-io%{lib_hssi_major} Libraries for the Open Programmable Acceleration Engine Libraries tools. +%endif +%if 0%{?with_ase} %package ase Summary: OPAE AFU Simulation Environment Group: System/Base @@ -108,60 +123,85 @@ %description -n libase%{lib_ase_major} Libraries for the OPAE Simulation environment. +%endif -%package -n libbitstream%{lib_bitstream_major} -Summary: Open Programmable Acceleration Engine Libraries -Group: System/Libraries - -%description -n libbitstream%{lib_bitstream_major} -Libraries for the Open Programmable Acceleration Engine Libraries tools. - +%if 0%{?with_tests} %package -n libfpgad-api%{lib_fpgad_major} Summary: Open Programmable Acceleration Engine Libraries Group: System/Libraries %description -n libfpgad-api%{lib_fpgad_major} Libraries for the Open Programmable Acceleration Engine Libraries tools. +%endif %prep %setup -q -n %{name}-%{version}%{git_ver} %patch0 %patch1 -%patch3 -%patch4 %build +mkdir external/pybind11 export RPM_OPT_FLAGS %cmake -DCMAKE_BUILD_TYPE=Release \ -DPYTHON_EXECUTABLE=/usr/bin/python3 \ -DCMAKE_C_FLAGS="-Wno-format-truncation -Wno-address-of-packed-member" \ - -DBUILD_ASE=ON - -make VERBOSE=1 all %{?_smp_mflags} + -DOPAE_PRESERVE_REPOS=ON +%make_build all VERBOSE=1 %{?_smp_mflags} %install %cmake_install VERBOSE=1 V=1 rm -f %{buildroot}%{_libdir}/libsafestr.a +rm -f %{buildroot}%{_libdir}/libargsfilter.a rm -Rf %{buildroot}%{_includedir}/safe_string # Fix install path for opae samples mkdir -p %{buildroot}%{_datarootdir}/opae/ mv %{buildroot}/usr/src/opae/samples %{buildroot}%{_datarootdir}/opae/ -# Fix path for cmake macros -mkdir -p %{buildroot}%{_datarootdir}/cmake/Modules -mv %{buildroot}/usr/src/opae/cmake/modules %{buildroot}%{_datarootdir}/cmake/Modules/OPAE -chmod -x %{buildroot}%{_datarootdir}/cmake/Modules/OPAE/* -# For some reason, ASE packages its own sources... Remove them -rm -Rf %{buildroot}%{_datarootdir}/opae/ase/sw/*.[ch] +# Install cmake macros +mkdir -p %{buildroot}%{_datarootdir}/cmake/Modules/OPAE +for s in FindSphinx.cmake +do + install -m0644 "cmake/${s}" %{buildroot}%{_datarootdir}/cmake/Modules/OPAE +done +for s in FindHwloc.cmake \ + OPAE.cmake \ + FindUUID.cmake \ + Findjson-c.cmake \ + OPAECompiler.cmake \ + OPAEGit.cmake \ + OPAEPackaging.cmake +do + install -m0644 "opae-libs/cmake/modules/${s}" %{buildroot}%{_datarootdir}/cmake/Modules/OPAE +done + # Drop hidden travis file from python json rm -f %{buildroot}%{_datarootdir}/opae/python/jsonschema-*/.travis.yml + %fdupes %{buildroot}/%{_prefix} + +%if 0%{?with_tests} # Direct install to sysconfig is forbidden mkdir -p %{buildroot}/%{_fillupdir} mv %{buildroot}%{_sysconfdir}/sysconfig/fpgad.conf %{buildroot}/%{_fillupdir}/sysconfig.fpgad # For some unfathomable reason with_ase script is installed twice through a hardlink. # Use some sed voodoo to force the files to be 'unlinked' sed -i ';' %{buildroot}/%{_bindir}/with_ase +%endif +%if !0%{?with_ase} +# If ASE is not built, drop trhe compat library +rm -f %{buildroot}/%{_libdir}/libopae-c-ase.so* +%endif + +%post -n libopae-c%{lib_opae_major} -p /sbin/ldconfig +%postun -n libopae-c%{lib_opae_major} -p /sbin/ldconfig +%post -n libbitstream%{lib_bitstream_major} -p /sbin/ldconfig +%postun -n libbitstream%{lib_bitstream_major} -p /sbin/ldconfig +%if 0%{?with_legacy} +%post -n libhssi-io%{lib_hssi_major} -p /sbin/ldconfig +%postun -n libhssi-io%{lib_hssi_major} -p /sbin/ldconfig +%endif + +%if 0%{?with_tests} %pre %service_add_pre fpgad.service %post @@ -172,31 +212,33 @@ %postun %service_del_postun fpgad.service -%post -n libopae-c%{lib_opae_major} -p /sbin/ldconfig -%postun -n libopae-c%{lib_opae_major} -p /sbin/ldconfig -%post -n libhssi-io%{lib_hssi_major} -p /sbin/ldconfig -%postun -n libhssi-io%{lib_hssi_major} -p /sbin/ldconfig -%post -n libase%{lib_ase_major} -p /sbin/ldconfig -%postun -n libase%{lib_ase_major} -p /sbin/ldconfig -%post -n libbmc%{lib_bmc_major} -p /sbin/ldconfig -%postun -n libbmc%{lib_bmc_major} -p /sbin/ldconfig -%post -n libbitstream%{lib_bitstream_major} -p /sbin/ldconfig -%postun -n libbitstream%{lib_bitstream_major} -p /sbin/ldconfig %post -n libfpgad-api%{lib_fpgad_major} -p /sbin/ldconfig %postun -n libfpgad-api%{lib_fpgad_major} -p /sbin/ldconfig +%endif + +%if 0%{?with_ase} +%post -n libase%{lib_ase_major} -p /sbin/ldconfig +%postun -n libase%{lib_ase_major} -p /sbin/ldconfig +%endif %files %{_bindir}/* +%if 0%{?with_ase} %exclude %{_bindir}/afu_sim_setup %exclude %{_bindir}/with_ase -%license COPYING +%endif +%dir %{_libdir}/opae/ +%{_libdir}/opae/*.so +%license COPYING LICENSE %doc RELEASE_NOTES.md %dir %{_datarootdir}/opae %{_datarootdir}/opae/python +%if 0%{?with_tests} %dir %{_sysconfdir}/opae %config(noreplace) %{_sysconfdir}/opae/fpgad.cfg %{_fillupdir}/sysconfig.fpgad %{_unitdir}/fpgad.service +%endif %files devel %{_includedir}/opae @@ -211,32 +253,36 @@ %{_libdir}/libopae-c.so.%{lib_opae_major}.* %{_libdir}/libopae-c++*.so.%{lib_opae_major} %{_libdir}/libopae-c++*.so.%{lib_opae_major}.* - -%files -n libhssi-io%{lib_hssi_major} -%{_libdir}/libhssi-io*.so.%{lib_hssi_major} -%{_libdir}/libhssi-io*.so.%{lib_hssi_major}.* - -%files -n libbmc%{lib_bmc_major} -%{_libdir}/libbmc*.so.%{lib_bmc_major} -%{_libdir}/libbmc*.so.%{lib_bmc_major}.* - -%files -n libase%{lib_ase_major} -%{_libdir}/libase*.so.%{lib_ase_major} -%{_libdir}/libase*.so.%{lib_ase_major}.* +%{_libdir}/libopae-cxx-core*.so.%{lib_opae_major} +%{_libdir}/libopae-cxx-core*.so.%{lib_opae_major}.* %files -n libbitstream%{lib_hssi_major} %{_libdir}/libbitstream.so.%{lib_hssi_major} %{_libdir}/libbitstream.so.%{lib_hssi_major}.* +%if 0%{?with_legacy} +%files -n libhssi-io%{lib_hssi_major} +%{_libdir}/libhssi-io*.so.%{lib_hssi_major} +%{_libdir}/libhssi-io*.so.%{lib_hssi_major}.* +%endif + +%if 0%{?with_tests} %files -n libfpgad-api%{lib_bmc_major} %{_libdir}/libfpgad-api.so.%{lib_bmc_major} %{_libdir}/libfpgad-api.so.%{lib_bmc_major}.* +%endif +%if 0%{?with_ase} %files ase %{_bindir}/afu_sim_setup %{_bindir}/with_ase %license COPYING %dir %{_datarootdir}/opae + %{_datarootdir}/opae/ase +%files -n libase%{lib_ase_major} +%{_libdir}/libase*.so.%{lib_ase_major} +%{_libdir}/libase*.so.%{lib_ase_major}.* +%endif %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.uWRDyj/_old 2020-04-21 13:06:27.644308903 +0200 +++ /var/tmp/diff_new_pack.uWRDyj/_new 2020-04-21 13:06:27.648308911 +0200 @@ -8,7 +8,7 @@ <param name="versionformat">@PARENT_TAG@.@TAG_OFFSET@.%h</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="versionrewrite-replacement">\1</param> - <param name="revision">4ec6dc67e7957bf7d1879fa2b3d7b56472d7c65b</param> + <param name="revision">d5921e5b6b0b48934a8964bdbd69ce4896c378e1</param> </service> <service name="recompress" mode="disabled"> <param name="file">opae*.tar</param> ++++++ opae-1.3.21.0.4ec6dc67e795.tar.bz2 -> opae-1.4.11.0.d5921e5b6b0b.tar.bz2 ++++++ ++++ 510333 lines of diff (skipped) ++++++ opae-fix-linking-issue.patch ++++++ commit 05d809cab5780e79ebbbbb8c833e9f03df1b2565 Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> Date: Fri Apr 17 11:09:52 2020 +0200 opae: fix linking issue Add missing -lopae-c for libopaecxx Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> diff --git opae-libs/libopaecxx/CMakeLists.txt opae-libs/libopaecxx/CMakeLists.txt index 38d6124b0c98..2610278ca437 100644 --- opae-libs/libopaecxx/CMakeLists.txt +++ opae-libs/libopaecxx/CMakeLists.txt @@ -43,6 +43,7 @@ opae_add_shared_library(TARGET opae-cxx-core VERSION ${OPAE_VERSION} SOVERSION ${OPAE_VERSION_MAJOR} COMPONENT opaecxxcorelib + LIBS opae-c ) opae_add_executable(TARGET hello_cxxcore diff --git tools/extra/fpgadiag/CMakeLists.txt tools/extra/fpgadiag/CMakeLists.txt index 606bb75ff3d5..d5bd2c8283ce 100644 --- tools/extra/fpgadiag/CMakeLists.txt +++ tools/extra/fpgadiag/CMakeLists.txt @@ -42,7 +42,8 @@ opae_add_shared_library(TARGET opae-c++-nlb diag_utils.cpp LIBS opae-c - opae-cxx-core + opae-cxx-core + opae-c++-utils VERSION ${OPAE_VERSION} SOVERSION ${OPAE_VERSION_MAJOR} COMPONENT opaecxxnlb ++++++ opae-missing-shebang.patch ++++++ --- /var/tmp/diff_new_pack.uWRDyj/_old 2020-04-21 13:06:29.224312054 +0200 +++ /var/tmp/diff_new_pack.uWRDyj/_new 2020-04-21 13:06:29.224312054 +0200 @@ -1,56 +1,26 @@ -commit a6fe8dc0afbbc26b16a906db8347ccabf244d709 -Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> -Date: Wed Sep 6 10:06:23 2017 +0200 +commit 3f99e48371a6a6c19aeec36d3b5612037f3dad18 +Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> +Date: Fri Apr 17 10:00:07 2020 +0200 opae missing shebang Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> -diff --git cmake/modules/packaging.cmake cmake/modules/packaging.cmake -index 7b2dfd168d2c..a028cb147d78 100644 ---- cmake/modules/packaging.cmake -+++ cmake/modules/packaging.cmake -@@ -98,7 +98,7 @@ macro(CREATE_PYTHON_EXE EXE_NAME MAIN_MODULE) +diff --git opae-libs/cmake/modules/OPAEPackaging.cmake opae-libs/cmake/modules/OPAEPackaging.cmake +index 4f0b458dacb3..dab3e6af2591 100644 +--- opae-libs/cmake/modules/OPAEPackaging.cmake ++++ opae-libs/cmake/modules/OPAEPackaging.cmake +@@ -129,7 +129,7 @@ macro(CREATE_PYTHON_EXE EXE_NAME MAIN_MODULE) "\n" "# Write to a buffer so that the shebang can be prepended easily\n" "wr_buf = BytesIO()\n" -- "wr_buf.write('#!/usr/bin/env python' + os.linesep)\n" -+ "wr_buf.write('#!/usr/bin/python3' + os.linesep)\n" +- "wr_buf.write('#!/usr/bin/env python3{}'.format(os.linesep).encode())\n" ++ "wr_buf.write('#!/usr/bin/python3{}'.format(os.linesep).encode())\n" "\n" "z = zipfile.PyZipFile(wr_buf, 'w')\n") -diff --git libopae/plugins/ase/scripts/afu_sim_setup libopae/plugins/ase/scripts/afu_sim_setup -index 7d1939ce29ac..af6de5ba3c2c 100755 ---- libopae/plugins/ase/scripts/afu_sim_setup -+++ libopae/plugins/ase/scripts/afu_sim_setup -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2013-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without -diff --git libopae/plugins/ase/scripts/generate_ase_environment.py libopae/plugins/ase/scripts/generate_ase_environment.py -index 99d569789aa2..6372081972f4 100755 ---- libopae/plugins/ase/scripts/generate_ase_environment.py -+++ libopae/plugins/ase/scripts/generate_ase_environment.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2013-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without -diff --git libopae/plugins/ase/scripts/ipc_clean.py libopae/plugins/ase/scripts/ipc_clean.py -index 2ca3f985afb5..85f653a992a8 100755 ---- libopae/plugins/ase/scripts/ipc_clean.py -+++ libopae/plugins/ase/scripts/ipc_clean.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2013-2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without diff --git platforms/scripts/afu_platform_config platforms/scripts/afu_platform_config -index 5bab88b8f7c5..fd6622988307 100755 +index fd25acb79dc4..8ea9afaa5132 100755 --- platforms/scripts/afu_platform_config +++ platforms/scripts/afu_platform_config @@ -1,4 +1,4 @@ @@ -80,7 +50,7 @@ # # Redistribution and use in source and binary forms, with or without diff --git platforms/scripts/rtl_src_config platforms/scripts/rtl_src_config -index 7703005ddfe6..bb132f316c8c 100755 +index d75fec7cd63d..97bc02422901 100755 --- platforms/scripts/rtl_src_config +++ platforms/scripts/rtl_src_config @@ -1,4 +1,4 @@ @@ -89,187 +59,227 @@ # # Consume a file with a list of source files, include paths and preprocessor -diff --git pyopae/pybind11/docs/conf.py pyopae/pybind11/docs/conf.py -index e328eb161d76..55bb723956b9 100644 ---- pyopae/pybind11/docs/conf.py -+++ pyopae/pybind11/docs/conf.py +diff --git python/opae.admin/debian/deb-changelog.py python/opae.admin/debian/deb-changelog.py +index 5eab4e4aa988..36fd062c30c8 100755 +--- python/opae.admin/debian/deb-changelog.py ++++ python/opae.admin/debian/deb-changelog.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # - # pybind11 documentation build configuration file, created by -diff --git pyopae/pybind11/setup.py pyopae/pybind11/setup.py -index f677f2af4a6f..9a184673fbba 100644 ---- pyopae/pybind11/setup.py -+++ pyopae/pybind11/setup.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # Setup script for PyPI; use CMakeFile.txt to build extension modules - -diff --git pyopae/pybind11/tools/mkdoc.py pyopae/pybind11/tools/mkdoc.py -index 1fd8cceed52b..3e4b5d6c3622 100644 ---- pyopae/pybind11/tools/mkdoc.py -+++ pyopae/pybind11/tools/mkdoc.py + from __future__ import absolute_import + import argparse +diff --git python/opae.admin/opae/admin/tools/fpgaflash.py python/opae.admin/opae/admin/tools/fpgaflash.py +index 84fa52decfbc..8fa43f9da4b0 100755 +--- python/opae.admin/opae/admin/tools/fpgaflash.py ++++ python/opae.admin/opae/admin/tools/fpgaflash.py @@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/python3 - # - # Syntax: mkdoc.py [-I<path> ..] [.. a list of header files ..] +-#! /usr/bin/env python3 ++#! /usr/bin/python3 + # Copyright(c) 2019, Intel Corporation # -diff --git scripts/index_generator.py scripts/index_generator.py -index dc0bcc2d13fd..0f406738c384 100644 ---- scripts/index_generator.py -+++ scripts/index_generator.py + # Redistribution and use in source and binary forms, with or without +diff --git python/opae.admin/opae/admin/tools/fpgaotsu.py python/opae.admin/opae/admin/tools/fpgaotsu.py +index d2bba06dfa54..ba375a2c3038 100755 +--- python/opae.admin/opae/admin/tools/fpgaotsu.py ++++ python/opae.admin/opae/admin/tools/fpgaotsu.py @@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # -*- coding: utf-8 -*- - # vim:fenc=utf-8 +-#! /usr/bin/env python3 ++#! /usr/bin/python3 + # Copyright(c) 2019, Intel Corporation # -diff --git tools/base/fpgaport/fpgaport tools/base/fpgaport/fpgaport -index af0beafdcb57..bbb47654c873 100644 ---- tools/base/fpgaport/fpgaport -+++ tools/base/fpgaport/fpgaport + # Redistribution and use in source and binary forms, with or without +diff --git python/opae.admin/opae/admin/tools/fpgasupdate.py python/opae.admin/opae/admin/tools/fpgasupdate.py +index ce06c6c564af..e91503740412 100755 +--- python/opae.admin/opae/admin/tools/fpgasupdate.py ++++ python/opae.admin/opae/admin/tools/fpgasupdate.py @@ -1,4 +1,4 @@ --#! /usr/bin/env python +-#! /usr/bin/env python3 +#! /usr/bin/python3 - # Copyright(c) 2017, Intel Corporation + # Copyright(c) 2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/fpgadiag/fpgadiag tools/extra/fpgadiag/fpgadiag -index 98063daf8476..c798d26b4e2d 100755 ---- tools/extra/fpgadiag/fpgadiag -+++ tools/extra/fpgadiag/fpgadiag +diff --git python/opae.admin/opae/admin/tools/ihex2ipmi.py python/opae.admin/opae/admin/tools/ihex2ipmi.py +index 032e31e355d3..d4d05e6d2553 100644 +--- python/opae.admin/opae/admin/tools/ihex2ipmi.py ++++ python/opae.admin/opae/admin/tools/ihex2ipmi.py @@ -1,4 +1,4 @@ --#! /usr/bin/env python +-#! /usr/bin/env python3 +#! /usr/bin/python3 # Copyright(c) 2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/fpgadiag/mux.py tools/extra/fpgadiag/mux.py -index 4752973c18d3..7396a1b6995a 100644 ---- tools/extra/fpgadiag/mux.py -+++ tools/extra/fpgadiag/mux.py +diff --git python/opae.admin/opae/admin/tools/rsu.py python/opae.admin/opae/admin/tools/rsu.py +index 580eae896d95..a4075d8ced1a 100644 +--- python/opae.admin/opae/admin/tools/rsu.py ++++ python/opae.admin/opae/admin/tools/rsu.py @@ -1,4 +1,4 @@ --#!/usr/bin/env python +-#!/usr/bin/env python3 +#!/usr/bin/python3 - # Copyright(c) 2017, Intel Corporation + # Copyright(c) 2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgabist/bist_app.py tools/extra/pac/fpgabist/bist_app.py -index 3eb0bf3672d4..b7578740dbaf 100644 ---- tools/extra/pac/fpgabist/bist_app.py -+++ tools/extra/pac/fpgabist/bist_app.py +diff --git python/opae.admin/opae/admin/tools/super_rsu.py python/opae.admin/opae/admin/tools/super_rsu.py +index 045fa2e0d32d..b73ba7861b10 100755 +--- python/opae.admin/opae/admin/tools/super_rsu.py ++++ python/opae.admin/opae/admin/tools/super_rsu.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python3 ++#! /usr/bin/python3 + # Copyright(c) 2019-2020, Intel Corporation + # + # Redistribution and use in source and binary forms, with or without +diff --git scripts/index_generator.py scripts/index_generator.py +index dc0bcc2d13fd..0f406738c384 100644 +--- scripts/index_generator.py ++++ scripts/index_generator.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/python3 + # -*- coding: utf-8 -*- + # vim:fenc=utf-8 + # +diff --git tools/extra/fpgabist/bist_app.py tools/extra/fpgabist/bist_app.py +index 846bcb668f87..fdfec981dece 100644 +--- tools/extra/fpgabist/bist_app.py ++++ tools/extra/fpgabist/bist_app.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright(c) 2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgabist/bist_common.py tools/extra/pac/fpgabist/bist_common.py -index ee9ca852cb53..f978698c4ba9 100644 ---- tools/extra/pac/fpgabist/bist_common.py -+++ tools/extra/pac/fpgabist/bist_common.py +diff --git tools/extra/fpgabist/bist_common.py tools/extra/fpgabist/bist_common.py +index 8de0cea2c6d8..f3b27f64e6c5 100644 +--- tools/extra/fpgabist/bist_common.py ++++ tools/extra/fpgabist/bist_common.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 # Copyright(c) 2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgabist/bist_def.py tools/extra/pac/fpgabist/bist_def.py -index a8f8583910fb..6f83af0ad182 100644 ---- tools/extra/pac/fpgabist/bist_def.py -+++ tools/extra/pac/fpgabist/bist_def.py +diff --git tools/extra/fpgabist/bist_def.py tools/extra/fpgabist/bist_def.py +index 7812a822a5ae..bdb1d7e7fc29 100644 +--- tools/extra/fpgabist/bist_def.py ++++ tools/extra/fpgabist/bist_def.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # Copyright(c) 2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgabist/bist_dma.py tools/extra/pac/fpgabist/bist_dma.py -index 7843828e08a7..085fa1bf426b 100644 ---- tools/extra/pac/fpgabist/bist_dma.py -+++ tools/extra/pac/fpgabist/bist_dma.py +diff --git tools/extra/fpgabist/bist_dma.py tools/extra/fpgabist/bist_dma.py +index aec5f8770d48..ee4e620b586e 100644 +--- tools/extra/fpgabist/bist_dma.py ++++ tools/extra/fpgabist/bist_dma.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright(c) 2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgabist/bist_nlb0.py tools/extra/pac/fpgabist/bist_nlb0.py -index 8bcc34dc4b1e..9db58dc35a3d 100644 ---- tools/extra/pac/fpgabist/bist_nlb0.py -+++ tools/extra/pac/fpgabist/bist_nlb0.py +diff --git tools/extra/fpgabist/bist_nlb0.py tools/extra/fpgabist/bist_nlb0.py +index 6930172bfcd9..608f11c66137 100644 +--- tools/extra/fpgabist/bist_nlb0.py ++++ tools/extra/fpgabist/bist_nlb0.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python # Copyright(c) 2018, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgabist/bist_nlb3.py tools/extra/pac/fpgabist/bist_nlb3.py -index e54333c9d018..02b9e7fd120e 100644 ---- tools/extra/pac/fpgabist/bist_nlb3.py -+++ tools/extra/pac/fpgabist/bist_nlb3.py +diff --git tools/extra/fpgabist/bist_nlb3.py tools/extra/fpgabist/bist_nlb3.py +index 24fcb9468556..952169dbf0a0 100644 +--- tools/extra/fpgabist/bist_nlb3.py ++++ tools/extra/fpgabist/bist_nlb3.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright(c) 2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgabist/fpgabist tools/extra/pac/fpgabist/fpgabist -index f0d477209ae4..0825587e7722 100755 ---- tools/extra/pac/fpgabist/fpgabist -+++ tools/extra/pac/fpgabist/fpgabist +diff --git tools/extra/fpgabist/fpgabist tools/extra/fpgabist/fpgabist +index 396470f888f3..b4c9876229da 100755 +--- tools/extra/fpgabist/fpgabist ++++ tools/extra/fpgabist/fpgabist @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 # Copyright(c) 2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgaflash/fpgaflash tools/extra/pac/fpgaflash/fpgaflash -index ff22bd583c43..c14faea6c11d 100755 ---- tools/extra/pac/fpgaflash/fpgaflash -+++ tools/extra/pac/fpgaflash/fpgaflash +diff --git tools/extra/fpgadiag/common.py tools/extra/fpgadiag/common.py +index 5d0e4fe0ae20..7a7cd78b8fc5 100755 +--- tools/extra/fpgadiag/common.py ++++ tools/extra/fpgadiag/common.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/python3 ++#! /usr/bin/python3 + # Copyright(c) 2018-2019, Intel Corporation + # + # Redistribution and use in source and binary forms, with or without +diff --git tools/extra/fpgadiag/fpgadiag tools/extra/fpgadiag/fpgadiag +index 98063daf8476..c798d26b4e2d 100755 +--- tools/extra/fpgadiag/fpgadiag ++++ tools/extra/fpgadiag/fpgadiag +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/python3 # Copyright(c) 2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/fpgaflash/super-rsu tools/extra/pac/fpgaflash/super-rsu -index cd2e129c3068..9d1c50bb0eff 100755 ---- tools/extra/pac/fpgaflash/super-rsu -+++ tools/extra/pac/fpgaflash/super-rsu +diff --git tools/extra/fpgadiag/fpgalpbk.py tools/extra/fpgadiag/fpgalpbk.py +index 837e007d8285..169b89174372 100755 +--- tools/extra/fpgadiag/fpgalpbk.py ++++ tools/extra/fpgadiag/fpgalpbk.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#! /usr/bin/python ++#! /usr/bin/python3 # Copyright(c) 2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/pac_hssi_config/pac_hssi_config.py tools/extra/pac/pac_hssi_config/pac_hssi_config.py -index 83d52b5374ab..0eea7221ea9a 100755 ---- tools/extra/pac/pac_hssi_config/pac_hssi_config.py -+++ tools/extra/pac/pac_hssi_config/pac_hssi_config.py +diff --git tools/extra/fpgadiag/fpgastats.py tools/extra/fpgadiag/fpgastats.py +index e9c0704cc7e7..b116c8f874eb 100755 +--- tools/extra/fpgadiag/fpgastats.py ++++ tools/extra/fpgadiag/fpgastats.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2018, Intel Corporation ++#! /usr/bin/python3 + # Copyright(c) 2018-2019, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pac/pyfpgaflash/fpgaflash tools/extra/pac/pyfpgaflash/fpgaflash -index 28bf85235e6f..fa0eb473934a 100755 ---- tools/extra/pac/pyfpgaflash/fpgaflash -+++ tools/extra/pac/pyfpgaflash/fpgaflash +diff --git tools/extra/fpgadiag/mactest.py tools/extra/fpgadiag/mactest.py +index 06e410c457fe..13662a2a48a5 100755 +--- tools/extra/fpgadiag/mactest.py ++++ tools/extra/fpgadiag/mactest.py @@ -1,4 +1,4 @@ -#! /usr/bin/env python ++#! /usr/bin/python3 + # Copyright(c) 2018-2019, Intel Corporation + # + # Redistribution and use in source and binary forms, with or without +diff --git tools/extra/fpgadiag/mux.py tools/extra/fpgadiag/mux.py +index 099c4e56ba61..1a4b1605c7a2 100644 +--- tools/extra/fpgadiag/mux.py ++++ tools/extra/fpgadiag/mux.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python +#!/usr/bin/python3 # Copyright(c) 2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without +diff --git tools/extra/pac_hssi_config/pac_hssi_config.py tools/extra/pac_hssi_config/pac_hssi_config.py +index 83d52b5374ab..0eea7221ea9a 100755 +--- tools/extra/pac_hssi_config/pac_hssi_config.py ++++ tools/extra/pac_hssi_config/pac_hssi_config.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#!/usr/bin/python3 + # Copyright(c) 2018, Intel Corporation + # + # Redistribution and use in source and binary forms, with or without diff --git tools/extra/packager/afu_json_mgr.py tools/extra/packager/afu_json_mgr.py -index 0e31ec2646f1..d4bc864ddaf7 100755 +index a6fc98730f2f..50987b7598f9 100755 --- tools/extra/packager/afu_json_mgr.py +++ tools/extra/packager/afu_json_mgr.py @@ -1,4 +1,4 @@ @@ -289,7 +299,7 @@ import sys import textwrap diff --git tools/extra/packager/packager.py tools/extra/packager/packager.py -index 859932700e3d..f6224dba369d 100755 +index f1edf9ac4b2c..fd1ce183d6ae 100755 --- tools/extra/packager/packager.py +++ tools/extra/packager/packager.py @@ -1,4 +1,4 @@ @@ -298,56 +308,6 @@ # Copyright(c) 2017, Intel Corporation # # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pyfpgadiag/opae/tools/fpgadiag/fpgadiag.py tools/extra/pyfpgadiag/opae/tools/fpgadiag/fpgadiag.py -index cb9971175ef3..9aa03755fb3d 100644 ---- tools/extra/pyfpgadiag/opae/tools/fpgadiag/fpgadiag.py -+++ tools/extra/pyfpgadiag/opae/tools/fpgadiag/fpgadiag.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2018, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pyfpgadiag/opae/tools/fpgadiag/fpgamux.py tools/extra/pyfpgadiag/opae/tools/fpgadiag/fpgamux.py -index 2a2a507f223e..5cd267bdab03 100644 ---- tools/extra/pyfpgadiag/opae/tools/fpgadiag/fpgamux.py -+++ tools/extra/pyfpgadiag/opae/tools/fpgadiag/fpgamux.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2018, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pyfpgadiag/opae/utils/byteutils.py tools/extra/pyfpgadiag/opae/utils/byteutils.py -index 19e23d77f084..4290bc342424 100644 ---- tools/extra/pyfpgadiag/opae/utils/byteutils.py -+++ tools/extra/pyfpgadiag/opae/utils/byteutils.py -@@ -1,4 +1,4 @@ --#! /usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2018, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pypackager/afu_json_mgr.py tools/extra/pypackager/afu_json_mgr.py -index 0e31ec2646f1..d4bc864ddaf7 100755 ---- tools/extra/pypackager/afu_json_mgr.py -+++ tools/extra/pypackager/afu_json_mgr.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without -diff --git tools/extra/pypackager/packager.py tools/extra/pypackager/packager.py -index 859932700e3d..f6224dba369d 100755 ---- tools/extra/pypackager/packager.py -+++ tools/extra/pypackager/packager.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/python3 - # Copyright(c) 2017, Intel Corporation - # - # Redistribution and use in source and binary forms, with or without diff --git tools/fpgaflash/fpgaflash tools/fpgaflash/fpgaflash new file mode 100755 index 000000000000..1340afe3a62d @@ -1905,3 +1865,33 @@ + +clean-wrapper: + rm -f $(ADAPT_DEST_ROOT)/bin/packager +diff --git tools/utilities/vc_image_convert/extract_fpga_image.py tools/utilities/vc_image_convert/extract_fpga_image.py +index 176f5e56a203..9c05e4cf7afd 100644 +--- tools/utilities/vc_image_convert/extract_fpga_image.py ++++ tools/utilities/vc_image_convert/extract_fpga_image.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + """ Extrats section for use in fpgaflash that contains: + 0x010000 to 0x01FFFF : pfl option_bits + 0x020000 to 0x0381FFFF : S10 factory image page0 +diff --git tools/utilities/vc_image_convert/merge_device_table.py tools/utilities/vc_image_convert/merge_device_table.py +index a0e47f586c29..2cd0ef3bd60f 100644 +--- tools/utilities/vc_image_convert/merge_device_table.py ++++ tools/utilities/vc_image_convert/merge_device_table.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + """ splice in max10 device table info at 0x3820000 + + 0x03820000 to 0x03ffffff : Max10 device table range +diff --git tools/utilities/vc_image_convert/reverse.py tools/utilities/vc_image_convert/reverse.py +index 54ceedb426eb..6fe2cc8721b0 100644 +--- tools/utilities/vc_image_convert/reverse.py ++++ tools/utilities/vc_image_convert/reverse.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/python3 + + import argparse + from array import array
