[PATCH 0/2] fix build-compare and lttng-tools

[PATCH 0/2] fix build-compare and lttng-tools

[Robert Yang]

The following changes since commit 530565c6cb77319f4cc49edeea6fec6be997415d:

  glibc: Update to glibc 2.21 release tag (2015-02-19 17:04:19 +0000)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib rbt/2fixes
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/2fixes

Robert Yang (2):
  build-compare: update Rename-rpm-check.sh-to-pkg-diff.sh.patch
  lttng-tools: add PACKAGECONFIG for kmod

 .../files/Rename-rpm-check.sh-to-pkg-diff.sh.patch |   37 +++++++++++---------
 meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb     |    3 +-
 2 files changed, 22 insertions(+), 18 deletions(-)

-- 
1.7.9.5

[PATCH 1/2] build-compare: update Rename-rpm-check.sh-to-pkg-diff.sh.patch

[Robert Yang]

The patch can't be applied by "git am -3" with newer version of git
(such as 2.0.1), and can't be applied by "git am/apply" with any
version, now fix it

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../files/Rename-rpm-check.sh-to-pkg-diff.sh.patch |   37 +++++++++++---------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch b/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
index 3e1e679..cff3a9e 100644
--- a/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
+++ b/meta/recipes-devtools/build-compare/files/Rename-rpm-check.sh-to-pkg-diff.sh.patch
@@ -1,6 +1,6 @@
-From f5db896b7f49b56dad0d51c9bdb3d4c9525edab2 Mon Sep 17 00:00:00 2001
-From: Randy Witt <randy.e.witt@linux.intel.com>
-Date: Mon, 5 Jan 2015 15:58:35 -0800
+From 4de3df5a1b361cd09a081f0e0bdb94cbf684ed48 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Thu, 19 Feb 2015 00:34:47 -0800
 Subject: [PATCH] Rename rpm-check.sh to pkg-diff.sh.
 
 The tool now accepts package input other than rpm, so change the name
@@ -9,13 +9,17 @@ which could be misleading.
 Upstream-Status: Submitted [https://github.com/openSUSE/build-compare/pulls]
 
 Signed-off-by: Randy Witt <randy.e.witt@linux.intel.com>
+
+Updated for rpm-check.sh.
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
 ---
- build-compare.spec   |   2 +-
- pkg-diff.sh          | 765 +++++++++++++++++++++++++++++++++++++++++++++++++++
- rpm-check.sh         | 765 ---------------------------------------------------
- same-build-result.sh |   4 +-
- 4 files changed, 768 insertions(+), 768 deletions(-)
- create mode 100755 pkg-diff.sh
+ build-compare.spec   |    2 +-
+ pkg-diff.sh          |  765 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ rpm-check.sh         |  764 -------------------------------------------------
+ same-build-result.sh |    4 +-
+ 4 files changed, 768 insertions(+), 767 deletions(-)
+ create mode 100644 pkg-diff.sh
  delete mode 100755 rpm-check.sh
 
 diff --git a/build-compare.spec b/build-compare.spec
@@ -32,7 +36,7 @@ index 14a97e9..5f47ca1 100644
  Source5:        srpm-check.sh
  BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 diff --git a/pkg-diff.sh b/pkg-diff.sh
-new file mode 100755
+new file mode 100644
 index 0000000..56035c1
 --- /dev/null
 +++ b/pkg-diff.sh
@@ -804,10 +808,10 @@ index 0000000..56035c1
 +# vim: tw=666 ts=2 et
 diff --git a/rpm-check.sh b/rpm-check.sh
 deleted file mode 100755
-index 56035c1..0000000
+index dd47642..0000000
 --- a/rpm-check.sh
 +++ /dev/null
-@@ -1,765 +0,0 @@
+@@ -1,764 +0,0 @@
 -#! /bin/bash
 -#
 -# Copyright (c) 2009, 2010, 2011, 2012 SUSE Linux Product GmbH, Germany.
@@ -1400,10 +1404,9 @@ index 56035c1..0000000
 -    *.ps)
 -      for f in "old/$file" "new/$file"; do
 -        sed -i -e '
--          /^%%CreationDate:[[:blank:]]/d
--          /^%%Creator:[[:blank:]]groff[[:blank:]]version[[:blank:]]/d
--          /^%DVIPSSource:[[:blank:]]/d
--        ' "$f"
+-	/^%%CreationDate:[[:blank:]]/d
+-	/^%%Creator:[[:blank:]]groff[[:blank:]]version[[:blank:]]/d
+-	' "$f"
 -      done
 -    ;;
 -    *pdf)
@@ -1592,5 +1595,5 @@ index c8907e2..7e9bd4f 100644
  
  check_all=1
 -- 
-1.9.3
+1.7.9.5
 
-- 
1.7.9.5

[PATCH 2/2] lttng-tools: add PACKAGECONFIG for kmod

[Robert Yang]

Fixed:
lttng-tools-2.6.0: lttng-tools-ptest rdepends on libkmod, but it isn't a build dependency? [build-deps]
lttng-tools-2.6.0: lttng-tools rdepends on libkmod, but it isn't a build dependency? [build-deps]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
index 23eeb45..15125e3 100644
--- a/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
+++ b/meta/recipes-kernel/lttng/lttng-tools_2.6.0.bb
@@ -20,7 +20,8 @@ PYTHON_OPTION = "am_cv_python_pyexecdir='${libdir}/python${PYTHON_BASEVERSION}/s
 "
 PACKAGECONFIG ??= "lttng-ust"
 PACKAGECONFIG[python] = "--enable-python-bindings ${PYTHON_OPTION},,python swig-native"
-PACKAGECONFIG[lttng-ust] = ", --disable-lttng-ust, lttng-ust"
+PACKAGECONFIG[lttng-ust] = "--enable-lttng-ust, --disable-lttng-ust, lttng-ust"
+PACKAGECONFIG[kmod] = "--enable-kmod, --disable-kmod, kmod"
 
 SRC_URI = "git://git.lttng.org/lttng-tools.git;branch=stable-2.6 \
            file://runtest-2.4.0.patch \
-- 
1.7.9.5