From 9f5756dc58def61f200492da0874f35a1c9618493493765216cda44036ed5d47 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 18 Aug 2020 17:34:53 +0000 Subject: [PATCH 1/3] - update to 2.2.0: * API + Add hwloc_bitmap_singlify_by_core() to remove SMT from a given cpuset, thanks to Florian Reynier for the suggestion. + Add --enable-32bits-pci-domain to stop ignoring PCI devices with domain >16bits (e.g. 10000:02:03.4). Enabling this option breaks the library ABI. Thanks to Dylan Simon for the help. * Backends + Add support for Linux cgroups v2. + Add NUMA support for FreeBSD. + Add get_last_cpu_location support for FreeBSD. + Remove support for Intel Xeon Phi (MIC, Knights Corner) co-processors. * Tools + Add --uid to filter the hwloc-ps output by uid on Linux. + Add a GRAPHICAL OUTPUT section in the manpage of lstopo. * Misc + Use the native dlopen instead of libltdl, unless --disable-plugin-dlopen is passed at configure time. - install systemd files using systemd macros and register it on install with systemd - build against libnuma on all architectures OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=34 --- hwloc-2.1.0.tar.bz2 | 3 --- hwloc-2.2.0.tar.bz2 | 3 +++ hwloc.changes | 25 ++++++++++++++++++++++++ hwloc.spec | 46 +++++++++++++++++++++------------------------ 4 files changed, 49 insertions(+), 28 deletions(-) delete mode 100644 hwloc-2.1.0.tar.bz2 create mode 100644 hwloc-2.2.0.tar.bz2 diff --git a/hwloc-2.1.0.tar.bz2 b/hwloc-2.1.0.tar.bz2 deleted file mode 100644 index a129223..0000000 --- a/hwloc-2.1.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:19429752f772cf68321196970ffb10dafd7e02ab38d2b3382b157c78efd10862 -size 6272755 diff --git a/hwloc-2.2.0.tar.bz2 b/hwloc-2.2.0.tar.bz2 new file mode 100644 index 0000000..fc15820 --- /dev/null +++ b/hwloc-2.2.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae70b893df272b84afd7068d351aae5c8c4fd79d40ca783b3e67554b873a2252 +size 6249788 diff --git a/hwloc.changes b/hwloc.changes index 5f47436..f3de3f9 100644 --- a/hwloc.changes +++ b/hwloc.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Tue Aug 18 15:37:56 UTC 2020 - Dirk Mueller + +- update to 2.2.0: + * API + + Add hwloc_bitmap_singlify_by_core() to remove SMT from a given cpuset, + thanks to Florian Reynier for the suggestion. + + Add --enable-32bits-pci-domain to stop ignoring PCI devices with domain + >16bits (e.g. 10000:02:03.4). Enabling this option breaks the library ABI. + Thanks to Dylan Simon for the help. + * Backends + + Add support for Linux cgroups v2. + + Add NUMA support for FreeBSD. + + Add get_last_cpu_location support for FreeBSD. + + Remove support for Intel Xeon Phi (MIC, Knights Corner) co-processors. + * Tools + + Add --uid to filter the hwloc-ps output by uid on Linux. + + Add a GRAPHICAL OUTPUT section in the manpage of lstopo. + * Misc + + Use the native dlopen instead of libltdl, + unless --disable-plugin-dlopen is passed at configure time. +- install systemd files using systemd macros and register it on install + with systemd +- build against libnuma on all architectures + ------------------------------------------------------------------- Tue Oct 15 08:40:07 UTC 2019 - Thomas Blume diff --git a/hwloc.spec b/hwloc.spec index 4bd729a..848541c 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -1,7 +1,7 @@ # # spec file for package hwloc # -# 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 @@ -18,13 +18,13 @@ %global lname libhwloc15 Name: hwloc -Version: 2.1.0 +Version: 2.2.0 Release: 0 Summary: Portable Hardware Locality License: BSD-3-Clause Group: Productivity/Clustering/Computing -Url: http://www.open-mpi.org/projects/hwloc/ -Source0: https://download.open-mpi.org/release/hwloc/v2.1/%{name}-%{version}.tar.bz2 +URL: https://www.open-mpi.org/projects/hwloc/ +Source0: https://download.open-mpi.org/release/hwloc/v2.2/hwloc-%{version}.tar.bz2 BuildRequires: autoconf BuildRequires: automake BuildRequires: doxygen @@ -34,6 +34,7 @@ BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: perl BuildRequires: pkgconfig +BuildRequires: systemd-rpm-macros BuildRequires: update-desktop-files BuildRequires: pkgconfig(cairo) BuildRequires: pkgconfig(libxml-2.0) @@ -44,10 +45,8 @@ Requires: perl-JSON Requires: perl-base >= 5.18.2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%ifnarch s390 s390x i586 aarch64 %{arm} +%{?systemd_ordering} BuildRequires: libnuma-devel -%endif %description The Portable Hardware Locality (hwloc) software package provides @@ -86,9 +85,7 @@ This package contains the run time libraries for hwloc. %package data Summary: Run time data for hwloc Group: Development/Libraries/C and C++ -%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} BuildArch: noarch -%endif %description data This package contains the run time data for the hwloc. @@ -96,22 +93,20 @@ This package contains the run time data for the hwloc. %package doc Summary: Documentation for hwloc Group: Documentation/Other -%if 0%{?sle_version} > 120300 || 0%{?is_opensuse} BuildArch: noarch -%endif %description doc This package contains the documentation for hwloc. %prep -%setup -q -n %{name}-%{version} +%setup -q %build autoreconf -fvi %configure \ --disable-silent-rules -make %{?_smp_mflags} +%make_build %install %make_install @@ -124,11 +119,9 @@ rm -rf %{buildroot}%{_datadir}/doc/ # This binary is built only for intel architectures %ifarch %{ix86} x86_64 -mkdir -p %{buildroot}%{_libexecdir}/systemd/system -mv %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %{buildroot}%{_libexecdir}/systemd/system/hwloc-dump-hwdata.service -%else -rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service +install -D -m 644 %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %{buildroot}%{_unitdir}/hwloc-dump-hwdata.service %endif +rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %fdupes -s %{buildroot}/%{_mandir}/man1 %fdupes -s %{buildroot}/%{_mandir}/man7 @@ -136,20 +129,27 @@ rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %check #XXX: this is weird, but make check got broken by removing doxygen-doc/man above # the only one fix is to install documentation by hand, or to ignore check error -make %{?_smp_mflags} check || : +%make_build check || : %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig +%pre +%service_add_pre hwloc-dump-hwdata.service %post +%service_add_post hwloc-dump-hwdata.service %desktop_database_post +%preun +%service_del_preun hwloc-dump-hwdata.service + %postun +%service_del_postun hwloc-dump-hwdata.service %desktop_database_postun %files -%defattr(-, root, root, -) -%doc AUTHORS COPYING NEWS README VERSION +%license COPYING +%doc NEWS README VERSION %{_mandir}/man1/hwloc* %{_mandir}/man1/lstopo* %{_bindir}/hwloc* @@ -158,11 +158,10 @@ make %{?_smp_mflags} check || : %{_sysconfdir}/bash_completion.d/hwloc-completion.bash %ifarch %{ix86} x86_64 %attr(0755,root,root) %{_sbindir}/hwloc-dump-hwdata -%{_libexecdir}/systemd/system/hwloc-dump-hwdata.service +%{_unitdir}/hwloc-dump-hwdata.service %endif %files devel -%defattr(-, root, root, -) %{_mandir}/man7/hwloc* %{_includedir}/hwloc %{_includedir}/hwloc.h @@ -170,11 +169,9 @@ make %{?_smp_mflags} check || : %{_libdir}/pkgconfig/hwloc.pc %files -n %{lname} -%defattr(-, root, root, -) %{_libdir}/libhwloc*so.* %files data -%defattr(-, root, root, -) %dir %{_datadir}/hwloc %dir %{_datadir}/hwloc/hwloc-ps.www %{_datadir}/hwloc/hwloc.dtd @@ -184,7 +181,6 @@ make %{?_smp_mflags} check || : %{_datadir}/hwloc/hwloc-ps.www/* %files doc -%defattr(-, root, root, -) %doc ./doc/doxygen-doc/html/* %{_mandir}/man3/* From b67a8777776d00a6512ced5b8d2ceca36ddf1462bf2c3a31b11f740bd8dfab32 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 18 Aug 2020 17:42:12 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=35 --- hwloc.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hwloc.spec b/hwloc.spec index 848541c..6a2474d 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -30,6 +30,7 @@ BuildRequires: automake BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ +BuildRequires: libnuma-devel BuildRequires: libtool BuildRequires: ncurses-devel BuildRequires: perl @@ -46,7 +47,6 @@ Requires: perl-base >= 5.18.2 Requires(post): desktop-file-utils Requires(postun): desktop-file-utils %{?systemd_ordering} -BuildRequires: libnuma-devel %description The Portable Hardware Locality (hwloc) software package provides @@ -133,18 +133,28 @@ rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig + %pre +%ifarch %{ix86} x86_64 %service_add_pre hwloc-dump-hwdata.service +%endif %post +%ifarch %{ix86} x86_64 %service_add_post hwloc-dump-hwdata.service +%endif %desktop_database_post %preun +%ifarch %{ix86} x86_64 %service_del_preun hwloc-dump-hwdata.service +%endif %postun +%ifarch %{ix86} x86_64 %service_del_postun hwloc-dump-hwdata.service +%endif + %desktop_database_postun %files From 5d326dc918092b2d92543d75911d87cfab759935dc8a0da9d80b21b0b15108f8 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Thu, 20 Aug 2020 22:58:44 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/hwloc?expand=0&rev=36 --- hwloc.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hwloc.spec b/hwloc.spec index 6a2474d..3a88f7b 100644 --- a/hwloc.spec +++ b/hwloc.spec @@ -134,8 +134,8 @@ rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%pre %ifarch %{ix86} x86_64 +%pre %service_add_pre hwloc-dump-hwdata.service %endif @@ -145,8 +145,8 @@ rm %{buildroot}%{_datadir}/hwloc/hwloc-dump-hwdata.service %endif %desktop_database_post -%preun %ifarch %{ix86} x86_64 +%preun %service_del_preun hwloc-dump-hwdata.service %endif