[Likwid-commit] [likwid] 04/10: adapt patches, changelog, control and copyright to new release
Christoph Martin
chrism at debian.org
Wed Jun 22 08:28:32 UTC 2016
This is an automated email from the git hooks/post-receive script.
chrism pushed a commit to branch master
in repository likwid.
commit 8ef42c3fb215294ee31ba58098caa513ef29a7df
Author: Christoph Martin <martin at uni-mainz.de>
Date: Mon Jun 20 16:22:54 2016 +0200
adapt patches, changelog, control and copyright to new release
---
debian/control | 6 +--
debian/copyright | 33 ++++++-------
debian/patches/02-man-pages-fix.patch | 87 +++++++++++++++++++++++++++++++++++
debian/patches/10-debianize.patch | 51 +++++++++++++++-----
debian/rules | 4 +-
5 files changed, 150 insertions(+), 31 deletions(-)
diff --git a/debian/control b/debian/control
index 0814769..d5a3fb1 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,12 @@
Source: likwid
-Maintainer: Christoph Martin <christoph.martin at uni-mainz.de>
+Maintainer: Christoph Martin <martin at uni-mainz.de>
Section: misc
Priority: optional
Standards-Version: 3.9.6
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.16.1~), gfortran, liblua5.2-dev
Homepage: https://github.com/rrze-likwid/likwid
-Vcs-Git: git://anonscm.debian.org/likwid/likwid.git
-Vcs-Browser: http://anonscm.debian.org/cgit/likwid/likwid.git;a=summary
+Vcs-Git: https://anonscm.debian.org/git/likwid/likwid.git
+Vcs-Browser: https://anonscm.debian.org/cgit/likwid/likwid.git
Package: likwid
Architecture: amd64 i386 x32
diff --git a/debian/copyright b/debian/copyright
index f35195f..ac6a807 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -36,7 +36,6 @@ License: LGPL-2+
Files: perl/xmgrace.pm
Copyright: 2011, Jan Treibig <jan.treibig at googlemail.com>
License: GPL-2+
- The license can be found in /usr/share/common-licenses/GPL-2.
Files: test/accuracy/statistics.py
Copyright: 2013, Steven D'Aprano <steve+python at pearwood.info>
@@ -46,21 +45,6 @@ License: Apache-2.0
Files: debian/*
Copyright: 2014 Christoph Martin <christoph.martin at uni-mainz.de>
License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Files: ext/hwloc/*
Copyright: 2009 CNRS
@@ -90,3 +74,20 @@ License: hwloc
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/debian/patches/02-man-pages-fix.patch b/debian/patches/02-man-pages-fix.patch
index 8a19030..1f657d9 100644
--- a/debian/patches/02-man-pages-fix.patch
+++ b/debian/patches/02-man-pages-fix.patch
@@ -22,6 +22,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
.B http://code.google.com/p/likwid/wiki/LikwidBench
--- a/doc/likwid-perfctr.1
+++ b/doc/likwid-perfctr.1
+@@ -33,8 +33,8 @@ or
+ is a lightweight command line application to configure and read out hardware performance monitoring data
+ on supported x86 processors. It can measure either as wrapper without changing the measured application
+ or with marker API functions inside the code, which will turn on and off the counters. There are preconfigured
+-performance groups with useful event sets and derived metrics. Additonally, arbitrary events can be measured with
+-custom event sets. The marker API can measure mulitple named regions and the results are accumulated over multiple region calls.
++performance groups with useful event sets and derived metrics. Additionally, arbitrary events can be measured with
++custom event sets. The marker API can measure multiple named regions and the results are accumulated over multiple region calls.
+
+ .SH OPTIONS
+ .TP
@@ -45,7 +45,7 @@ prints version information to standard o
prints a help message to standard output, then exits.
.TP
@@ -63,3 +74,79 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/$
.SH OPTIONS
.TP
.B \-h, \-\-\^help
+--- a/doc/feedGnuplot.1
++++ b/doc/feedGnuplot.1
+@@ -165,7 +165,7 @@ Simple real-time plotting example: plot
+ .PP
+ Reads the stats of the network interface 'wlan0' every second, reformats it with
+ .B gawk
+-and pipes the formated output into
++and pipes the formatted output into
+ .B feedGnuplot
+ qto create a line plot (
+ .B --lines
+--- a/doc/likwid-agent.1
++++ b/doc/likwid-agent.1
+@@ -15,7 +15,7 @@ provides multiple store backends like lo
+ The global configuration file has the following options:
+ .TP
+ .B GROUPPATH <path>
+-Path to the group files containing event set and output defintitions. See section
++Path to the group files containing event set and output definitions. See section
+ .B GROUP FILES
+ for information.
+ .TP
+@@ -66,16 +66,16 @@ A short descriptive information about th
+ .B <counter1> <event1>
+ .TP
+ .B <counter2>:<option> <event2>
+-Defintion of the eventset similar to the performance groups.
++Definition of the eventset similar to the performance groups.
+ .TP
+ .B METRICS
+ .TP
+ .B <metricname> <formula>
+ .TP
+ .B <filter> <metricname> <formula>
+-Defintion of the output metrics. The syntax follows the
++Definition of the output metrics. The syntax follows the
+ .B METRICS
+-defintion of the performance groups as used by
++definition of the performance groups as used by
+ .B likwid-perfctr(1).
+ If no function is set at the beginning of the line,
+ .B <formula>
+--- a/doc/likwid-powermeter.1
++++ b/doc/likwid-powermeter.1
+@@ -19,7 +19,7 @@ only Intel SandyBridge is supported. It
+ The Turbo Mode information works on all Turbo mode enabled Intel processors. The tool can be either used
+ in stethoscope mode for a specified duration or as a wrapper to your application measuring your complete
+ run. RAPL works on a per package (socket) base.
+-Please note that the RAPL counters are also accessible as normal events withing likwid-perfctr.
++Please note that the RAPL counters are also accessible as normal events within likwid-perfctr.
+ .SH OPTIONS
+ .TP
+ .B \-\^h,\-\-\^help
+--- a/doc/likwid-setFreq.1
++++ b/doc/likwid-setFreq.1
+@@ -15,7 +15,8 @@ is a command line application that media
+ .B likwid-setFrequencies(1)
+ because setting a CPU core's frequency and/or governor requires root privileges. This executable must be suid-root.
+ .B likwid-setFreq
+-works only with the kernel module acpi-cpufreq. The recent intel_pstate module does not allow to set fixed frequencies.
++works only with the kernel module acpi-cpufreq. The recent intel_pstate module does not allow one to
++ set fixed frequencies.
+
+
+ .SH AUTHOR
+--- a/doc/likwid-setFrequencies.1
++++ b/doc/likwid-setFrequencies.1
+@@ -22,7 +22,7 @@ works only with the kernel module
+ .B acpi-cpufreq.
+ The recent
+ .B intel_pstate
+-module does not allow to set fixed frequencies. In order to deactivate
++module does not allow one to set fixed frequencies. In order to deactivate
+ .B intel_pstate
+ add 'intel_pstate=disable' to your kernel boot commandline (commonly in grub) and load the
+ .B acpi-cpufreq
diff --git a/debian/patches/10-debianize.patch b/debian/patches/10-debianize.patch
index 1347e21..1f84a92 100644
--- a/debian/patches/10-debianize.patch
+++ b/debian/patches/10-debianize.patch
@@ -28,11 +28,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-CPPFLAGS =
-LFLAGS = -pthread
+CPPFLAGS +=
-+LFLAGS = $(LDFLAGS) -pthread
++LFLAGS = $(DLDFLAGS) -pthread
SHARED_CFLAGS = -fPIC -fvisibility=hidden
-SHARED_LFLAGS = -shared -fvisibility=hidden
-+SHARED_LFLAGS = $(LDFLAGS) -shared -fvisibility=hidden
++SHARED_LFLAGS = $(DLDFLAGS) -shared -fvisibility=hidden
DEFINES = -DPAGE_ALIGNMENT=4096
DEFINES += -DLIKWID_MONITOR_LOCK
@@ -108,15 +108,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
$(GENGROUPLOCK): $(foreach directory,$(shell ls $(GROUP_DIR)), $(wildcard $(GROUP_DIR)/$(directory)/*.txt))
@echo "===> GENERATE GROUP HEADERS"
-@@ -166,7 +166,7 @@ $(TARGET_LUA_LIB):
-
- $(TARGET_HWLOC_LIB):
- @echo "===> ENTER $(HWLOC_FOLDER)"
-- $(Q)$(MAKE) -s --no-print-directory -C $(HWLOC_FOLDER) $(MAKECMDGOALS)
-+ $(Q)$(MAKE) -s --no-print-directory -C $(HWLOC_FOLDER) LFLAGS="$(LDFLAGS)" $(MAKECMDGOALS)
-
- $(BENCH_TARGET):
- @echo "===> ENTER $(BENCH_FOLDER)"
@@ -207,7 +207,7 @@ endif
.NOTPARALLEL:
@@ -185,6 +176,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-
--- a/bench/Makefile
+++ b/bench/Makefile
+@@ -46,7 +46,7 @@ include $(MAKE_DIR)/config_defines.mk
+ #INCLUDES += -I./includes -I../src/includes -I../ext/hwloc/include -I../$(COMPILER) -I$(BUILD_DIR)
+ INCLUDES += -I./includes -I$(BUILD_DIR) -I../src/includes
+ LIBS +=
+-CFLAGS := $(filter-out -fvisibility=hidden, $(CFLAGS))
++CFLAGS := $(filter-out -fvisibility=hidden, $(CFLAGS)) -pie -fPIE
+
+ #CONFIGURE BUILD SYSTEM
+ BUILD_DIR = ./$(COMPILER)
@@ -62,7 +62,7 @@ BENCH_DIR = ./x86-64
endif
endif
@@ -194,6 +194,24 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
STATIC_TARGET_LIB := ../liblikwid.a ../ext/hwloc/liblikwid-hwloc.a ../ext/lua/liblikwid-lua.a
TARGET_LIB = $(SHARED_TARGET_LIB)
+@@ -88,7 +88,7 @@ endif
+ OBJ_BENCH = $(patsubst $(BENCH_DIR)/%.ptt, $(BUILD_DIR)/%.o,$(wildcard $(BENCH_DIR)/*.ptt))
+ BENCH = $(shell basename $(BENCH_TARGET))
+
+-CPPFLAGS := $(CPPFLAGS) $(DEFINES) $(INCLUDES)
++CPPFLAGS := $(DCPPFLAGS) $(DEFINES) $(INCLUDES)
+
+ all: $(BUILD_DIR) $(OBJ) $(OBJ_BENCH) $(BENCH_TARGET)
+
+@@ -96,7 +96,7 @@ all: $(BUILD_DIR) $(OBJ) $(OBJ_BENCH) $(
+ $(BENCH_TARGET): $(BENCH)
+ $(BENCH): likwid-bench.c $(BUILD_DIR) $(OBJ) $(OBJ_BENCH)
+ @echo "===> LINKING $(BENCH)"
+- $(Q)${CC} $(DEBUG_FLAGS) $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) ${LFLAGS} likwid-bench.c $(BENCH_LIBS) $(OBJ_BENCH) $(OBJ) -o $(BENCH) $(TARGET_LIB) $(LIBS) $(RPATHS)
++ $(Q)${CC} $(DEBUG_FLAGS) $(CFLAGS) $(ANSI_CFLAGS) $(CPPFLAGS) ${LFLAGS} likwid-bench.c $(BENCH_LIBS) $(OBJ_BENCH) $(OBJ) $(DLDFLAGS) -o $(BENCH) $(TARGET_LIB) $(LIBS) $(RPATHS)
+
+
+ $(BUILD_DIR):
--- a/src/access-daemon/Makefile
+++ b/src/access-daemon/Makefile
@@ -31,7 +31,7 @@ include ../../make/include_$(COMPILER).
@@ -223,3 +241,14 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+ $(Q)$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o ../../$(SETFREQ_TARGET) setFreq.c
+--- a/ext/hwloc/Makefile
++++ b/ext/hwloc/Makefile
+@@ -49,7 +49,7 @@ $(STATIC_LIBHWLOC): $(OBJ)
+ $(Q)${AR} -cq $(LIBHWLOC) $(OBJ)
+
+ $(SHARED_LIBHWLOC): $(OBJ)
+- $(Q)$(CC) $(DEBUG_FLAGS) $(LFLAGS) -Wl,-soname,$(LIBHWLOC).$(VERSION).$(RELEASE) -Wall -shared -fPIC -o $(LIBHWLOC) $(OBJ) $(LIBS) $(RPATHS)
++ $(Q)$(CC) $(DEBUG_FLAGS) $(LFLAGS) -Wl,-soname,$(LIBHWLOC).$(VERSION).$(RELEASE) -Wall -shared -fPIC $(DLDFLAGS) -o $(LIBHWLOC) $(OBJ) $(LIBS) $(RPATHS)
+
+ #PATTERN RULES
+ $(BUILD_DIR)/%.o: %.c
diff --git a/debian/rules b/debian/rules
index 73d7ba5..999f92c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,9 @@ include /usr/share/dpkg/buildflags.mk
include /usr/share/dpkg/architecture.mk
DCPPFLAGS=$(CPPFLAGS)
-export DCPPFLAGS
+DLDFLAGS=$(LDFLAGS)
+
+export DCPPFLAGS DLDFLAGS
%:
dh $@
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/likwid/likwid.git
More information about the Likwid-commit
mailing list