diff options
| author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2012-01-05 09:21:18 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-06 11:27:28 +0000 |
| commit | 0d0a9c71499c6b973fe08b02838b99e47785a07e (patch) | |
| tree | 8946c8c6adfb329d73f8d0bf767854e29e8cdaf7 | |
| parent | 33fa7ebd1024bff84c195285270fc8db48c90b83 (diff) | |
| download | openembedded-core-0d0a9c71499c6b973fe08b02838b99e47785a07e.tar.gz openembedded-core-0d0a9c71499c6b973fe08b02838b99e47785a07e.tar.bz2 openembedded-core-0d0a9c71499c6b973fe08b02838b99e47785a07e.zip | |
systemtap: remove not needed fix for automake 1.11.2
The pkglibexec_SCRIPTS pair is valid. the 1.11.2 introduced an bug
to make it invalid. Now the automake 1.11.2 recipe is fixed, so
no need for this fix for systemtap recipe.
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch | 46 | ||||
| -rw-r--r-- | meta/recipes-kernel/systemtap/systemtap_git.bb | 6 |
2 files changed, 2 insertions, 50 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch b/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch deleted file mode 100644 index 99e72b2b98..0000000000 --- a/meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Pending - -automake version 1.11.2 has made use of dir variables more strict. -The pkglibexec var can not have SCRIPTS suffix. Using pkgdata -instead. - -Fixes this error: -| Makefile.am:25: `pkglibexecdir' is not a legitimate directory for `SCRIPTS' -| autoreconf: automake failed with exit status: 1 -| ERROR: autoreconf execution failed. -NOTE: package systemtap-1.6+git1+820f2d22fc47fad6e09ba886efb9b91e1247cb39-r0: task do_configure: Failed - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2011/12/29 - -Index: git/Makefile.am -=================================================================== ---- git.orig/Makefile.am -+++ git/Makefile.am -@@ -22,7 +22,7 @@ dtrace.1 stap-merge.1\ - stappaths.7 - - bin_SCRIPTS = stap-report --pkglibexec_SCRIPTS = stap-env -+pkgdata_SCRIPTS = stap-env - oldinclude_HEADERS = includes/sys/sdt.h includes/sys/sdt-config.h - - bin_PROGRAMS = -@@ -41,7 +41,7 @@ if BUILD_SERVER - man_MANS += stap-server.8 - pkglibexec_PROGRAMS += stap-serverd stap-gen-cert - bin_SCRIPTS += stap-server --pkglibexec_SCRIPTS += stap-start-server stap-stop-server -+pkgdata_SCRIPTS += stap-start-server stap-stop-server - endif - endif - -@@ -127,7 +127,7 @@ install-scripts: install-binSCRIPTS inst - for f in $(bin_SCRIPTS); do \ - sed -i -e "s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(bindir)/$$f; \ - done -- for f in $(pkglibexec_SCRIPTS); do \ -+ for f in $(pkgdata_SCRIPTS); do \ - sed -i -e "/INSTALL-HOOK/d;s,sysconfdir=.*,sysconfdir=$(sysconfdir),;s,pkglibexecdir=.*,pkglibexecdir=$(pkglibexecdir)/,;s,localstatedir=.*,localstatedir=$(localstatedir),;s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(pkglibexecdir)/$$f; \ - done - endif diff --git a/meta/recipes-kernel/systemtap/systemtap_git.bb b/meta/recipes-kernel/systemtap/systemtap_git.bb index 1c64be64eb..ebacc43c10 100644 --- a/meta/recipes-kernel/systemtap/systemtap_git.bb +++ b/meta/recipes-kernel/systemtap/systemtap_git.bb @@ -5,12 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "elfutils sqlite3" SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39" -PR = "r1" +PR = "r2" PV = "1.6+git${SRCPV}" -SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \ - file://fix_for_automake_1.11.2.patch \ - " +SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git" EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ ac_cv_file__usr_include_nss=no \ |