Hello community, here is the log from the commit of package opae for openSUSE:Factory checked in at 2019-10-18 14:33:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opae (Old) and /work/SRC/openSUSE:Factory/.opae.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opae" Fri Oct 18 14:33:17 2019 rev:6 rq:736831 version:1.3.2 Changes: -------- --- /work/SRC/openSUSE:Factory/opae/opae.changes 2018-07-06 10:49:18.974730620 +0200 +++ /work/SRC/openSUSE:Factory/.opae.new.2352/opae.changes 2019-10-18 14:33:19.844255443 +0200 @@ -1,0 +2,30 @@ +Fri Sep 6 08:21:29 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> + +- Update to 1.3.2-1 + - See RELEASE_NOTES for a complete list of changes +- Drop patches fixed upstream: + - opae-fix-gcc-warning-on-exception.patch +- Refresh patch against new sources: + - opae-missing-shebang.patch + - opae-add-missing-lpthread.patch + - opae-fix-python-packaging.patch +- Add patch to fix compilation against hwloc >= 2.0 + - opae-fix-support-for-hwloc-2.patch + +------------------------------------------------------------------- +Wed May 15 06:33:16 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> + +- Update to 1.3.0-2 + - See RELEASE_NOTES for a complete list of changes +- Drop patches fixed upstream: + - opae-fix-cmake-paths.patch +- Refresh patch against new sources: + - opae-missing-shebang.patch + - opae-add-missing-lpthread.patch +- Add new patches + - opae-fix-gcc-warning-on-exception.patch to workaround a GCC8 error + on exception handling + - opae-fix-python-packaging.patch to fix the bad usage of string in + python ByteIO.write + +------------------------------------------------------------------- Old: ---- opae-0.13.0.0.c83632afa605.tar.bz2 opae-fix-cmake-paths.patch New: ---- opae-1.3.21.0.4ec6dc67e795.tar.bz2 opae-fix-python-packaging.patch opae-fix-support-for-hwloc-2.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opae.spec ++++++ --- /var/tmp/diff_new_pack.Y5Njtn/_old 2019-10-18 14:33:20.300254255 +0200 +++ /var/tmp/diff_new_pack.Y5Njtn/_new 2019-10-18 14:33:20.304254245 +0200 @@ -1,7 +1,7 @@ # # spec file for package opae # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,16 +12,20 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define git_ver .0.c83632afa605 -%define lib_opae_major 0 -%define lib_hssi_major 0 +%define git_ver 1.0.4ec6dc67e795 +%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 Name: opae -Version: 0.13.0 +Version: 1.3.2 Release: 0 Summary: Open Programmable Acceleration Engine License: Intel OR MIT @@ -29,17 +33,22 @@ Url: https://github.com/OPAE/opae-sdk Source0: %{name}-%{version}%{git_ver}.tar.bz2 Patch0: opae-add-missing-lpthread.patch -Patch1: opae-fix-cmake-paths.patch -Patch2: opae-missing-shebang.patch +Patch1: opae-missing-shebang.patch +Patch3: opae-fix-python-packaging.patch +Patch4: opae-fix-support-for-hwloc-2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: boost-devel BuildRequires: cmake BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: graphviz +BuildRequires: hwloc-devel BuildRequires: libjson-c-devel BuildRequires: libuuid-devel BuildRequires: ncurses-devel +BuildRequires: python3-devel #Currently *only* builds on x86_64 ExclusiveArch: x86_64 Requires: libhssi-io%{lib_hssi_major} = %{version} @@ -72,7 +81,6 @@ %description -n libopae-c%{lib_opae_major} Libraries for the Open Programmable Acceleration Engine Libraries tools. - %package -n libhssi-io%{lib_hssi_major} Summary: Open Programmable Acceleration Engine Libraries Group: System/Libraries @@ -80,46 +88,155 @@ %description -n libhssi-io%{lib_hssi_major} Libraries for the Open Programmable Acceleration Engine Libraries tools. +%package -n libbmc%{lib_bmc_major} +Summary: Open Programmable Acceleration Engine Libraries +Group: System/Libraries + +%description -n libbmc%{lib_bmc_major} +Libraries for the Open Programmable Acceleration Engine Libraries tools. + +%package ase +Summary: OPAE AFU Simulation Environment +Group: System/Base + +%description ase +This package contains OPAE AFU Simulation Environment + +%package -n libase%{lib_ase_major} +Summary: OPAE Simulation Environment Libraries +Group: System/Libraries + +%description -n libase%{lib_ase_major} +Libraries for the OPAE Simulation environment. + +%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. + +%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. + %prep %setup -q -n %{name}-%{version}%{git_ver} %patch0 %patch1 -%patch2 +%patch3 +%patch4 %build export RPM_OPT_FLAGS -%cmake -DCMAKE_BUILD_TYPE=Release +%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} %install -%cmake_install +%cmake_install VERBOSE=1 V=1 rm -f %{buildroot}%{_libdir}/libsafestr.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] +# Drop hidden travis file from python json +rm -f %{buildroot}%{_datarootdir}/opae/python/jsonschema-*/.travis.yml +%fdupes %{buildroot}/%{_prefix} +# 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 + +%pre +%service_add_pre fpgad.service +%post +%service_add_post fpgad.service +%{fillup_only -n fpgad} +%preun +%service_del_preun fpgad.service +%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 %files %{_bindir}/* -%license COPYING RELEASE_NOTES +%exclude %{_bindir}/afu_sim_setup +%exclude %{_bindir}/with_ase +%license COPYING +%doc RELEASE_NOTES.md +%dir %{_datarootdir}/opae +%{_datarootdir}/opae/python +%dir %{_sysconfdir}/opae +%config(noreplace) %{_sysconfdir}/opae/fpgad.cfg +%{_fillupdir}/sysconfig.fpgad +%{_unitdir}/fpgad.service %files devel %{_includedir}/opae %{_libdir}/*.so %dir %{_datarootdir}/opae -%{_datarootdir}/opae/hello_fpga.c -%{_datarootdir}/opae/hello_events.c +%{_datarootdir}/opae/samples/ %{_datarootdir}/opae/platform +%{_datarootdir}/cmake/Modules/OPAE %files -n libopae-c%{lib_opae_major} -%{_libdir}/libopae-c*.so.%{lib_opae_major} -%{_libdir}/libopae-c*.so.%{lib_opae_major}.* +%{_libdir}/libopae-c.so.%{lib_opae_major} +%{_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}.* + +%files -n libbitstream%{lib_hssi_major} +%{_libdir}/libbitstream.so.%{lib_hssi_major} +%{_libdir}/libbitstream.so.%{lib_hssi_major}.* + +%files -n libfpgad-api%{lib_bmc_major} +%{_libdir}/libfpgad-api.so.%{lib_bmc_major} +%{_libdir}/libfpgad-api.so.%{lib_bmc_major}.* + +%files ase +%{_bindir}/afu_sim_setup +%{_bindir}/with_ase +%license COPYING +%dir %{_datarootdir}/opae +%{_datarootdir}/opae/ase + %changelog ++++++ _service ++++++ --- /var/tmp/diff_new_pack.Y5Njtn/_old 2019-10-18 14:33:20.332254172 +0200 +++ /var/tmp/diff_new_pack.Y5Njtn/_new 2019-10-18 14:33:20.332254172 +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">c83632afa605c0051b15f7061136ef6bd167500a</param> + <param name="revision">4ec6dc67e7957bf7d1879fa2b3d7b56472d7c65b</param> </service> <service name="recompress" mode="disabled"> <param name="file">opae*.tar</param> ++++++ opae-0.13.0.0.c83632afa605.tar.bz2 -> opae-1.3.21.0.4ec6dc67e795.tar.bz2 ++++++ ++++ 686315 lines of diff (skipped) ++++++ opae-add-missing-lpthread.patch ++++++ --- /var/tmp/diff_new_pack.Y5Njtn/_old 2019-10-18 14:33:22.628248192 +0200 +++ /var/tmp/diff_new_pack.Y5Njtn/_new 2019-10-18 14:33:22.632248182 +0200 @@ -1,25 +1,59 @@ -diff --git libopae/CMakeLists.txt libopae/CMakeLists.txt -index 08fc9a4..667c7d8 100644 ---- libopae/CMakeLists.txt -+++ libopae/CMakeLists.txt -@@ -64,6 +64,7 @@ add_dependencies(opae-c copy-common-opae-header-files) - target_link_libraries(opae-c - m - safestr +commit 7e7cf56316751109f06f7a44cda3f1adb97b7c9a +Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> +Date: Wed Sep 6 09:28:13 2017 +0200 + + opae add missing lpthread + + Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> + +diff --git libopae/plugins/ase/api/CMakeLists.txt libopae/plugins/ase/api/CMakeLists.txt +index cd31c6bdeac0..a5efd78c1790 100644 +--- libopae/plugins/ase/api/CMakeLists.txt ++++ libopae/plugins/ase/api/CMakeLists.txt +@@ -57,6 +57,8 @@ set(ASEAPI_SRC + + add_library(ase SHARED ${ASEAPI_SRC}) + target_link_libraries(ase + pthread ++ dl ${libjson-c_LIBRARIES} - ${libuuid_LIBRARIES}) + ${libuuid_LIBRARIES} + ${librt_LIBRARIES}) +diff --git tools/base/fpgad/api/CMakeLists.txt tools/base/fpgad/api/CMakeLists.txt +index 054ca6411275..c775484248cc 100644 +--- tools/base/fpgad/api/CMakeLists.txt ++++ tools/base/fpgad/api/CMakeLists.txt +@@ -57,6 +57,7 @@ set_target_properties(fpgad-api PROPERTIES + SOVERSION ${INTEL_FPGA_API_VER_MAJOR}) -diff --git tools/c++utils/CMakeLists.txt tools/c++utils/CMakeLists.txt -index 41f61ec..914cb7e 100644 ---- tools/c++utils/CMakeLists.txt -+++ tools/c++utils/CMakeLists.txt -@@ -51,7 +51,7 @@ set_target_properties(opae-c++-utils PROPERTIES + target_link_libraries(fpgad-api ++ safestr + ${CMAKE_THREAD_LIBS_INIT} + ${libjson-c_LIBRARIES}) + +diff --git tools/extra/c++utils/CMakeLists.txt tools/extra/c++utils/CMakeLists.txt +index 399d4f3e3792..190e8180b83d 100644 +--- tools/extra/c++utils/CMakeLists.txt ++++ tools/extra/c++utils/CMakeLists.txt +@@ -45,7 +45,7 @@ set_target_properties(opae-c++-utils PROPERTIES VERSION ${INTEL_FPGA_API_VERSION} SOVERSION ${INTEL_FPGA_API_VER_MAJOR}) --target_link_libraries(opae-c++-utils ${CJSON_LIBRARY}) -+target_link_libraries(opae-c++-utils pthread ${CJSON_LIBRARY}) +-target_link_libraries(opae-c++-utils ${libjson-c_LIBRARIES}) ++target_link_libraries(opae-c++-utils pthread ${libjson-c_LIBRARIES}) install(TARGETS opae-c++-utils - LIBRARY DESTINATION lib + LIBRARY DESTINATION ${OPAE_LIB_INSTALL_DIR} +diff --git tools/extra/fpgadiag/CMakeLists.txt tools/extra/fpgadiag/CMakeLists.txt +index f0ef73578ab0..f84d8053f585 100644 +--- tools/extra/fpgadiag/CMakeLists.txt ++++ tools/extra/fpgadiag/CMakeLists.txt +@@ -52,7 +52,7 @@ add_library(opae-c++-nlb SHARED nlb.h + + set_install_rpath(opae-c++-nlb) + +-target_link_libraries(opae-c++-nlb opae-c opae-cxx-core pthread) ++target_link_libraries(opae-c++-nlb opae-c opae-cxx-core pthread opae-c++-utils) + + set_target_properties(opae-c++-nlb PROPERTIES + VERSION ${INTEL_FPGA_API_VERSION} ++++++ opae-fix-python-packaging.patch ++++++ commit e392c8fd6f0b4a092cb4a2370b2d3f97c2135c8b Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> Date: Wed May 15 09:22:00 2019 +0200 opae: fix python packaging Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> diff --git cmake/modules/packaging.cmake cmake/modules/packaging.cmake index a028cb147d78..cc7101bc1688 100644 --- cmake/modules/packaging.cmake +++ cmake/modules/packaging.cmake @@ -98,7 +98,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/python3' + os.linesep)\n" + "wr_buf.write(str.encode('#!/usr/bin/python3' + os.linesep))\n" "\n" "z = zipfile.PyZipFile(wr_buf, 'w')\n") @@ -137,7 +137,7 @@ macro(CREATE_PYTHON_EXE EXE_NAME MAIN_MODULE) "f.close()\n") # Run Python to generate the zipped file - execute_process(COMMAND python "${BUILD_DIR_MAIN}/do_zip.py" + execute_process(COMMAND ${PYTHON_EXECUTABLE} "${BUILD_DIR_MAIN}/do_zip.py" WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) endmacro(CREATE_PYTHON_EXE) ++++++ opae-fix-support-for-hwloc-2.patch ++++++ commit fecdec1b0a962f4451a87607720ad6844aa91cc0 Author: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> Date: Thu Oct 10 11:28:35 2019 +0200 opae fix support for hwloc 2 Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemar...@suse.com> diff --git tools/extra/pac/fpgabist/dma_vc/fpga_dma_test.c tools/extra/pac/fpgabist/dma_vc/fpga_dma_test.c index 4361cd4d3c17..35598f4a14c0 100644 --- tools/extra/pac/fpgabist/dma_vc/fpga_dma_test.c +++ tools/extra/pac/fpgabist/dma_vc/fpga_dma_test.c @@ -691,8 +691,15 @@ int main(int argc, char *argv[]) // Find the device from the topology hwloc_topology_t topology; hwloc_topology_init(&topology); +#if HWLOC_API_VERSION >= 0x00020000 + hwloc_topology_set_type_filter(topology, HWLOC_OBJ_PCI_DEVICE, HWLOC_TYPE_FILTER_KEEP_IMPORTANT); + hwloc_topology_set_type_filter(topology, HWLOC_OBJ_OS_DEVICE, HWLOC_TYPE_FILTER_KEEP_IMPORTANT); + hwloc_topology_set_type_filter(topology, HWLOC_OBJ_BRIDGE, HWLOC_TYPE_FILTER_KEEP_IMPORTANT); +#else hwloc_topology_set_flags(topology, - HWLOC_TOPOLOGY_FLAG_IO_DEVICES); + HWLOC_TOPOLOGY_FLAG_IO_DEVICES); +#endif + hwloc_topology_load(topology); hwloc_obj_t obj = hwloc_get_pcidev_by_busid(topology, dom, bus, dev, func); @@ -708,7 +715,7 @@ int main(int argc, char *argv[]) printf("NODESET is %s\n", str); #endif if (memory_affinity) { -#if HWLOC_API_VERSION > 0x00020000 +#if HWLOC_API_VERSION >= 0x00020000 retval = hwloc_set_membind( topology, obj2->nodeset, HWLOC_MEMBIND_THREAD, HWLOC_MEMBIND_MIGRATE ++++++ opae-missing-shebang.patch ++++++ ++++ 2036 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/opae/opae-missing-shebang.patch ++++ and /work/SRC/openSUSE:Factory/.opae.new.2352/opae-missing-shebang.patch
