Update to version 1.11.0 (fixes bug #1208279)
- Drop arm patch applied upstream - Make hwloc-devel require libibverbs-devel (bug #1191770) - Fix man page manipulation (bug #1235954)
This commit is contained in:
Orion Poplawski
parent
93b161ce54
commit
9332342297
@ -1,36 +0,0 @@
|
||||
diff -up hwloc-1.10.1/NEWS.arm hwloc-1.10.1/NEWS
|
||||
diff -up hwloc-1.10.1/src/topology-linux.c.arm hwloc-1.10.1/src/topology-linux.c
|
||||
--- hwloc-1.10.1/src/topology-linux.c.arm 2015-01-19 06:28:30.000000000 -0700
|
||||
+++ hwloc-1.10.1/src/topology-linux.c 2015-04-04 20:25:11.519848174 -0600
|
||||
@@ -2505,6 +2505,10 @@ look_powerpc_device_tree(struct hwloc_to
|
||||
DIR *dt;
|
||||
struct dirent *dirent;
|
||||
|
||||
+ /* only works for Power so far, and not useful on ARM */
|
||||
+ if (strncmp(data->utsname.machine, "ppc", 3))
|
||||
+ return;
|
||||
+
|
||||
ofroot = "/sys/firmware/devicetree/base/cpus";
|
||||
ofrootlen = 34;
|
||||
dt = hwloc_opendir(ofroot, root_fd);
|
||||
@@ -2571,6 +2575,10 @@ look_powerpc_device_tree(struct hwloc_to
|
||||
}
|
||||
free(threads);
|
||||
} else if ((unsigned int)-1 != reg) {
|
||||
+ /* Doesn't work on ARM because cpu "reg" do not start at 0.
|
||||
+ * We know the first cpu "reg" is the lowest. The others are likely
|
||||
+ * in order assuming the device-tree shows objects in order.
|
||||
+ */
|
||||
cpuset = hwloc_bitmap_alloc();
|
||||
hwloc_bitmap_set(cpuset, reg);
|
||||
}
|
||||
diff --git a/tests/linux/32ppc-4n4c2c.output b/tests/linux/32ppc-4n4c2c.output
|
||||
index e0d73dc..733abb4 100644
|
||||
--- a/tests/linux/32ppc-4n4c2c.output
|
||||
+++ b/tests/linux/32ppc-4n4c2c.output
|
||||
@@ -1,4 +1,4 @@
|
||||
-Machine (P#0 total=129236992KB Backend=Linux)
|
||||
+Machine (P#0 total=129236992KB PlatformName=pSeries PlatformModel="CHRP IBM,9125-F2A" Backend=Linux Architecture=ppc)
|
||||
NUMANode L#0 (P#0 local=31195136KB total=31195136KB)
|
||||
L3Cache L#0 (size=32768KB linesize=128)
|
||||
L2Cache L#0 (size=4096KB linesize=128 ways=8)
|
||||
32
hwloc.spec
32
hwloc.spec
@ -1,16 +1,13 @@
|
||||
Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
|
||||
Name: hwloc
|
||||
Version: 1.10.1
|
||||
Release: 3%{?dist}
|
||||
Version: 1.11.0
|
||||
Release: 1%{?dist}
|
||||
License: BSD
|
||||
Group: Applications/System
|
||||
URL: http://www.open-mpi.org/projects/hwloc/
|
||||
Source0: http://www.open-mpi.org/software/hwloc/v1.10/downloads/%{name}-%{version}.tar.bz2
|
||||
Source0: http://www.open-mpi.org/software/hwloc/v1.11/downloads/%{name}-%{version}.tar.bz2
|
||||
# Updated test file for patch below
|
||||
Source1: https://github.com/open-mpi/hwloc/raw/7a9b00834235ddd3c02699cbab7946edf6fc9030/tests/linux/32ppc-4n4c2c.tar.bz2
|
||||
# Fix issue on ARM
|
||||
# https://github.com/open-mpi/hwloc/issues/127
|
||||
Patch0: hwloc-arm.patch
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
BuildRequires: cairo-devel
|
||||
@ -49,6 +46,7 @@ about the hardware, bind processes, and much more.
|
||||
Summary: Headers and shared development libraries for hwloc
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
|
||||
Requires: libibverbs-devel%{?_isa}
|
||||
|
||||
%description devel
|
||||
Headers and shared object symbolic links for the hwloc.
|
||||
@ -81,13 +79,13 @@ Requires: %{name}-plugins%{?_isa} = %{version}-%{release}
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1 -b .arm
|
||||
cp -a %SOURCE1 tests/linux/
|
||||
|
||||
%build
|
||||
# Remove rpaths
|
||||
autoreconf --force --install
|
||||
%configure --enable-plugins
|
||||
make %{?_smp_mflags} V=1
|
||||
%configure --enable-plugins --disable-silent-rules
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
|
||||
@ -100,11 +98,9 @@ cp -pr doc/examples %{buildroot}%{_defaultdocdir}/%{name}
|
||||
|
||||
desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
|
||||
|
||||
rm %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1
|
||||
rm %{buildroot}%{_mandir}/man1/hwloc-ls.1
|
||||
mv %{buildroot}%{_mandir}/man1/lstopo.1 %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1
|
||||
ln -rs %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1 %{buildroot}%{_mandir}/man1/lstopo.1
|
||||
ln -rs %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1 %{buildroot}%{_mandir}/man1/hwloc-ls.1
|
||||
# Avoid making hwloc-gui depend on hwloc
|
||||
rm %{buildroot}%{_mandir}/man1/lstopo.1
|
||||
ln %{buildroot}%{_mandir}/man1/lstopo-no-graphics.1 %{buildroot}%{_mandir}/man1/lstopo.1
|
||||
|
||||
%check
|
||||
make check
|
||||
@ -135,7 +131,7 @@ make check
|
||||
%{_datadir}/%{name}/%{name}-valgrind.supp
|
||||
%dir %{_defaultdocdir}/%{name}
|
||||
%{_defaultdocdir}/%{name}/*[^c]
|
||||
%{_libdir}/libhwloc*so.*
|
||||
%{_libdir}/libhwloc*so.5*
|
||||
|
||||
%files gui
|
||||
%{_bindir}/lstopo
|
||||
@ -147,6 +143,12 @@ make check
|
||||
%{_libdir}/hwloc*
|
||||
|
||||
%changelog
|
||||
* Tue Jul 21 2015 Orion Poplwski <orion@cora.nwra.com> - 1.11.0-1
|
||||
- Update to version 1.11.0 (fixes bug #1208279)
|
||||
- Drop arm patch applied upstream
|
||||
- Make hwloc-devel require libibverbs-devel (bug #1191770)
|
||||
- Fix man page manipulation (bug #1235954)
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.10.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user