diff options
author | Vlad Glagolev | 2019-08-18 14:12:30 +0000 |
---|---|---|
committer | Vlad Glagolev | 2019-08-18 14:12:30 +0000 |
commit | 97f8df86550078041f747e79a16b1eff53f1904e (patch) | |
tree | f47fd3b8fd5a2f158c5e4946d18151e7b15ac841 /utils | |
parent | 97a4650c949d5aba0050dc7388b8501bca0d9c4e (diff) |
perf: post-release fixes
Diffstat (limited to 'utils')
-rwxr-xr-x | utils/perf/BUILD | 1 | ||||
-rwxr-xr-x | utils/perf/DETAILS | 4 | ||||
-rw-r--r-- | utils/perf/HISTORY | 6 | ||||
-rwxr-xr-x | utils/perf/INSTALL | 1 | ||||
-rwxr-xr-x | utils/perf/PRE_BUILD | 4 |
5 files changed, 13 insertions, 3 deletions
diff --git a/utils/perf/BUILD b/utils/perf/BUILD index 855971c75e..571a849b82 100755 --- a/utils/perf/BUILD +++ b/utils/perf/BUILD @@ -8,4 +8,5 @@ fi && make CFLAGS="${CFLAGS}" EXTRA_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ V=1 WERROR=0 DESTDIR="${INSTALL_ROOT}" prefix=/usr lib=lib/perf \ + plugindir_SQ="${INSTALL_ROOT}/usr/lib/traceevent/plugins" \ ${OPTS} $_targets diff --git a/utils/perf/DETAILS b/utils/perf/DETAILS index 0ca8901e4a..875aa7a340 100755 --- a/utils/perf/DETAILS +++ b/utils/perf/DETAILS @@ -1,5 +1,7 @@ +. "${GRIMOIRE}/FUNCTIONS" && + SPELL=perf - VERSION=$(uname -r) + VERSION=$(get_kernel_version) SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" WEB_SITE=https://perf.wiki.kernel.org/ ENTERED=20190817 diff --git a/utils/perf/HISTORY b/utils/perf/HISTORY index 76b89cbe6c..c11c002e00 100644 --- a/utils/perf/HISTORY +++ b/utils/perf/HISTORY @@ -1,3 +1,9 @@ +2019-08-18 Vlad Glagolev <stealth@sourcemage.org> + * DETAILS: prefer get_kernel_version to make chroot/bootstrap work + easier + * PRE_BUILD: chmod on check-headers.sh for older kernels + * INSTALL, BUILD: properly pass plugindir for traceevent + 2019-08-17 Vlad Glagolev <stealth@sourcemage.org> * DETAILS, DEPENDS, {PRE_,}BUILD, INSTALL, PREPARE, TRIGGERS, elf.patch: created spell, version synced with running kernel diff --git a/utils/perf/INSTALL b/utils/perf/INSTALL index fb62904d44..9b28787f86 100755 --- a/utils/perf/INSTALL +++ b/utils/perf/INSTALL @@ -8,4 +8,5 @@ fi && make CFLAGS="${CFLAGS}" EXTRA_CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ V=1 WERROR=0 DESTDIR="${INSTALL_ROOT}" prefix=/usr lib=lib/perf \ + plugindir_SQ="${INSTALL_ROOT}/usr/lib/traceevent/plugins" \ ${OPTS} $_targets diff --git a/utils/perf/PRE_BUILD b/utils/perf/PRE_BUILD index 913c728f71..0306b8b5f4 100755 --- a/utils/perf/PRE_BUILD +++ b/utils/perf/PRE_BUILD @@ -9,8 +9,8 @@ ln -s ../linux/tools/perf perf && cd perf && -if ! grep -q libdir_relative Makefile.perf; then - sedit "s:install_plugins:install_plugins libdir_relative=lib:" Makefile.perf +if [ ! -x check-headers.sh ]; then + chmod +x check-headers.sh fi && if ! grep -q "GELF_ST_VISIBILITY" util/symbol-elf.c; then |