From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 02/11] trace-cmd: update to 2.6.1
Date: Wed, 10 May 2017 12:35:20 +0300 [thread overview]
Message-ID: <20170510093529.6651-2-alexander.kanavin@linux.intel.com> (raw)
In-Reply-To: <20170510093529.6651-1-alexander.kanavin@linux.intel.com>
License change is due to update in FSF address.
Library path needs to be specified in absolute form now.
Remove bash completion file from kernelshark package as it will cause
a conflict with trace-cmd package.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
---
meta/recipes-kernel/trace-cmd/kernelshark_git.bb | 3 ++-
meta/recipes-kernel/trace-cmd/trace-cmd.inc | 4 ++--
meta/recipes-kernel/trace-cmd/trace-cmd_git.bb | 4 ++--
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
index 563182c89fe..9a5e8006c78 100644
--- a/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
+++ b/meta/recipes-kernel/trace-cmd/kernelshark_git.bb
@@ -15,7 +15,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}"
EXTRA_OEMAKE = "\
'prefix=${prefix}' \
'bindir_relative=${@oe.path.relative(prefix, bindir)}' \
- 'libdir=${@oe.path.relative(prefix, libdir)}' \
+ 'libdir=${libdir}' \
NO_PYTHON=1 \
gui \
"
@@ -28,5 +28,6 @@ do_install() {
oe_runmake DESTDIR="${D}" install_gui
rm ${D}${bindir}/trace-cmd
rm -rf ${D}${libdir}/trace-cmd
+ rm -rf ${D}${sysconfdir}/bash_completion.d/trace-cmd.bash
rmdir ${D}${libdir}
}
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd.inc b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
index 3ad06fad81b..e0f6c3fba56 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd.inc
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd.inc
@@ -1,5 +1,5 @@
-SRCREV = "9be5d74805830a291615f2f34a27c903f6a37b1e"
-PV = "2.6"
+SRCREV = "021710e1073fe203341b427cd1a4bac577ec899c"
+PV = "2.6.1"
inherit pkgconfig
diff --git a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
index dd9a8a0ded6..fa9ffa3dc8f 100644
--- a/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
+++ b/meta/recipes-kernel/trace-cmd/trace-cmd_git.bb
@@ -5,7 +5,7 @@ require trace-cmd.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://trace-cmd.c;beginline=6;endline=8;md5=2c22c965a649ddd7973d7913c5634a5e \
- file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff \
+ file://COPYING.LIB;md5=edb195fe538e4552c1f6ca0fd7bf4f0a \
file://trace-input.c;beginline=5;endline=8;md5=3ec82f43bbe0cfb5951ff414ef4d44d0 \
"
@@ -17,7 +17,7 @@ EXTRA_OEMAKE = "\
'img_install=${datadir}/kernelshark/html/images' \
\
'bindir_relative=${@oe.path.relative(prefix, bindir)}' \
- 'libdir=${@oe.path.relative(prefix, libdir)}' \
+ 'libdir=${libdir}' \
\
NO_PYTHON=1 \
"
--
2.11.0
next prev parent reply other threads:[~2017-05-10 9:35 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-10 9:35 [PATCH 01/11] ffmpeg: update to 3.3 Alexander Kanavin
2017-05-10 9:35 ` Alexander Kanavin [this message]
2017-05-18 20:06 ` [PATCH 02/11] trace-cmd: update to 2.6.1 Burton, Ross
2017-05-10 9:35 ` [PATCH 03/11] mpg123: update to 1.24.0 Alexander Kanavin
2017-05-10 9:35 ` [PATCH 04/11] sysprof: update to 3.24.1 Alexander Kanavin
2017-05-10 11:03 ` Burton, Ross
2017-05-10 9:35 ` [PATCH 05/11] gdbm: update to 1.13 Alexander Kanavin
2017-05-10 9:35 ` [PATCH 06/11] gnome-desktop3: update to 3.24.2 Alexander Kanavin
2017-05-10 9:35 ` [PATCH 07/11] ed: update to 1.14.2 Alexander Kanavin
2017-05-10 9:35 ` [PATCH 08/11] libpciaccess: update to 0.13.5 Alexander Kanavin
2017-05-10 9:35 ` [PATCH 09/11] db: fix upstream version check Alexander Kanavin
2017-05-10 9:35 ` [PATCH 10/11] dnf: " Alexander Kanavin
2017-05-10 9:35 ` [PATCH 11/11] vulkan: " Alexander Kanavin
2017-05-10 10:01 ` ✗ patchtest: failure for "ffmpeg: update to 3.3..." and 10 more Patchwork
2017-05-10 10:03 ` Alexander Kanavin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170510093529.6651-2-alexander.kanavin@linux.intel.com \
--to=alexander.kanavin@linux.intel.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox