From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga03.intel.com ([143.182.124.21]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SjD0Q-0000n0-ME for openembedded-core@lists.openembedded.org; Mon, 25 Jun 2012 19:23:19 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 25 Jun 2012 10:12:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="160465049" Received: from unknown (HELO [10.255.12.180]) ([10.255.12.180]) by azsmga001.ch.intel.com with ESMTP; 25 Jun 2012 10:12:26 -0700 Message-ID: <4FE89BFA.9080406@linux.intel.com> Date: Mon, 25 Jun 2012 10:12:26 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:12.0) Gecko/20120430 Thunderbird/12.0.1 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <4FE37C14.6060301@mentor.com> In-Reply-To: <4FE37C14.6060301@mentor.com> Subject: Re: [PATCH 1/1] systemtap: update to version 1.8 X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 Jun 2012 17:23:19 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 8bit On 06/21/2012 12:55 PM, Wade Farnsworth wrote: > Update the systemtap recipes to the recently released version 1.8. Remove a > couple of patches whose changes are already present in the new version. > > Signed-off-by: Wade Farnsworth > --- > ...prun-configure.ac-support-without-nss-for.patch | 50 -------------------- > .../systemtap_fix_for_automake_1.12.patch | 23 --------- > meta/recipes-kernel/systemtap/systemtap_git.bb | 2 +- > meta/recipes-kernel/systemtap/systemtap_git.inc | 6 +-- > 4 files changed, 3 insertions(+), 78 deletions(-) > delete mode 100644 meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch > delete mode 100644 meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch > Wade, This patch is not applying cleanly with git am on the lastest master, would you check it and possibly re-base/re-send. Thanks Sau! > diff --git a/meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch b/meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch > deleted file mode 100644 > index eef414a..0000000 > --- a/meta/recipes-kernel/systemtap/systemtap/runtime-staprun-configure.ac-support-without-nss-for.patch > +++ /dev/null > @@ -1,50 +0,0 @@ > -From fa81ccd4f92e5cb15a11a81a7e656bfe01745afb Mon Sep 17 00:00:00 2001 > -From: =?UTF-8?q?Andreas=20M=C3=BCller?= > -Date: Tue, 5 Jun 2012 10:22:23 +0200 > -Subject: [PATCH] runtime/staprun/configure.ac: support --without-nss for > - staprun > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=UTF-8 > -Content-Transfer-Encoding: 8bit > - > -Upstream-Status: Submitted > - > -Signed-off-by: Andreas Müller > ---- > - runtime/staprun/configure.ac | 20 +++++++++++++++----- > - 1 files changed, 15 insertions(+), 5 deletions(-) > - > -diff --git a/runtime/staprun/configure.ac b/runtime/staprun/configure.ac > -index 8fd1b42..7b05f73 100644 > ---- a/runtime/staprun/configure.ac > -+++ b/runtime/staprun/configure.ac > -@@ -67,11 +67,21 @@ AS_IF([test "x$enable_sdt_probes" != xno], [ > - [Define to 1 to enable process.mark probes in staprun, stapio.]) > - ]) > - > --PKG_CHECK_MODULES([nss], [nss>= 3], [have_nss=yes], [have_nss=no]) > --AM_CONDITIONAL([HAVE_NSS], [test $have_nss = yes]) > --AS_IF([test $have_nss = yes], [ > -- AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.]) > --]) > -+dnl See if we have the nss/nspr headers and libraries > -+AC_ARG_WITH([nss], > -+ AS_HELP_STRING([--without-nss], > -+ [Do not use NSS even if present])) > -+ > -+AS_IF([test "x$with_nss" != "xno"], [ > -+ PKG_CHECK_MODULES([nss], [nss>= 3], > -+ [have_nss=yes > -+ AC_DEFINE([HAVE_NSS], [1], [Define to 1 if you have the nss libraries.]) > -+ ], [have_nss=no]) > -+], [have_nss=no]) > -+ > -+AM_CONDITIONAL([HAVE_NSS], [test "${have_nss}" = "yes"]) > -+ > -+ > - AC_ARG_ENABLE([nls], [AS_HELP_STRING([--enable-nls], [enable translating program messages])]) > - AS_IF([test "x$enable_nls" != xno], [ > - AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if program messages should be translated.]) > --- > -1.7.6.5 > - > diff --git a/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch b/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch > deleted file mode 100644 > index ef74a09..0000000 > --- a/meta/recipes-kernel/systemtap/systemtap/systemtap_fix_for_automake_1.12.patch > +++ /dev/null > @@ -1,23 +0,0 @@ > -Upstream-Status: Pending > - > -Automake 1.12 has deprecated automatic de-ANSI-fication support > - > -Fix this issue with automake 1.12: > - > -| configure.ac:23: error: automatic de-ANSI-fication support has been removed > - > -Signed-Off-by: Nitin A Kamble > -2012/05/02 > - > -Index: git/configure.ac > -=================================================================== > ---- git.orig/configure.ac > -+++ git/configure.ac > -@@ -20,7 +20,6 @@ AC_PROG_CXX > - AC_PROG_CPP > - AM_PROG_CC_STDC > - AM_PROG_CC_C_O > --AM_C_PROTOTYPES > - AC_PROG_RANLIB > - AC_OBJEXT > - AC_EXEEXT > diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb > index 7ed5fcd..059aca7 100644 > --- a/meta/recipes-kernel/systemtap/systemtap_git.bb > +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb > @@ -6,7 +6,7 @@ DEPENDS = "elfutils sqlite3 systemtap-native" > DEPENDS_virtclass-native = "elfutils-native sqlite3-native gettext-native" > DEPENDS_virtclass-nativesdk = "elfutils-nativesdk sqlite3-nativesdk gettext-nativesdk" > > -PR = "r5" > +PR = "r0" > > export CC_FOR_BUILD = "${BUILD_CC}" > export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" > diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc > index 5f2987b..093e62d 100644 > --- a/meta/recipes-kernel/systemtap/systemtap_git.inc > +++ b/meta/recipes-kernel/systemtap/systemtap_git.inc > @@ -1,13 +1,11 @@ > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > -SRCREV = "83bd2699d8cff2f2d6b9eaf5ea254e4cb6b33e81" > -PV = "1.7+git${SRCPV}" > +SRCREV = "48fa6b5e1d3e636c34cbd5650370e6f634efc294" > +PV = "1.8+git${SRCPV}" > > SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \ > file://docproc-build-fix.patch \ > - file://systemtap_fix_for_automake_1.12.patch \ > - file://runtime-staprun-configure.ac-support-without-nss-for.patch \ > " > > FILESPATH = "${FILE_DIRNAME}/systemtap"