summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/fix_for_automake_1.11.2.patch46
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.bb6
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 @@
1Upstream-Status: Pending
2
3automake version 1.11.2 has made use of dir variables more strict.
4The pkglibexec var can not have SCRIPTS suffix. Using pkgdata
5instead.
6
7Fixes this error:
8| Makefile.am:25: `pkglibexecdir' is not a legitimate directory for `SCRIPTS'
9| autoreconf: automake failed with exit status: 1
10| ERROR: autoreconf execution failed.
11NOTE: package systemtap-1.6+git1+820f2d22fc47fad6e09ba886efb9b91e1247cb39-r0: task do_configure: Failed
12
13Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
142011/12/29
15
16Index: git/Makefile.am
17===================================================================
18--- git.orig/Makefile.am
19+++ git/Makefile.am
20@@ -22,7 +22,7 @@ dtrace.1 stap-merge.1\
21 stappaths.7
22
23 bin_SCRIPTS = stap-report
24-pkglibexec_SCRIPTS = stap-env
25+pkgdata_SCRIPTS = stap-env
26 oldinclude_HEADERS = includes/sys/sdt.h includes/sys/sdt-config.h
27
28 bin_PROGRAMS =
29@@ -41,7 +41,7 @@ if BUILD_SERVER
30 man_MANS += stap-server.8
31 pkglibexec_PROGRAMS += stap-serverd stap-gen-cert
32 bin_SCRIPTS += stap-server
33-pkglibexec_SCRIPTS += stap-start-server stap-stop-server
34+pkgdata_SCRIPTS += stap-start-server stap-stop-server
35 endif
36 endif
37
38@@ -127,7 +127,7 @@ install-scripts: install-binSCRIPTS inst
39 for f in $(bin_SCRIPTS); do \
40 sed -i -e "s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(bindir)/$$f; \
41 done
42- for f in $(pkglibexec_SCRIPTS); do \
43+ for f in $(pkgdata_SCRIPTS); do \
44 sed -i -e "/INSTALL-HOOK/d;s,sysconfdir=.*,sysconfdir=$(sysconfdir),;s,pkglibexecdir=.*,pkglibexecdir=$(pkglibexecdir)/,;s,localstatedir=.*,localstatedir=$(localstatedir),;s,\$${PKGLIBEXECDIR},$(pkglibexecdir)/," $(DESTDIR)$(pkglibexecdir)/$$f; \
45 done
46 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"
5DEPENDS = "elfutils sqlite3" 5DEPENDS = "elfutils sqlite3"
6 6
7SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39" 7SRCREV = "820f2d22fc47fad6e09ba886efb9b91e1247cb39"
8PR = "r1" 8PR = "r2"
9PV = "1.6+git${SRCPV}" 9PV = "1.6+git${SRCPV}"
10 10
11SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git \ 11SRC_URI = "git://sources.redhat.com/git/systemtap.git;protocol=git"
12 file://fix_for_automake_1.11.2.patch \
13 "
14 12
15EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \ 13EXTRA_OECONF += "--with-libelf=${STAGING_DIR_TARGET} --without-rpm \
16 ac_cv_file__usr_include_nss=no \ 14 ac_cv_file__usr_include_nss=no \