diff --git a/.gitignore b/.gitignore
index 0337ac9..02a7a19 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/hwloc-1.7.tar.bz2
+SOURCES/hwloc-1.11.2.tar.bz2
diff --git a/.hwloc.metadata b/.hwloc.metadata
index b123a13..1008f3f 100644
--- a/.hwloc.metadata
+++ b/.hwloc.metadata
@@ -1 +1 @@
-60f5ca622ee70fbc098f372d7c8e651ed27e7e65 SOURCES/hwloc-1.7.tar.bz2
+3d68de060808f04349538be4e63cde501cd53b0a SOURCES/hwloc-1.11.2.tar.bz2
diff --git a/SOURCES/hwloc-1.11.2-dump-cleanups.patch b/SOURCES/hwloc-1.11.2-dump-cleanups.patch
new file mode 100644
index 0000000..9c5da11
--- /dev/null
+++ b/SOURCES/hwloc-1.11.2-dump-cleanups.patch
@@ -0,0 +1,212 @@
+diff -Nrup hwloc-1.11.2.orig/config/hwloc_internal.m4 hwloc-1.11.2/config/hwloc_internal.m4
+--- hwloc-1.11.2.orig/config/hwloc_internal.m4 2016-06-06 13:45:07.591491542 -0400
++++ hwloc-1.11.2/config/hwloc_internal.m4 2016-06-06 14:11:17.698625007 -0400
+@@ -1,6 +1,6 @@
+ dnl -*- Autoconf -*-
+ dnl
+-dnl Copyright © 2009-2014 Inria. All rights reserved.
++dnl Copyright © 2009-2016 Inria. All rights reserved.
+ dnl Copyright © 2009, 2011 Université Bordeaux
+ dnl Copyright © 2004-2005 The Trustees of Indiana University and Indiana
+ dnl University Research and Technology
+@@ -247,6 +247,14 @@ EOF
+
+ AC_REQUIRE([AC_PROG_SED])
+
++ # runstatedir only supported in autoconf >= 2.70 and in some backports
++ if test "x${runstatedir}" != "x"; then
++ HWLOC_runstatedir=${runstatedir}
++ else
++ HWLOC_runstatedir='${localstatedir}/run'
++ fi
++ AC_SUBST([HWLOC_runstatedir])
++
+ # Cairo support
+ hwloc_cairo_happy=no
+ if test "x$enable_cairo" != "xno"; then
+diff -Nrup hwloc-1.11.2.orig/doc/hwloc.doxy hwloc-1.11.2/doc/hwloc.doxy
+--- hwloc-1.11.2.orig/doc/hwloc.doxy 2015-12-17 05:05:59.000000000 -0500
++++ hwloc-1.11.2/doc/hwloc.doxy 2016-06-06 14:10:34.211094730 -0400
+@@ -816,6 +816,9 @@ assembling them with hwloc-assembler.
+
+
+
++See HWLOC_DUMPED_HWDATA_DIR in \ref envvar for details
++about the location of dumped files.
++
+
+ \page envvar Environment Variables
+
+@@ -963,7 +966,12 @@ following environment variables.
+
+ HWLOC_DUMPED_HWDATA_DIR=/path/to/dumped/files/
+ loads files dumped by hwloc-dump-hwdata (on Linux)
+- from the given directory instead of /var/run/hwloc/.
++ from the given directory.
++ The default dump/load directory is configured during build based
++ on \--runstatedir, \--localstatedir, and \--prefix options.
++ It usually points to /var/run/hwloc/ in Linux distribution
++ packages, but it may also point to $prefix/var/run/hwloc/
++ when manually installing and only specifying \--prefix.
+
+
+ HWLOC_COMPONENTS=list,of,components
+@@ -2777,6 +2785,8 @@ The utility hwloc-dump-hwdata i
+ privileged information at boot time and making it available to
+ non-privileged users. However it only applies to Intel Knights Landing
+ Xeon Phi for now (see \ref faq_knl_dump).
++See also HWLOC_DUMPED_HWDATA_DIR in \ref envvar for details
++about the location of dumped files.
+
+
+ \section faq_onedim hwloc only has a one-dimensional view of the architecture, it ignores distances
+@@ -3149,6 +3159,9 @@ hwloc-dump-hwdata requires dmi-sysfs
+
+ The utility is currently unneeded on non-KNL platforms.
+
++See HWLOC_DUMPED_HWDATA_DIR in \ref envvar for details
++about the location of dumped files.
++
+
+ \section faq_phi How do I build for Intel Xeon Phi coprocessor?
+
+diff -Nrup hwloc-1.11.2.orig/NEWS hwloc-1.11.2/NEWS
+--- hwloc-1.11.2.orig/NEWS 2016-06-06 13:45:54.947068832 -0400
++++ hwloc-1.11.2/NEWS 2016-06-06 14:11:52.160045046 -0400
+@@ -60,6 +60,8 @@ Version 1.11.2
+ * Add systemd service template contrib/systemd/hwloc-dump-hwdata.service
+ for launching hwloc-dump-hwdata at boot on Linux.
+ Thanks to Grzegorz Andrejczuk.
++* Make the hwloc-dump-hwdata dump directory configurable through configure
++ options such as --runstatedir or --localstatedir.
+
+
+ Version 1.11.1
+diff -Nrup hwloc-1.11.2.orig/src/Makefile.am hwloc-1.11.2/src/Makefile.am
+--- hwloc-1.11.2.orig/src/Makefile.am 2015-10-06 13:06:45.000000000 -0400
++++ hwloc-1.11.2/src/Makefile.am 2016-06-06 14:10:34.212094742 -0400
+@@ -1,4 +1,4 @@
+-# Copyright © 2009-2014 Inria. All rights reserved.
++# Copyright © 2009-2016 Inria. All rights reserved.
+ # Copyright © 2009-2012 Université Bordeaux
+ # Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved.
+ # Copyright © 2011-2012 Oracle and/or its affiliates. All rights reserved.
+@@ -22,7 +22,8 @@ endif
+ pluginsdir = @HWLOC_PLUGINS_DIR@
+ plugins_LTLIBRARIES =
+ plugins_ldflags = -module -avoid-version -lltdl
+-AM_CPPFLAGS += -DHWLOC_PLUGINS_PATH=\"$(HWLOC_PLUGINS_PATH)\"
++# Beware that files are not rebuilt automatically when reconfiguring with different paths in these flags.
++AM_CPPFLAGS += -DHWLOC_PLUGINS_PATH=\"$(HWLOC_PLUGINS_PATH)\" -DRUNSTATEDIR=\"$(HWLOC_runstatedir)\"
+
+ # Sources and ldflags
+
+diff -Nrup hwloc-1.11.2.orig/src/topology-linux.c hwloc-1.11.2/src/topology-linux.c
+--- hwloc-1.11.2.orig/src/topology-linux.c 2015-12-10 07:09:45.000000000 -0500
++++ hwloc-1.11.2/src/topology-linux.c 2016-06-06 14:10:34.214094766 -0400
+@@ -5237,7 +5237,7 @@ hwloc_linux_component_instantiate(struct
+
+ data->dumped_hwdata_dirname = getenv("HWLOC_DUMPED_HWDATA_DIR");
+ if (!data->dumped_hwdata_dirname)
+- data->dumped_hwdata_dirname = "/var/run/hwloc/";
++ data->dumped_hwdata_dirname = RUNSTATEDIR "/hwloc/";
+
+ data->deprecated_classlinks_model = -2; /* never tried */
+ data->mic_need_directlookup = -1; /* not initialized */
+diff -Nrup hwloc-1.11.2.orig/utils/hwloc/hwloc-dump-hwdata.1in hwloc-1.11.2/utils/hwloc/hwloc-dump-hwdata.1in
+--- hwloc-1.11.2.orig/utils/hwloc/hwloc-dump-hwdata.1in 2015-12-10 07:09:45.000000000 -0500
++++ hwloc-1.11.2/utils/hwloc/hwloc-dump-hwdata.1in 2016-06-06 14:10:34.216094790 -0400
+@@ -1,5 +1,5 @@
+ .\" -*- nroff -*-
+-.\" Copyright © 2015 Inria. All rights reserved.
++.\" Copyright © 2015-2016 Inria. All rights reserved.
+ .\" See COPYING in top-level directory.
+ .TH HWLOC-DUMP-HWDATA "1" "#HWLOC_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
+ .SH NAME
+@@ -21,7 +21,11 @@ hwloc-dump-hwdata \- Dump topology and l
+ .TP 10
+ \fB\-o \fR
+ save output files to directory instead of the default
+-\fI/var/run/hwloc/\fR.
++\fI#RUNSTATEDIR#/hwloc/\fR that was specified at configure time.
++
++You may want to set the HWLOC_DUMPED_HWDATA_DIR environment variable
++as well so that the hwloc library looks for dumped files in that same
++directory.
+ .
+ .\" **************************
+ .\" Description Section
+@@ -54,11 +58,6 @@ gathered from specific SMBIOS entries su
+ \fI/sys/firmware/dmi/entries/160-*\fR,
+ and saved in file \fIknl_memoryside_cache\fR.
+ .
+-.PP
+-If the output directory is changed, you may want to set the
+-HWLOC_DUMPED_HWDATA_DIR environment variable accordingly so that
+-the hwloc library finds the dumped files.
+-.
+ .\" **************************
+ .\" See also section
+ .\" **************************
+diff -Nrup hwloc-1.11.2.orig/utils/hwloc/hwloc-dump-hwdata.c hwloc-1.11.2/utils/hwloc/hwloc-dump-hwdata.c
+--- hwloc-1.11.2.orig/utils/hwloc/hwloc-dump-hwdata.c 2016-06-06 14:08:17.576429196 -0400
++++ hwloc-1.11.2/utils/hwloc/hwloc-dump-hwdata.c 2016-06-06 14:10:34.216094790 -0400
+@@ -23,7 +23,7 @@ static void usage(const char *name, FILE
+ {
+ fprintf (where, "Usage: %s [ options ] ...\n", name);
+ fprintf (where, "Options:\n");
+- fprintf (where, " -o Output files to directory instead of /var/run/hwloc/\n");
++ fprintf (where, " -o Output files to directory instead of " DEFAULT_DUMP_DIR "\n");
+ }
+
+ int main(int argc, char *argv[])
+diff -Nrup hwloc-1.11.2.orig/utils/hwloc/hwloc-gather-topology.in hwloc-1.11.2/utils/hwloc/hwloc-gather-topology.in
+--- hwloc-1.11.2.orig/utils/hwloc/hwloc-gather-topology.in 2015-12-10 07:09:45.000000000 -0500
++++ hwloc-1.11.2/utils/hwloc/hwloc-gather-topology.in 2016-06-06 14:10:34.216094790 -0400
+@@ -3,7 +3,7 @@
+
+ #
+ # Copyright © 2009 CNRS
+-# Copyright © 2009-2015 Inria. All rights reserved.
++# Copyright © 2009-2016 Inria. All rights reserved.
+ # Copyright © 2009-2012 Université Bordeaux
+ # See COPYING in top-level directory.
+ #
+@@ -12,6 +12,8 @@ HWLOC_top_builddir="@HWLOC_top_builddir@
+ prefix="@prefix@"
+ exec_prefix="@exec_prefix@"
+ bindir="@bindir@"
++localstatedir="@localstatedir@"
++runstatedir="@HWLOC_runstatedir@"
+ # this will be changed into $bindir/lstopo during make install
+ lstopo="$HWLOC_top_builddir/utils/lstopo/lstopo-no-graphics"
+
+@@ -138,7 +140,7 @@ cat << EOF | while read -r path ; do sav
+ EOF
+
+ if test "x$HWLOC_DUMPED_HWDATA_DIR" = x; then
+- savedir "$destdir/$basename" /var/run/hwloc/
++ savedir "$destdir/$basename" "$runstatedir"/hwloc/
+ else
+ savedir "$destdir/$basename" "$HWLOC_DUMPED_HWDATA_DIR"
+ fi
+diff -Nrup hwloc-1.11.2.orig/utils/hwloc/Makefile.am hwloc-1.11.2/utils/hwloc/Makefile.am
+--- hwloc-1.11.2.orig/utils/hwloc/Makefile.am 2016-06-06 14:08:17.575429209 -0400
++++ hwloc-1.11.2/utils/hwloc/Makefile.am 2016-06-06 14:10:34.215094778 -0400
+@@ -45,7 +45,7 @@ endif HWLOC_HAVE_LINUX
+ hwloc_dump_hwdata_SOURCES = \
+ hwloc-dump-hwdata.c \
+ hwloc-dump-hwdata-knl.c
+-hwloc_dump_hwdata_CPPFLAGS = $(AM_CPPFLAGS) -DRUNSTATEDIR=\"@runstatedir@\"
++hwloc_dump_hwdata_CPPFLAGS = $(AM_CPPFLAGS) -DRUNSTATEDIR=\"$(HWLOC_runstatedir)\"
+
+ hwloc_calc_SOURCES = \
+ hwloc-calc.h \
+@@ -123,6 +123,7 @@ endif HWLOC_HAVE_LINUX
+ @ $(SED) -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
+ -e 's/#PACKAGE_VERSION#/@PACKAGE_VERSION@/g' \
+ -e 's/#HWLOC_DATE#/@HWLOC_RELEASE_DATE@/g' \
++ -e 's@#RUNSTATEDIR#@'$(HWLOC_runstatedir)'@g' \
+ > $@ < $<
+
+ .3in.3:
diff --git a/SOURCES/hwloc-1.11.2-dump-remove-hardwire.patch b/SOURCES/hwloc-1.11.2-dump-remove-hardwire.patch
new file mode 100644
index 0000000..042ba3b
--- /dev/null
+++ b/SOURCES/hwloc-1.11.2-dump-remove-hardwire.patch
@@ -0,0 +1,45 @@
+commit 8058411358c8ae9c4066f672c24e6012348415ec
+Author: Brice Goglin
+Date: Fri Mar 18 20:23:41 2016 +0100
+
+ hwloc_dump_hwdata: don't hardwire /var/run, use @runstatedir@
+
+diff --git a/utils/hwloc/Makefile.am b/utils/hwloc/Makefile.am
+index 868ea3a..0486a7a 100644
+--- a/utils/hwloc/Makefile.am
++++ b/utils/hwloc/Makefile.am
+@@ -1,4 +1,4 @@
+-# Copyright © 2009-2015 Inria. All rights reserved.
++# Copyright © 2009-2016 Inria. All rights reserved.
+ # Copyright © 2009-2012, 2014 Université Bordeaux
+ # Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved.
+ #
+@@ -47,6 +47,7 @@ endif HWLOC_HAVE_LINUX
+ hwloc_dump_hwdata_SOURCES = \
+ hwloc-dump-hwdata.c \
+ hwloc-dump-hwdata-knl.c
++hwloc_dump_hwdata_CPPFLAGS = $(AM_CPPFLAGS) -DRUNSTATEDIR=\"@runstatedir@\"
+
+ hwloc_calc_SOURCES = \
+ hwloc-calc.h \
+diff --git a/utils/hwloc/hwloc-dump-hwdata.c b/utils/hwloc/hwloc-dump-hwdata.c
+index b372c1f..844dfef 100644
+--- a/utils/hwloc/hwloc-dump-hwdata.c
++++ b/utils/hwloc/hwloc-dump-hwdata.c
+@@ -1,6 +1,6 @@
+ /*
+ * Copyright © 2015 Intel, Inc. All rights reserved.
+- * Copyright © 2015 Inria. All rights reserved.
++ * Copyright © 2015-2016 Inria. All rights reserved.
+ * See COPYING in top-level directory.
+ */
+
+@@ -15,7 +15,7 @@
+ #include
+ #include
+
+-#define DEFAULT_DUMP_DIR "/var/run/hwloc"
++#define DEFAULT_DUMP_DIR RUNSTATEDIR "/hwloc"
+
+ extern int hwloc_dump_hwdata_knl_smbios(const char *input_fsroot, const char *filename);
+
diff --git a/SOURCES/hwloc-1.11.2-dump-remove-stop.patch b/SOURCES/hwloc-1.11.2-dump-remove-stop.patch
new file mode 100644
index 0000000..6b94b6a
--- /dev/null
+++ b/SOURCES/hwloc-1.11.2-dump-remove-stop.patch
@@ -0,0 +1,34 @@
+diff -Nrup hwloc-1.11.2.orig/config/hwloc_internal.m4 hwloc-1.11.2/config/hwloc_internal.m4
+--- hwloc-1.11.2.orig/config/hwloc_internal.m4 2016-06-06 14:11:17.698625007 -0400
++++ hwloc-1.11.2/config/hwloc_internal.m4 2016-06-06 14:29:58.381286828 -0400
+@@ -315,8 +315,6 @@ EOF
+ LIBS="$hwloc_old_LIBS"
+ unset hwloc_old_LIBS
+
+- AC_PATH_TOOL(RMPATH, rm)
+-
+ _HWLOC_CHECK_DIFF_U
+ _HWLOC_CHECK_DIFF_W
+
+diff -Nrup hwloc-1.11.2.orig/contrib/systemd/hwloc-dump-hwdata.service.in hwloc-1.11.2/contrib/systemd/hwloc-dump-hwdata.service.in
+--- hwloc-1.11.2.orig/contrib/systemd/hwloc-dump-hwdata.service.in 2016-06-06 13:45:07.593491515 -0400
++++ hwloc-1.11.2/contrib/systemd/hwloc-dump-hwdata.service.in 2016-06-06 14:29:58.382286835 -0400
+@@ -16,7 +16,6 @@ Description=Dump hardware topology and l
+ Type=oneshot
+ RemainAfterExit=yes
+ ExecStart=#SBINDIR#/hwloc-dump-hwdata -o #RUNSTATEDIR#/hwloc
+-ExecStop=#RMPATH# -rf #RUNSTATEDIR#/hwloc
+
+ [Install]
+ WantedBy=multi-user.target
+diff -Nrup hwloc-1.11.2.orig/contrib/systemd/Makefile.am hwloc-1.11.2/contrib/systemd/Makefile.am
+--- hwloc-1.11.2.orig/contrib/systemd/Makefile.am 2016-06-06 13:45:07.592491525 -0400
++++ hwloc-1.11.2/contrib/systemd/Makefile.am 2016-06-06 14:29:58.382286835 -0400
+@@ -14,7 +14,6 @@ hwloc-dump-hwdata.service: hwloc-dump-hw
+ @ $(SED) \
+ -e 's@#SBINDIR#@'$(sbindir)'@g' \
+ -e 's@#RUNSTATEDIR#@'$(HWLOC_runstatedir)'@g' \
+- -e 's@#RMPATH#@'$(RMPATH)'@g' \
+ > $@ < $<
+
+ distclean-local:
diff --git a/SOURCES/hwloc-1.11.2-dump-service.patch b/SOURCES/hwloc-1.11.2-dump-service.patch
new file mode 100644
index 0000000..7e932fa
--- /dev/null
+++ b/SOURCES/hwloc-1.11.2-dump-service.patch
@@ -0,0 +1,105 @@
+diff -Nrup hwloc-1.11.2.orig/config/hwloc_internal.m4 hwloc-1.11.2/config/hwloc_internal.m4
+--- hwloc-1.11.2.orig/config/hwloc_internal.m4 2015-06-02 05:12:40.000000000 -0400
++++ hwloc-1.11.2/config/hwloc_internal.m4 2016-06-06 13:45:07.591491542 -0400
+@@ -307,6 +307,8 @@ EOF
+ LIBS="$hwloc_old_LIBS"
+ unset hwloc_old_LIBS
+
++ AC_PATH_TOOL(RMPATH, rm)
++
+ _HWLOC_CHECK_DIFF_U
+ _HWLOC_CHECK_DIFF_W
+
+@@ -394,7 +396,8 @@ int foo(void) {
+ hwloc_config_prefix[utils/hwloc/test-hwloc-distrib.sh]
+ hwloc_config_prefix[utils/hwloc/test-hwloc-info.sh]
+ hwloc_config_prefix[utils/hwloc/test-fake-plugin.sh]
+- hwloc_config_prefix[utils/lstopo/test-hwloc-ls.sh])
++ hwloc_config_prefix[utils/lstopo/test-hwloc-ls.sh]
++ hwloc_config_prefix[contrib/systemd/Makefile])
+
+ AC_CONFIG_COMMANDS([chmoding-scripts], [chmod +x ]hwloc_config_prefix[tests/linux/test-topology.sh ]hwloc_config_prefix[tests/xml/test-topology.sh ]hwloc_config_prefix[tests/linux/gather/test-gather-topology.sh ]hwloc_config_prefix[tests/wrapper.sh ]hwloc_config_prefix[utils/hwloc/hwloc-assembler-remote ]hwloc_config_prefix[utils/hwloc/hwloc-compress-dir ]hwloc_config_prefix[utils/hwloc/hwloc-gather-topology ]hwloc_config_prefix[utils/hwloc/test-hwloc-annotate.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-assembler.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-calc.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-compress-dir.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-diffpatch.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-distances.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-distrib.sh ]hwloc_config_prefix[utils/hwloc/test-hwloc-info.sh ]hwloc_config_prefix[utils/hwloc/test-fake-plugin.sh ]hwloc_config_prefix[utils/lstopo/test-hwloc-ls.sh])
+
+diff -Nrup hwloc-1.11.2.orig/contrib/systemd/hwloc-dump-hwdata.service.in hwloc-1.11.2/contrib/systemd/hwloc-dump-hwdata.service.in
+--- hwloc-1.11.2.orig/contrib/systemd/hwloc-dump-hwdata.service.in 1969-12-31 19:00:00.000000000 -0500
++++ hwloc-1.11.2/contrib/systemd/hwloc-dump-hwdata.service.in 2016-06-06 13:45:07.593491515 -0400
+@@ -0,0 +1,22 @@
++#
++# Copyright © 2015-2016 Intel, Inc. All rights reserved.
++# Copyright © 2016 Inria. All rights reserved.
++# See COPYING in top-level directory.
++#
++# #RUNSTATEDIR#/hwloc was specified at configure time.
++# It may be changed by passing configure options such as --runstatedir,
++# --localstatedir or --prefix.
++# It may also be manually changed before installing this file in systemd directories.
++#
++
++[Unit]
++Description=Dump hardware topology and locality information to #RUNSTATEDIR#/hwloc
++
++[Service]
++Type=oneshot
++RemainAfterExit=yes
++ExecStart=#SBINDIR#/hwloc-dump-hwdata -o #RUNSTATEDIR#/hwloc
++ExecStop=#RMPATH# -rf #RUNSTATEDIR#/hwloc
++
++[Install]
++WantedBy=multi-user.target
+diff -Nrup hwloc-1.11.2.orig/contrib/systemd/Makefile.am hwloc-1.11.2/contrib/systemd/Makefile.am
+--- hwloc-1.11.2.orig/contrib/systemd/Makefile.am 1969-12-31 19:00:00.000000000 -0500
++++ hwloc-1.11.2/contrib/systemd/Makefile.am 2016-06-06 13:45:07.592491525 -0400
+@@ -0,0 +1,22 @@
++# Copyright © 2016 Inria. All rights reserved.
++# See COPYING in top-level directory.
++
++# We can't use autoconf because we don't want $sbindir to be replaced with ${exec_prefix}/sbin
++# Also don't install since , let the packagers do it.
++
++EXTRA_DIST = hwloc-dump-hwdata.service.in
++
++if HWLOC_HAVE_LINUX
++nodist_pkgdata_DATA = hwloc-dump-hwdata.service
++# depend on Makefile in case we rerun configure with different directory arguments
++hwloc-dump-hwdata.service: hwloc-dump-hwdata.service.in Makefile
++ @echo Creating $@...
++ @ $(SED) \
++ -e 's@#SBINDIR#@'$(sbindir)'@g' \
++ -e 's@#RUNSTATEDIR#@'$(HWLOC_runstatedir)'@g' \
++ -e 's@#RMPATH#@'$(RMPATH)'@g' \
++ > $@ < $<
++
++distclean-local:
++ rm -f hwloc-dump-hwdata.service
++endif
+diff -Nrup hwloc-1.11.2.orig/Makefile.am hwloc-1.11.2/Makefile.am
+--- hwloc-1.11.2.orig/Makefile.am 2015-06-02 05:12:40.000000000 -0400
++++ hwloc-1.11.2/Makefile.am 2016-06-06 13:45:07.588491592 -0400
+@@ -1,4 +1,4 @@
+-# Copyright © 2009-2015 Inria. All rights reserved.
++# Copyright © 2009-2016 Inria. All rights reserved.
+ # Copyright © 2009 Université Bordeaux
+ # Copyright © 2009-2014 Cisco Systems, Inc. All rights reserved.
+ # See COPYING in top-level directory.
+@@ -9,7 +9,7 @@ ACLOCAL_AMFLAGS = -I ./config
+
+ SUBDIRS = src include
+ if HWLOC_BUILD_STANDALONE
+-SUBDIRS += tests utils
++SUBDIRS += tests utils contrib/systemd
+ # We need doc/ if HWLOC_BUILD_DOXYGEN, or during make install if HWLOC_INSTALL_DOXYGEN.
+ # There's no INSTALL_SUBDIRS, so always enter doc/ and check HWLOC_BUILD/INSTALL_DOXYGEN there
+ SUBDIRS += doc
+diff -Nrup hwloc-1.11.2.orig/NEWS hwloc-1.11.2/NEWS
+--- hwloc-1.11.2.orig/NEWS 2015-12-17 05:05:59.000000000 -0500
++++ hwloc-1.11.2/NEWS 2016-06-06 13:45:54.947068832 -0400
+@@ -57,6 +57,9 @@ Version 1.11.2
+ * Debug messages may be disabled at runtime by passing HWLOC_DEBUG_VERBOSE=0
+ in the environment when --enable-debug was passed to configure.
+ * Add a FAQ entry "What are these Group objects in my topology?".
++* Add systemd service template contrib/systemd/hwloc-dump-hwdata.service
++ for launching hwloc-dump-hwdata at boot on Linux.
++ Thanks to Grzegorz Andrejczuk.
+
+
+ Version 1.11.1
diff --git a/SOURCES/hwloc-1.11.2-hwloc-dump-x86-only.patch b/SOURCES/hwloc-1.11.2-hwloc-dump-x86-only.patch
new file mode 100644
index 0000000..d537d71
--- /dev/null
+++ b/SOURCES/hwloc-1.11.2-hwloc-dump-x86-only.patch
@@ -0,0 +1,14 @@
+diff -Nrup hwloc-1.11.2.orig/contrib/systemd/Makefile.am hwloc-1.11.2/contrib/systemd/Makefile.am
+--- hwloc-1.11.2.orig/contrib/systemd/Makefile.am 2016-06-06 14:40:16.698823658 -0400
++++ hwloc-1.11.2/contrib/systemd/Makefile.am 2016-06-06 17:19:50.456582250 -0400
+@@ -7,7 +7,10 @@
+ EXTRA_DIST = hwloc-dump-hwdata.service.in
+
+ if HWLOC_HAVE_LINUX
++if HWLOC_HAVE_X86
+ nodist_pkgdata_DATA = hwloc-dump-hwdata.service
++endif HWLOC_HAVE_X86
++
+ # depend on Makefile in case we rerun configure with different directory arguments
+ hwloc-dump-hwdata.service: hwloc-dump-hwdata.service.in Makefile
+ @echo Creating $@...
diff --git a/SOURCES/hwloc-1.11.2-x2apic.patch b/SOURCES/hwloc-1.11.2-x2apic.patch
new file mode 100644
index 0000000..35d791e
--- /dev/null
+++ b/SOURCES/hwloc-1.11.2-x2apic.patch
@@ -0,0 +1,25 @@
+commit aeee8a0c1f603beb8a69f94ed36b69c887ab3b2f
+Author: Brice Goglin
+Date: Wed Feb 3 07:10:48 2016 +0100
+
+ x86: fix infinite loop on VMWare when x2apic feature is reported without CPUID 0xb leaf support
+
+ Don't use x2APIC unless supported and CPUID 0xb is supported too.
+
+ This is likely a VMware bug since CPUID 0xb support seems
+ to be required when x2APIC feature is reported.
+
+ Thanks to Jianjun Wen for reporting the problem and testing the patch.
+
+diff -rup hwloc-1.7.orig/src/topology-x86.c hwloc-1.7/src/topology-x86.c
+--- hwloc-1.7.orig/src/topology-x86.c 2016-05-18 16:12:38.859470713 -0400
++++ hwloc-1.7/src/topology-x86.c 2016-05-18 16:50:57.382272906 -0400
+@@ -302,7 +302,7 @@ static void look_proc(struct procinfo *i
+ /* Get package/core/thread information from cpuid 0x0b
+ * (Intel x2APIC)
+ */
+- if (cpuid_type == intel && has_x2apic(features)) {
++ if (cpuid_type == intel && highest_cpuid >= 0x0b && has_x2apic(features)) {
+ unsigned level, apic_nextshift, apic_number, apic_type, apic_id = 0, apic_shift = 0, id;
+ for (level = 0; ; level++) {
+ ecx = level;
diff --git a/SOURCES/hwloc-1.7-desktop-entry.patch b/SOURCES/hwloc-1.7-desktop-entry.patch
deleted file mode 100644
index 245f747..0000000
--- a/SOURCES/hwloc-1.7-desktop-entry.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Combination of the following two patches.
-
-commit d247110e60d3ba009c038a74e1f2b70bb1ba6a01
-Author: Samuel Thibault
-Date: Wed Aug 20 00:24:19 2014 +0200
-
- Add hwloc-ls.desktop file for start menu integration in gnome/KDE
-
-
-commit 04c67994f0410a5c6eda61fdb3e89e75e00848ba
-Author: Brice Goglin
-Date: Wed Oct 8 11:27:12 2014 +0200
-
- Change hwloc-ls.desktop in lstopo.desktop and only install if graphical
-
- hwloc-ls doesn't always point to a graphical lstopo, while hwloc-ls.desktop
- wants a graphical application. Use lstopo instead (the change is invisible
- from the menu) and don't install it unless lstopo has Cairo support.
-
- By the way, fix some issues in the desktop file (Categories Application
- is deprecated, comment should be Comment).
- Thanks to Jirka Hladky for reporting these issues.
-
-diff -Nrup hwloc-1.7.orig/utils/lstopo.desktop hwloc-1.7/utils/lstopo.desktop
---- hwloc-1.7.orig/utils/lstopo.desktop 1969-12-31 19:00:00.000000000 -0500
-+++ hwloc-1.7/utils/lstopo.desktop 2015-07-14 16:08:07.451934042 -0400
-@@ -0,0 +1,10 @@
-+# should only be used when lstopo is built with Cairo/X11 support
-+# so that no terminal is required
-+[Desktop Entry]
-+Name=Hardware Locality lstopo
-+Comment=Show hardware topology
-+Exec=lstopo
-+Terminal=false
-+Type=Application
-+Categories=System;
-+Keywords=System;Utility;
-diff -Nrup hwloc-1.7.orig/utils/Makefile.am hwloc-1.7/utils/Makefile.am
---- hwloc-1.7.orig/utils/Makefile.am 2015-07-14 16:06:07.752411827 -0400
-+++ hwloc-1.7/utils/Makefile.am 2015-07-14 16:08:07.451934042 -0400
-@@ -70,6 +70,13 @@ if HWLOC_HAVE_LINUX
- nodist_man_MANS += $(hgt_page)
- endif HWLOC_HAVE_LINUX
-
-+if HWLOC_HAVE_CAIRO
-+# only installed when lstopo is built with Cairo/X11 support
-+# so that no terminal is required
-+APPLICATIONSdir = @datarootdir@/applications
-+dist_APPLICATIONS_DATA = lstopo.desktop
-+endif
-+
- .1in.1:
- @ echo Creating $@ man page...
- @ $(SED) -e 's/#PACKAGE_NAME#/@PACKAGE_NAME@/g' \
diff --git a/SOURCES/hwloc-1.7-lstopo-manpage.patch b/SOURCES/hwloc-1.7-lstopo-manpage.patch
deleted file mode 100644
index 996b87e..0000000
--- a/SOURCES/hwloc-1.7-lstopo-manpage.patch
+++ /dev/null
@@ -1,926 +0,0 @@
-commit 573ac8842b198a6cfe8c64f3946c216b8dafaa4a
-Author: Brice Goglin
-Date: Wed Oct 8 07:41:49 2014 +0200
-
- lstopo: swap lstopo.1 and lstopo-no-graphics.1 symlink
-
- Match what we do for binaries. lstopo-no-graphics always
- exist as a binary. lstopo may be just a symlink. So now
- lstopo.1 is a symlink to lstopo-no-graphics.1
-
- Thanks to Jirka Hladky for reporting the issue.
-
-diff -Nrup hwloc-1.7.orig/utils/lstopo.1in hwloc-1.7/utils/lstopo.1in
---- hwloc-1.7.orig/utils/lstopo.1in 2013-03-26 16:00:18.000000000 -0400
-+++ hwloc-1.7/utils/lstopo.1in 1969-12-31 19:00:00.000000000 -0500
-@@ -1,433 +0,0 @@
--.\" -*- nroff -*-
--.\" Copyright © 2009-2013 Inria. All rights reserved.
--.\" Copyright © 2009-2010 Université of Bordeaux
--.\" Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved.
--.\" See COPYING in top-level directory.
--.TH LSTOPO "1" "#HWLOC_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
--.SH NAME
--lstopo, lstopo-no-graphics \- Show the topology of the system
--.
--.\" **************************
--.\" Synopsis Section
--.\" **************************
--.SH SYNOPSIS
--.
--.B lstopo
--[ \fIoptions \fR]... [ \fIfilename \fR]
--.
--.PP
--.B lstopo-no-graphics
--[ \fIoptions \fR]... [ \fIfilename \fR]
--.
--.PP
--Note that hwloc(7) provides a detailed explanation of the hwloc system; it
--should be read before reading this man page
--.
--.\" **************************
--.\" Options Section
--.\" **************************
--.SH OPTIONS
--.
--.TP
--\fB\-\-of\fR , \fB\-\-output\-format\fR
--Enforce the output in the given format.
--See the OUTPUT FORMATS section below.
--.TP
--\fB\-i\fR , \fB\-\-input\fR
--Read topology from XML file (instead of discovering the
--topology on the local machine). If is "\-", the standard input
--is used. XML support must have been compiled in to hwloc for this
--option to be usable.
--.TP
--\fB\-i\fR , \fB\-\-input\fR
--Read topology from the chroot specified by (instead of
--discovering the topology on the local machine). This option is
--generally only available on Linux. The chroot was usually created
--by gathering another machine topology with hwloc-gather-topology.
--.TP
--\fB\-i\fR , \fB\-\-input\fR
--Simulate a fake hierarchy (instead of discovering the topology on the
--local machine). If is "node:2 pu:3", the topology will
--contain two NUMA nodes with 3 processing units in each of them.
--The string must end with a number of PUs.
--.TP
--\fB\-\-if\fR , \fB\-\-input\-format\fR
--Enforce the input in the given format, among \fBxml\fR, \fBfsroot\fR
--and \fBsynthetic\fR.
--.TP
--\fB\-v\fR \fB\-\-verbose\fR
--Include additional detail.
--The hwloc-info tool may be used to display even more information
--about specific objects.
--.TP
--\fB\-s\fR \fB\-\-silent\fR
--Reduce the amount of details to show.
--.TP
--\fB\-l\fR \fB\-\-logical\fR
--Display hwloc logical indexes instead of physical/OS indexes (default for console output).
--These indexes are prefixed with "L#".
--The physical indexes of some objects (PU and Node by default, all
--objects if verbose) will appear as object attribute "P#...".
--.TP
--\fB\-p\fR \fB\-\-physical\fR
--Display OS/physical indexes instead of hwloc logical indexes (default for graphical output).
--These indexes are prefixed with "P#" instead of "L#" in the console output.
--.TP
--\fB\-c\fR \fB\-\-cpuset\fR
--Display the cpuset of each object.
--.TP
--\fB\-C\fR \fB\-\-cpuset\-only\fR
--Only display the cpuset of each object; do not display anything else
--about the object.
--.TP
--\fB\-\-taskset\fR
--Show CPU set strings in the format recognized by the taskset command-line
--program instead of hwloc-specific CPU set string format.
--This option should be combined with \fB\-\-cpuset\fR or \fB\-\-cpuset\-only\fR,
--otherwise it will imply \fB\-\-cpuset\fR.
--.TP
--\fB\-\-only\fR
--Only show objects of the given type in the textual output.
--.TP
--\fB\-\-ignore\fR
--Ignore all objects of type in the topology.
--hwloc supports ignoring any type except PUs and I/O devices.
--However lstopo still offers PU ignoring by hiding PU objects
--in the graphical and textual outputs.
--Note that PU may not be ignored in the XML output.
--.TP
--\fB\-\-no\-caches\fR
--Do not show caches.
--.TP
--\fB\-\-no\-useless\-caches\fR
--Do not show caches which do not have a hierarchical impact.
--.TP
--\fB\-\-no\-icaches\fR
--Do not show Instruction caches, only Data and Unified caches are displayed.
--.TP
--\fB\-\-whole\-system\fR
--Do not consider administration limitations.
--.TP
--\fB\-\-merge\fR
--Do not show levels that do not have a hierarchical impact.
--.TP
--\fB\-\-restrict\fR
--Restrict the topology to the given cpuset.
--.TP
--\fB\-\-restrict\fR binding
--Restrict the topology to the current process binding.
--This option requires the use of the actual current machine topology
--(or any other topology with \fB\-\-thissystem\fR or with
--HWLOC_THISSYSTEM set to 1 in the environment).
--.TP
--\fB\-\-no\-io\fB
--Do not show any I/O device or bridge.
--By default, common devices (GPUs, NICs, block devices, ...) and
--interesting bridges are shown.
--.TP
--\fB\-\-no\-bridges\fB
--Do not show any I/O bridge except hostbridges.
--By default, common devices (GPUs, NICs, block devices, ...) and
--interesting bridges are shown.
--.TP
--\fB\-\-whole\-io\fB
--Show all I/O devices and bridges.
--By default, only common devices (GPUs, NICs, block devices, ...) and
--interesting bridges are shown.
--.TP
--\fB\-\-thissystem\fR
--Assume that the selected backend provides the topology for the
--system on which we are running.
--This is useful when using \fB\-\-restrict\fR binding and loading
--a custom topology such as an XML file.
--.TP
--\fB\-\-pid\fR
--Detect topology as seen by process , i.e. as if process did the
--discovery itself.
--Note that this can for instance change the set of allowed processors.
--Also show this process current CPU binding by marking the corresponding
--PUs (in Green in the graphical output, see the COLORS section below,
--or by appending \fI(binding)\fR to the verbose text output).
--If 0 is given as pid, the current binding for the lstopo process will be shown.
--.TP
--\fB\-\-ps\fR \fB\-\-top\fR
--Show existing processes as misc objects in the output. To avoid uselessly
--cluttering the output, only processes that are restricted to some part of the
--machine are shown. On Linux, kernel threads are not shown.
--If many processes appear, the output may become hard to read anyway,
--making the hwloc-ps program more practical.
--.TP
--\fB\-\-fontsize\fR
--Set size of text font.
--.TP
--\fB\-\-gridsize\fR
--Set size of margin between elements.
--.TP
--\fB\-\-horiz\fR, \fB\-\-horiz\fR=
--Horizontal graphical layout instead of nearly 4/3 ratio.
--If a comma-separated list of types is given, the layout only
--applies to the corresponding containers.
--.TP
--\fB\-\-vert\fR, \fB\-\-vert\fR=
--Vertical graphical layout instead of nearly 4/3 ratio.
--If a comma-separated list of types is given, the layout only
--applies to the corresponding containers.
--.TP
--\fB\-\-no\-legend\fR
--Remove the text legend at the bottom.
--.TP
--\fB\-\-version\fR
--Report version and exit.
--.
--.\" **************************
--.\" Description Section
--.\" **************************
--.SH DESCRIPTION
--.
--lstopo and lstopo-no-graphics are capable of displaying a topological map of
--the system in a variety of different output formats. The only difference
--between lstopo and lstopo-no-graphics is that graphical outputs are only
--supported by lstopo, to reduce dependencies on external libraries.
--.
--.PP
--If no filename is specified and the DISPLAY environment variable is set,
--lstopo displays the map in a graphical window. If no filename is
--specified and the DISPLAY environment variable is
--.I not
--set, a text summary is displayed.
--.
--.PP
--The filename specified directly implies the output format that will be
--used; see the OUTPUT FORMATS section, below. Output formats that
--support color will indicate specific characteristics about individual
--CPUs by their color; see the COLORS section, below.
--.
--.\" **************************
--.\" Output Formats Section
--.\" **************************
--.SH OUTPUT FORMATS
--.
--.PP
--The filename on the command line usually determines the format of the output.
--There are a few filenames that indicate specific output formats and
--devices (e.g., a filename of "-" will output a text summary to
--stdout), but most filenames indicate the desired output format by
--their suffix (e.g., "topo.png" will output a PNG-format file).
--.PP
--The format of the output may also be changed with "\-\-of".
--For instance, "\-\-of pdf" will generate a PDF-format file on the standard
--output, while "\-\-of fig toto" will output a Xfig-format file named "toto".
--
--.PP
--The list of currently supported formats is given below. Any of them may
--be used with "\-\-of" or as a filename suffix.
--.TP
--.B default
--Send the output to a window or to the console depending on the environment.
--.
--.TP
--.B console
--Send a text summary to stdout.
--Binding, unallowed or offline processors are only annotated in this mode
--if verbose; see the COLORS section, below.
--.
--.TP
--.B txt
--Output an ASCII art representation of the map.
--If outputting to stdout and if colors are supported on the terminal,
--the output will be colorized.
--.
--.TP
--.B fig
--Output a representation of the map that can be loaded in Xfig.
--.
--.TP
--.B pdf
--If lstopo was compiled with the proper
--support, lstopo outputs a PDF representation of the map.
--.
--.TP
--.B ps
--If lstopo was compiled with the proper
--support, lstopo outputs a Postscript representation of the map.
--.
--.TP
--.B png
--If lstopo was compiled with the proper
--support, lstopo outputs a PNG representation of the map.
--.
--.TP
--.B svg
--If lstopo was compiled with the proper
--support, lstopo outputs an SVG representation of the map.
--.
--.TP
--.B synthetic
--If the topology is symmetric
--(which requires that the root object has its symmetric_subtree field set),
--lstopo outputs a synthetic description string.
--This output may be reused as an input synthetic topology
--description later.
--Note that I/O devices often cause topology asymmetry.
--Adding \-\-no\-io may then be useful when the synthetic export fails.
--See also the Synthetic topologies section in the documentation.
--.
--.TP
--.B xml
--If lstopo was compiled with the proper
--support, lstopo outputs an XML representation of the map.
--It may be reused later, even on another machine, with lstopo \-\-input,
--the HWLOC_XMLFILE environment variable, or the hwloc_topology_set_xml()
--function.
--
--.PP
--The following special names may be used:
--.TP
--.B \-
--Send a text summary to stdout.
--.
--.TP
--.B /dev/stdout
--Send a text summary to stdout. It is effectively the same as
--specifying "\-".
--.
--.TP
--.B \-.
--If the entire filename is "\-.", lstopo behaves as if
--"\-\-of -" was given, which means a file of the given format
--is sent to the standard output.
--
--.PP
--See the output of "lstopo \-\-help" for a specific list of what
--graphical output formats are supported in your hwloc installation.
--.
--.\" **************************
--.\" Colors Section
--.\" **************************
--.SH COLORS
--Individual CPUs are colored in the semi-graphical and graphical output
--formats to indicate different characteristics:
--.TP
--Green
--The topology is reported as seen by a specific process (see \fB\-\-pid\fR),
--and the given CPU is in this process CPU binding mask.
--.TP
--White
--The CPU is in the allowed set (see below).
--If the topology is reported as seen by a specific process (see \fB\-\-pid\fR),
--the given CPU is also not in this process CPU binding mask.
--.TP
--Red
--The CPU is not in the allowed set (see below).
--.TP
--Black
--The CPU is offline (not all OS's support displaying offline CPUs).
--.
--.PP
--The "allowed set" is the set of CPUs to which the current process is
--allowed to bind. The allowed set is usually either inherited from the
--parent process or set by administrative qpolicies on the system. Linux
--cpusets are one example of limiting the allowed set for a process and
--its children to be less than the full set of CPUs on the system.
--.PP
--Different processes may therefore have different CPUs in the allowed
--set. Hence, invoking lstopo in different contexts and/or as different
--users may display different colors for the same individual CPUs (e.g.,
--running lstopo in one context may show a specific CPU as red, but
--running lstopo in a different context may show the same CPU as white).
--.PP
--Some lstopo output modes, e.g. the console mode (default non-graphical output),
--do not support colors at all.
--The console mode displays the above characteristics by appending text
--to each PU line if verbose messages are enabled.
--.
--.\" **************************
--.\" Layout Section
--.\" **************************
--.SH LAYOUT
--In its graphical output, lstopo uses simple rectangular heuristics
--to try to achieve a 4/3 ratio between width and height. However,
--in the particular case of NUMA nodes, the layout is always a flat
--rectangle, to avoid letting the user believe any particular NUMA
--topology (lstopo is not able to render that yet).
--.
--.\" **************************
--.\" Examples Section
--.\" **************************
--.SH EXAMPLES
--.
--To display the machine topology in textual mode:
--
-- lstopo-no-graphics
--
--To display the machine topology in pseudo-graphical mode:
--
-- lstopo-no-graphics -.txt
--
--To display in graphical mode (assuming that the DISPLAY environment
--variable is set to a relevant value):
--
-- lstopo
--
--To export the topology to a PNG file:
--
-- lstopo file.png
--
--To export an XML file on a machine and later display the corresponding
--graphical output on another machine:
--
-- machine1$ lstopo file.xml
--
-- machine2$ lstopo --input file.xml
--
--To save the current machine topology to XML and later reload it faster
--while still considering it as the current machine:
--
-- $ lstopo file.xml
-- <...>
-- $ lstopo --input file.xml --thissystem
--
--To restrict an XML topology to only physical processors 0, 1, 4 and 5:
--
-- lstopo --input file.xml --restrict 0x33 newfile.xml
--
--To restrict an XML topology to only numa node whose logical index is 1:
--
-- lstopo --input file.xml --restrict $(hwloc-calc --input file.xml node:1) newfile.xml
--
--To display a summary of the topology:
--
-- lstopo -s
--
--To get more details about the topology:
--
-- lstopo -v
--
--To only show cores:
--
-- lstopo --only core
--
--To show cpusets:
--
-- lstopo --cpuset
--
--To only show the cpusets of sockets:
--
-- lstopo --only socket --cpuset-only
--
--Simulate a fake hierarchy; this example shows with 2 NUMA nodes of 2
--processor units:
--
-- lstopo --input "n:2 2"
--
--To count the number of logical processors in the system
--
-- lstopo --only pu | wc -l
--.\" **************************
--.\" See also section
--.\" **************************
--.SH SEE ALSO
--.
--.ft R
--hwloc(7), hwloc-info(1), hwloc-bind(1), hwloc-ps(1), hwloc-gather-topology(1)
--.sp
-diff -Nrup hwloc-1.7.orig/utils/lstopo-no-graphics.1in hwloc-1.7/utils/lstopo-no-graphics.1in
---- hwloc-1.7.orig/utils/lstopo-no-graphics.1in 1969-12-31 19:00:00.000000000 -0500
-+++ hwloc-1.7/utils/lstopo-no-graphics.1in 2013-03-26 16:00:18.000000000 -0400
-@@ -0,0 +1,433 @@
-+.\" -*- nroff -*-
-+.\" Copyright © 2009-2013 Inria. All rights reserved.
-+.\" Copyright © 2009-2010 Université of Bordeaux
-+.\" Copyright © 2009-2010 Cisco Systems, Inc. All rights reserved.
-+.\" See COPYING in top-level directory.
-+.TH LSTOPO "1" "#HWLOC_DATE#" "#PACKAGE_VERSION#" "#PACKAGE_NAME#"
-+.SH NAME
-+lstopo, lstopo-no-graphics \- Show the topology of the system
-+.
-+.\" **************************
-+.\" Synopsis Section
-+.\" **************************
-+.SH SYNOPSIS
-+.
-+.B lstopo
-+[ \fIoptions \fR]... [ \fIfilename \fR]
-+.
-+.PP
-+.B lstopo-no-graphics
-+[ \fIoptions \fR]... [ \fIfilename \fR]
-+.
-+.PP
-+Note that hwloc(7) provides a detailed explanation of the hwloc system; it
-+should be read before reading this man page
-+.
-+.\" **************************
-+.\" Options Section
-+.\" **************************
-+.SH OPTIONS
-+.
-+.TP
-+\fB\-\-of\fR , \fB\-\-output\-format\fR
-+Enforce the output in the given format.
-+See the OUTPUT FORMATS section below.
-+.TP
-+\fB\-i\fR , \fB\-\-input\fR
-+Read topology from XML file (instead of discovering the
-+topology on the local machine). If is "\-", the standard input
-+is used. XML support must have been compiled in to hwloc for this
-+option to be usable.
-+.TP
-+\fB\-i\fR , \fB\-\-input\fR
-+Read topology from the chroot specified by (instead of
-+discovering the topology on the local machine). This option is
-+generally only available on Linux. The chroot was usually created
-+by gathering another machine topology with hwloc-gather-topology.
-+.TP
-+\fB\-i\fR , \fB\-\-input\fR
-+Simulate a fake hierarchy (instead of discovering the topology on the
-+local machine). If is "node:2 pu:3", the topology will
-+contain two NUMA nodes with 3 processing units in each of them.
-+The string must end with a number of PUs.
-+.TP
-+\fB\-\-if\fR , \fB\-\-input\-format\fR
-+Enforce the input in the given format, among \fBxml\fR, \fBfsroot\fR
-+and \fBsynthetic\fR.
-+.TP
-+\fB\-v\fR \fB\-\-verbose\fR
-+Include additional detail.
-+The hwloc-info tool may be used to display even more information
-+about specific objects.
-+.TP
-+\fB\-s\fR \fB\-\-silent\fR
-+Reduce the amount of details to show.
-+.TP
-+\fB\-l\fR \fB\-\-logical\fR
-+Display hwloc logical indexes instead of physical/OS indexes (default for console output).
-+These indexes are prefixed with "L#".
-+The physical indexes of some objects (PU and Node by default, all
-+objects if verbose) will appear as object attribute "P#...".
-+.TP
-+\fB\-p\fR \fB\-\-physical\fR
-+Display OS/physical indexes instead of hwloc logical indexes (default for graphical output).
-+These indexes are prefixed with "P#" instead of "L#" in the console output.
-+.TP
-+\fB\-c\fR \fB\-\-cpuset\fR
-+Display the cpuset of each object.
-+.TP
-+\fB\-C\fR \fB\-\-cpuset\-only\fR
-+Only display the cpuset of each object; do not display anything else
-+about the object.
-+.TP
-+\fB\-\-taskset\fR
-+Show CPU set strings in the format recognized by the taskset command-line
-+program instead of hwloc-specific CPU set string format.
-+This option should be combined with \fB\-\-cpuset\fR or \fB\-\-cpuset\-only\fR,
-+otherwise it will imply \fB\-\-cpuset\fR.
-+.TP
-+\fB\-\-only\fR
-+Only show objects of the given type in the textual output.
-+.TP
-+\fB\-\-ignore\fR
-+Ignore all objects of type in the topology.
-+hwloc supports ignoring any type except PUs and I/O devices.
-+However lstopo still offers PU ignoring by hiding PU objects
-+in the graphical and textual outputs.
-+Note that PU may not be ignored in the XML output.
-+.TP
-+\fB\-\-no\-caches\fR
-+Do not show caches.
-+.TP
-+\fB\-\-no\-useless\-caches\fR
-+Do not show caches which do not have a hierarchical impact.
-+.TP
-+\fB\-\-no\-icaches\fR
-+Do not show Instruction caches, only Data and Unified caches are displayed.
-+.TP
-+\fB\-\-whole\-system\fR
-+Do not consider administration limitations.
-+.TP
-+\fB\-\-merge\fR
-+Do not show levels that do not have a hierarchical impact.
-+.TP
-+\fB\-\-restrict\fR
-+Restrict the topology to the given cpuset.
-+.TP
-+\fB\-\-restrict\fR binding
-+Restrict the topology to the current process binding.
-+This option requires the use of the actual current machine topology
-+(or any other topology with \fB\-\-thissystem\fR or with
-+HWLOC_THISSYSTEM set to 1 in the environment).
-+.TP
-+\fB\-\-no\-io\fB
-+Do not show any I/O device or bridge.
-+By default, common devices (GPUs, NICs, block devices, ...) and
-+interesting bridges are shown.
-+.TP
-+\fB\-\-no\-bridges\fB
-+Do not show any I/O bridge except hostbridges.
-+By default, common devices (GPUs, NICs, block devices, ...) and
-+interesting bridges are shown.
-+.TP
-+\fB\-\-whole\-io\fB
-+Show all I/O devices and bridges.
-+By default, only common devices (GPUs, NICs, block devices, ...) and
-+interesting bridges are shown.
-+.TP
-+\fB\-\-thissystem\fR
-+Assume that the selected backend provides the topology for the
-+system on which we are running.
-+This is useful when using \fB\-\-restrict\fR binding and loading
-+a custom topology such as an XML file.
-+.TP
-+\fB\-\-pid\fR
-+Detect topology as seen by process , i.e. as if process did the
-+discovery itself.
-+Note that this can for instance change the set of allowed processors.
-+Also show this process current CPU binding by marking the corresponding
-+PUs (in Green in the graphical output, see the COLORS section below,
-+or by appending \fI(binding)\fR to the verbose text output).
-+If 0 is given as pid, the current binding for the lstopo process will be shown.
-+.TP
-+\fB\-\-ps\fR \fB\-\-top\fR
-+Show existing processes as misc objects in the output. To avoid uselessly
-+cluttering the output, only processes that are restricted to some part of the
-+machine are shown. On Linux, kernel threads are not shown.
-+If many processes appear, the output may become hard to read anyway,
-+making the hwloc-ps program more practical.
-+.TP
-+\fB\-\-fontsize\fR
-+Set size of text font.
-+.TP
-+\fB\-\-gridsize\fR
-+Set size of margin between elements.
-+.TP
-+\fB\-\-horiz\fR, \fB\-\-horiz\fR=
-+Horizontal graphical layout instead of nearly 4/3 ratio.
-+If a comma-separated list of types is given, the layout only
-+applies to the corresponding containers.
-+.TP
-+\fB\-\-vert\fR, \fB\-\-vert\fR=
-+Vertical graphical layout instead of nearly 4/3 ratio.
-+If a comma-separated list of types is given, the layout only
-+applies to the corresponding containers.
-+.TP
-+\fB\-\-no\-legend\fR
-+Remove the text legend at the bottom.
-+.TP
-+\fB\-\-version\fR
-+Report version and exit.
-+.
-+.\" **************************
-+.\" Description Section
-+.\" **************************
-+.SH DESCRIPTION
-+.
-+lstopo and lstopo-no-graphics are capable of displaying a topological map of
-+the system in a variety of different output formats. The only difference
-+between lstopo and lstopo-no-graphics is that graphical outputs are only
-+supported by lstopo, to reduce dependencies on external libraries.
-+.
-+.PP
-+If no filename is specified and the DISPLAY environment variable is set,
-+lstopo displays the map in a graphical window. If no filename is
-+specified and the DISPLAY environment variable is
-+.I not
-+set, a text summary is displayed.
-+.
-+.PP
-+The filename specified directly implies the output format that will be
-+used; see the OUTPUT FORMATS section, below. Output formats that
-+support color will indicate specific characteristics about individual
-+CPUs by their color; see the COLORS section, below.
-+.
-+.\" **************************
-+.\" Output Formats Section
-+.\" **************************
-+.SH OUTPUT FORMATS
-+.
-+.PP
-+The filename on the command line usually determines the format of the output.
-+There are a few filenames that indicate specific output formats and
-+devices (e.g., a filename of "-" will output a text summary to
-+stdout), but most filenames indicate the desired output format by
-+their suffix (e.g., "topo.png" will output a PNG-format file).
-+.PP
-+The format of the output may also be changed with "\-\-of".
-+For instance, "\-\-of pdf" will generate a PDF-format file on the standard
-+output, while "\-\-of fig toto" will output a Xfig-format file named "toto".
-+
-+.PP
-+The list of currently supported formats is given below. Any of them may
-+be used with "\-\-of" or as a filename suffix.
-+.TP
-+.B default
-+Send the output to a window or to the console depending on the environment.
-+.
-+.TP
-+.B console
-+Send a text summary to stdout.
-+Binding, unallowed or offline processors are only annotated in this mode
-+if verbose; see the COLORS section, below.
-+.
-+.TP
-+.B txt
-+Output an ASCII art representation of the map.
-+If outputting to stdout and if colors are supported on the terminal,
-+the output will be colorized.
-+.
-+.TP
-+.B fig
-+Output a representation of the map that can be loaded in Xfig.
-+.
-+.TP
-+.B pdf
-+If lstopo was compiled with the proper
-+support, lstopo outputs a PDF representation of the map.
-+.
-+.TP
-+.B ps
-+If lstopo was compiled with the proper
-+support, lstopo outputs a Postscript representation of the map.
-+.
-+.TP
-+.B png
-+If lstopo was compiled with the proper
-+support, lstopo outputs a PNG representation of the map.
-+.
-+.TP
-+.B svg
-+If lstopo was compiled with the proper
-+support, lstopo outputs an SVG representation of the map.
-+.
-+.TP
-+.B synthetic
-+If the topology is symmetric
-+(which requires that the root object has its symmetric_subtree field set),
-+lstopo outputs a synthetic description string.
-+This output may be reused as an input synthetic topology
-+description later.
-+Note that I/O devices often cause topology asymmetry.
-+Adding \-\-no\-io may then be useful when the synthetic export fails.
-+See also the Synthetic topologies section in the documentation.
-+.
-+.TP
-+.B xml
-+If lstopo was compiled with the proper
-+support, lstopo outputs an XML representation of the map.
-+It may be reused later, even on another machine, with lstopo \-\-input,
-+the HWLOC_XMLFILE environment variable, or the hwloc_topology_set_xml()
-+function.
-+
-+.PP
-+The following special names may be used:
-+.TP
-+.B \-
-+Send a text summary to stdout.
-+.
-+.TP
-+.B /dev/stdout
-+Send a text summary to stdout. It is effectively the same as
-+specifying "\-".
-+.
-+.TP
-+.B \-.
-+If the entire filename is "\-.", lstopo behaves as if
-+"\-\-of -" was given, which means a file of the given format
-+is sent to the standard output.
-+
-+.PP
-+See the output of "lstopo \-\-help" for a specific list of what
-+graphical output formats are supported in your hwloc installation.
-+.
-+.\" **************************
-+.\" Colors Section
-+.\" **************************
-+.SH COLORS
-+Individual CPUs are colored in the semi-graphical and graphical output
-+formats to indicate different characteristics:
-+.TP
-+Green
-+The topology is reported as seen by a specific process (see \fB\-\-pid\fR),
-+and the given CPU is in this process CPU binding mask.
-+.TP
-+White
-+The CPU is in the allowed set (see below).
-+If the topology is reported as seen by a specific process (see \fB\-\-pid\fR),
-+the given CPU is also not in this process CPU binding mask.
-+.TP
-+Red
-+The CPU is not in the allowed set (see below).
-+.TP
-+Black
-+The CPU is offline (not all OS's support displaying offline CPUs).
-+.
-+.PP
-+The "allowed set" is the set of CPUs to which the current process is
-+allowed to bind. The allowed set is usually either inherited from the
-+parent process or set by administrative qpolicies on the system. Linux
-+cpusets are one example of limiting the allowed set for a process and
-+its children to be less than the full set of CPUs on the system.
-+.PP
-+Different processes may therefore have different CPUs in the allowed
-+set. Hence, invoking lstopo in different contexts and/or as different
-+users may display different colors for the same individual CPUs (e.g.,
-+running lstopo in one context may show a specific CPU as red, but
-+running lstopo in a different context may show the same CPU as white).
-+.PP
-+Some lstopo output modes, e.g. the console mode (default non-graphical output),
-+do not support colors at all.
-+The console mode displays the above characteristics by appending text
-+to each PU line if verbose messages are enabled.
-+.
-+.\" **************************
-+.\" Layout Section
-+.\" **************************
-+.SH LAYOUT
-+In its graphical output, lstopo uses simple rectangular heuristics
-+to try to achieve a 4/3 ratio between width and height. However,
-+in the particular case of NUMA nodes, the layout is always a flat
-+rectangle, to avoid letting the user believe any particular NUMA
-+topology (lstopo is not able to render that yet).
-+.
-+.\" **************************
-+.\" Examples Section
-+.\" **************************
-+.SH EXAMPLES
-+.
-+To display the machine topology in textual mode:
-+
-+ lstopo-no-graphics
-+
-+To display the machine topology in pseudo-graphical mode:
-+
-+ lstopo-no-graphics -.txt
-+
-+To display in graphical mode (assuming that the DISPLAY environment
-+variable is set to a relevant value):
-+
-+ lstopo
-+
-+To export the topology to a PNG file:
-+
-+ lstopo file.png
-+
-+To export an XML file on a machine and later display the corresponding
-+graphical output on another machine:
-+
-+ machine1$ lstopo file.xml
-+
-+ machine2$ lstopo --input file.xml
-+
-+To save the current machine topology to XML and later reload it faster
-+while still considering it as the current machine:
-+
-+ $ lstopo file.xml
-+ <...>
-+ $ lstopo --input file.xml --thissystem
-+
-+To restrict an XML topology to only physical processors 0, 1, 4 and 5:
-+
-+ lstopo --input file.xml --restrict 0x33 newfile.xml
-+
-+To restrict an XML topology to only numa node whose logical index is 1:
-+
-+ lstopo --input file.xml --restrict $(hwloc-calc --input file.xml node:1) newfile.xml
-+
-+To display a summary of the topology:
-+
-+ lstopo -s
-+
-+To get more details about the topology:
-+
-+ lstopo -v
-+
-+To only show cores:
-+
-+ lstopo --only core
-+
-+To show cpusets:
-+
-+ lstopo --cpuset
-+
-+To only show the cpusets of sockets:
-+
-+ lstopo --only socket --cpuset-only
-+
-+Simulate a fake hierarchy; this example shows with 2 NUMA nodes of 2
-+processor units:
-+
-+ lstopo --input "n:2 2"
-+
-+To count the number of logical processors in the system
-+
-+ lstopo --only pu | wc -l
-+.\" **************************
-+.\" See also section
-+.\" **************************
-+.SH SEE ALSO
-+.
-+.ft R
-+hwloc(7), hwloc-info(1), hwloc-bind(1), hwloc-ps(1), hwloc-gather-topology(1)
-+.sp
-diff -Nrup hwloc-1.7.orig/utils/Makefile.am hwloc-1.7/utils/Makefile.am
---- hwloc-1.7.orig/utils/Makefile.am 2013-03-26 16:00:18.000000000 -0400
-+++ hwloc-1.7/utils/Makefile.am 2015-07-13 17:04:30.291528739 -0400
-@@ -1,4 +1,4 @@
--# Copyright © 2009-2013 Inria. All rights reserved.
-+# Copyright © 2009-2014 Inria. All rights reserved.
- # Copyright © 2009-2012 Université Bordeaux 1
- # Copyright © 2009-2011 Cisco Systems, Inc. All rights reserved.
- #
-@@ -57,7 +57,7 @@ man7_pages = hwloc.7
- EXTRA_DIST += $(man7_pages:.7=.7in)
- nodist_man_MANS = $(man7_pages)
-
--man1_pages = lstopo.1 hwloc-annotate.1 hwloc-bind.1 hwloc-calc.1 hwloc-distances.1 hwloc-distrib.1 hwloc-info.1 hwloc-ps.1 hwloc-assembler.1 hwloc-assembler-remote.1
-+man1_pages = lstopo-no-graphics.1 hwloc-annotate.1 hwloc-bind.1 hwloc-calc.1 hwloc-distances.1 hwloc-distrib.1 hwloc-info.1 hwloc-ps.1 hwloc-assembler.1 hwloc-assembler-remote.1
- EXTRA_DIST += $(man1_pages:.1=.1in)
- nodist_man_MANS += $(man1_pages)
-
-@@ -101,9 +101,9 @@ if !HWLOC_HAVE_CAIRO
- endif
- endif
- rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1
-- cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 hwloc-ls.1
-- rm -f $(DESTDIR)$(man1dir)/lstopo-no-graphics.1
-- cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo.1 lstopo-no-graphics.1
-+ cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo-no-graphics.1 hwloc-ls.1
-+ rm -f $(DESTDIR)$(man1dir)/lstopo.1
-+ cd $(DESTDIR)$(man1dir) && $(LN_S) lstopo-no-graphics.1 lstopo.1
- $(SED) -e 's/HWLOC_top_builddir\/utils/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-assembler-remote > $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp $(DESTDIR)$(bindir)/hwloc-assembler-remote
- chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote
-
-@@ -114,7 +114,7 @@ if !HWLOC_HAVE_CAIRO
- rm -f $(DESTDIR)$(bindir)/lstopo$(EXEEXT)
- endif
- endif
-- rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1 $(DESTDIR)$(man1dir)/lstopo-no-graphics.1
-+ rm -f $(DESTDIR)$(man1dir)/hwloc-ls.1 $(DESTDIR)$(man1dir)/lstopo.1
-
- distclean-local:
- rm -f $(nodist_man_MANS)
diff --git a/SOURCES/hwloc-1.7-manpage.patch b/SOURCES/hwloc-1.7-manpage.patch
deleted file mode 100644
index 9c010aa..0000000
--- a/SOURCES/hwloc-1.7-manpage.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru hwloc-1.7-original/utils/hwloc-info.1in hwloc-1.7/utils/hwloc-info.1in
---- hwloc-1.7-original/utils/hwloc-info.1in 2013-03-26 21:00:18.000000000 +0100
-+++ hwloc-1.7/utils/hwloc-info.1in 2013-05-09 09:19:06.397752380 +0200
-@@ -148,7 +148,7 @@
- before reading this man page. Most of the concepts described in
- hwloc(7) directly apply to the hwloc-calc utility.
- .
--..\" **************************
-+.\" **************************
- .\" Examples Section
- .\" **************************
- .SH EXAMPLES
diff --git a/SOURCES/hwloc-1.7-xeon-phi.patch b/SOURCES/hwloc-1.7-xeon-phi.patch
deleted file mode 100644
index 03d382f..0000000
--- a/SOURCES/hwloc-1.7-xeon-phi.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Combination of the following two upstream patches to make
-Xeon Phi work correctly.
-
-
-commit ca535e7eb7cd1df884189a36949499d17c297456
-Author: Brice Goglin
-Date: Thu Apr 30 16:25:05 2015 +0200
-
- x86: CPUID 0x1b is actually supported when we have the x2apic feature
-
- Thanks to Grzegorz Andrejczuk and Lukasz Anaczkowski.
-
-
-commit 2119a8b499f73c2759380ccbad89bc4c0c297f11
-Author: Brice Goglin
-Date: Thu Apr 30 16:27:24 2015 +0200
-
- x86: Also get the real APIC ID from the x2APIC code
-
- This fixes support for the upcoming Knights Landing Xeon Phi.
-
- Thanks to Grzegorz Andrejczuk and Lukasz Anaczkowski.
-
-diff -Nrup hwloc-1.7.orig/src/topology-x86.c hwloc-1.7/src/topology-x86.c
---- hwloc-1.7.orig/src/topology-x86.c 2013-03-26 16:00:17.000000000 -0400
-+++ hwloc-1.7/src/topology-x86.c 2015-07-14 16:59:47.457390618 -0400
-@@ -23,6 +23,7 @@
- #include
-
- #define has_topoext(features) ((features)[6] & (1 << 22))
-+#define has_x2apic(features) ((features)[4] & (1 << 21))
-
- struct cacheinfo {
- unsigned type;
-@@ -301,7 +302,7 @@ static void look_proc(struct procinfo *i
- }
- }
-
-- if (cpuid_type == intel && highest_cpuid >= 0x0b) {
-+ if (cpuid_type == intel && has_x2apic(features)) {
- unsigned level, apic_nextshift, apic_number, apic_type, apic_id = 0, apic_shift = 0, id;
- for (level = 0; ; level++) {
- ecx = level;
-@@ -341,8 +342,10 @@ static void look_proc(struct procinfo *i
- }
- apic_shift = apic_nextshift;
- }
-+ infos->apicid = apic_id;
- infos->socketid = apic_id >> apic_shift;
- hwloc_debug("x2APIC remainder: %d\n", infos->socketid);
-+ hwloc_debug("this is thread %u of core %u\n", infos->threadid, infos->coreid);
- } else
- infos->otherids = NULL;
- } else
diff --git a/SOURCES/hwloc-1.7.patch b/SOURCES/hwloc-1.7.patch
deleted file mode 100644
index 4003012..0000000
--- a/SOURCES/hwloc-1.7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -ru hwloc-1.7-orig/src/topology-gl.c hwloc-1.7/src/topology-gl.c
---- hwloc-1.7-orig/src/topology-gl.c 2013-03-26 21:00:17.000000000 +0100
-+++ hwloc-1.7/src/topology-gl.c 2013-04-23 16:18:46.497469010 +0200
-@@ -85,12 +85,18 @@
- gpu_number = ptr_binary_data[1];
- free(ptr_binary_data);
-
-+#ifdef NV_CTRL_PCI_DOMAIN
-+
- /* Gets the ID's of the GPU defined by gpu_number
- * For further details, see the */
- err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
- NV_CTRL_PCI_DOMAIN, &nv_ctrl_pci_domain);
- if (!err)
- continue;
-+#else
-+ nv_ctrl_pci_domain = 0;
-+#endif
-+
-
- err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
- NV_CTRL_PCI_BUS, &nv_ctrl_pci_bus);
-@@ -102,11 +108,6 @@
- if (!err)
- continue;
-
-- err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
-- NV_CTRL_PCI_DOMAIN, &nv_ctrl_pci_domain);
-- if (!err)
-- continue;
--
- err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
- NV_CTRL_PCI_FUNCTION, &nv_ctrl_pci_func);
- if (!err)
-Only in hwloc-1.7/src: .topology-gl.c.swp
diff --git a/SPECS/hwloc.spec b/SPECS/hwloc.spec
index 51dbf72..b05b4fb 100644
--- a/SPECS/hwloc.spec
+++ b/SPECS/hwloc.spec
@@ -1,16 +1,18 @@
Summary: Portable Hardware Locality - portable abstraction of hierarchical architectures
Name: hwloc
-Version: 1.7
-Release: 5%{?dist}
+Version: 1.11.2
+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.7/downloads/%{name}-%{version}.tar.bz2
-Patch0: hwloc-1.7.patch
-Patch1: hwloc-1.7-manpage.patch
-Patch2: hwloc-1.7-lstopo-manpage.patch
-Patch3: hwloc-1.7-desktop-entry.patch
-Patch4: hwloc-1.7-xeon-phi.patch
+Source0: http://www.open-mpi.org/software/hwloc/v1.11/downloads/%{name}-%{version}.tar.bz2
+Patch0: hwloc-1.11.2-x2apic.patch
+Patch1: hwloc-1.11.2-dump-service.patch
+Patch2: hwloc-1.11.2-dump-remove-hardwire.patch
+Patch3: hwloc-1.11.2-dump-cleanups.patch
+Patch4: hwloc-1.11.2-dump-remove-stop.patch
+Patch5: hwloc-1.11.2-hwloc-dump-x86-only.patch
+
Requires: %{name}-libs = %{version}-%{release}
BuildRequires: libX11-devel libxml2-devel cairo-devel ncurses-devel libpciaccess-devel transfig doxygen texlive-latex texlive-makeindex libtool-ltdl-devel autoconf automake libtool
@@ -60,6 +62,17 @@ Requires: %{name}-libs = %{version}-%{release}
%description gui
GUI-based tool for displaying system topology information.
+%package plugins
+Summary: Plugins for hwloc
+Group: Development/Libraries
+Requires: %{name}-plugins = %{version}-%{release}
+
+%description plugins
+ This package contains plugins for hwloc. This includes
+ - PCI support
+ - GL support
+ - libxml support
+
%prep
%setup -q
%patch0 -p1
@@ -67,10 +80,11 @@ GUI-based tool for displaying system topology information.
%patch2 -p1
%patch3 -p1
%patch4 -p1
+%patch5 -p1
%build
autoreconf --force --install
-%configure
+%configure --enable-plugins --disable-silent-rules
##sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
##sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
%{__make} %{?_smp_mflags} V=1
@@ -82,22 +96,39 @@ autoreconf --force --install
%{__chmod} 0755 %{buildroot}%{_bindir}/hwloc-assembler-remote
# We don't ship .la files.
-%{__rm} -rf %{buildroot}%{_libdir}/libhwloc.la
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
%{__mv} %{buildroot}%{_defaultdocdir}/%{name} %{buildroot}%{_defaultdocdir}/%{name}-%{version}
%{__cp} -p AUTHORS COPYING NEWS README VERSION %{buildroot}%{_defaultdocdir}/%{name}-%{version}
-%{__cp} -p doc/hwloc-hello.c %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+%{__cp} -rp doc/examples %{buildroot}%{_defaultdocdir}/%{name}-%{version}
+mv %{buildroot}%{_defaultdocdir}/%{name}-%{version}/examples/Makefile %{buildroot}%{_defaultdocdir}/%{name}-%{version}/examples/Makefile_%{_arch}
desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
+%ifarch x86_64 i686
+mkdir -p %{buildroot}%{_unitdir}
+%{__mv} %{buildroot}/usr/share/hwloc/hwloc-dump-hwdata.service %{buildroot}%{_unitdir}/hwloc-dump-hwdata.service
+%endif
%check
%{__make} check
+%ifarch x86_64 i686
+%post
+%systemd_post hwloc-dump-hwdata.service
+
+%preun
+%systemd_preun hwloc-dump-hwdata.service
+%endif
+
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%files
%defattr(-, root, root, -)
+%ifarch x86_64 i686
+%{_sbindir}/%{name}*
+%{_unitdir}/hwloc-dump-hwdata.service
+%endif
%{_bindir}/%{name}*
%{_bindir}/lstopo-no-graphics
%{_mandir}/man1/%{name}*
@@ -110,7 +141,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
%dir %{_includedir}/%{name}
%{_includedir}/%{name}/*
%{_includedir}/%{name}.h
-%{_defaultdocdir}/%{name}-%{version}/*c
+%{_defaultdocdir}/%{name}-%{version}/examples
%{_libdir}/*.so
%files libs
@@ -128,8 +159,17 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
%{_mandir}/man1/lstopo.*
%{_datadir}/applications/lstopo.desktop
+%files plugins
+%dir %{_libdir}/%{name}
+%{_libdir}/%{name}/hwloc*
+
%changelog
+* Fri Jul 1 2016 Don Zickus - 1.11.2-1
+- Rebase to 1.11.2
+- Xeon Phi dump support
+ Resolves: rhbz1273325 rhbz1314459
+
* Tue Jul 14 2015 Don Zickus - 1.7-5
- Xeon Phi fixes
Resolves: rhbz1227786
@@ -190,7 +230,7 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/lstopo.desktop
* Thu Apr 12 2012 Dan Horák - 1.4-2
- no InfiniBand on s390(x)
-* Wed Feb 14 2012 Jirka Hladky - 1.4-1
+* Tue Feb 14 2012 Jirka Hladky - 1.4-1
- Update to 1.4 release
* Mon Nov 14 2011 Peter Robinson - 1.3-1