summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch47
-rw-r--r--meta/recipes-kernel/systemtap/systemtap_git.inc2
2 files changed, 12 insertions, 37 deletions
diff --git a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch
index 9f11648fef..e2f8b3b057 100644
--- a/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch
+++ b/meta/recipes-kernel/systemtap/systemtap/0001-staprun-stapbpf-don-t-support-installing-a-non-root.patch
@@ -14,49 +14,24 @@ Signed-off-by: Saul Wold <sgw@linux.intel.com>
14 staprun/Makefile.am | 12 ++++++------ 14 staprun/Makefile.am | 12 ++++++------
15 2 files changed, 13 insertions(+), 13 deletions(-) 15 2 files changed, 13 insertions(+), 13 deletions(-)
16 16
17diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am 17Index: git/stapbpf/Makefile.am
18index 421b044ef..f7daeb2b2 100644 18===================================================================
19--- a/stapbpf/Makefile.am 19--- git.orig/stapbpf/Makefile.am
20+++ b/stapbpf/Makefile.am 20+++ git/stapbpf/Makefile.am
21@@ -39,11 +39,11 @@ git_version.stamp ../git_version.h: 21@@ -41,10 +41,10 @@
22 22
23 # Why the "id -u" condition? This way, an unprivileged user can run 23 # Why the "id -u" condition? This way, an unprivileged user can run
24 # make install, and have "sudo stap ...." or "sudo stapbpf ...." work later. 24 # make install, and have "sudo stap ...." or "sudo stapbpf ...." work later.
25-install-exec-hook: 25-install-exec-hook:
26- if [ `id -u` -eq 0 ]; then \ 26- if [ `id -u` -eq 0 ] && (getent group stapusr >/dev/null \
27- getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ 27- || groupadd -f -g 156 -r stapusr); then \
28- getent group stapusr >/dev/null \ 28- chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
29- && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
30- && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \ 29- && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \
31- fi 30- fi
32+#install-exec-hook: 31+#install-exec-hook:
33+# if [ `id -u` -eq 0 ]; then \ 32+## if [ `id -u` -eq 0 ] && (getent group stapusr >/dev/null \
34+# getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \ 33+## || groupadd -f -g 156 -r stapusr); then \
35+# getent group stapusr >/dev/null \ 34+## chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
36+# && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
37+# && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \ 35+# && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \
38+# fi 36+# fi
39 endif 37 endif
40diff --git a/staprun/Makefile.am b/staprun/Makefile.am
41index 4073aa01c..2925e34c3 100644
42--- a/staprun/Makefile.am
43+++ b/staprun/Makefile.am
44@@ -72,9 +72,9 @@ git_version.stamp ../git_version.h:
45
46 # Why the "id -u" condition? This way, an unprivileged user can run
47 # make install, and have "sudo stap ...." or "sudo staprun ...." work later.
48-install-exec-hook:
49- if [ `id -u` -eq 0 ]; then \
50- getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
51- getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \
52- chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \
53- fi
54+#install-exec-hook:
55+# if [ `id -u` -eq 0 ]; then \
56+# getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
57+# getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \
58+# chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \
59+# fi
60--
612.11.0
62
diff --git a/meta/recipes-kernel/systemtap/systemtap_git.inc b/meta/recipes-kernel/systemtap/systemtap_git.inc
index 274fcde5c1..54de722660 100644
--- a/meta/recipes-kernel/systemtap/systemtap_git.inc
+++ b/meta/recipes-kernel/systemtap/systemtap_git.inc
@@ -1,6 +1,6 @@
1LICENSE = "GPLv2" 1LICENSE = "GPLv2"
2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 2LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
3SRCREV = "428f84e9e656bce71018e8902e4edb8aacafcc0e" 3SRCREV = "90ff34ac0506f0d5440393a4c78565f6aaf9b726"
4PV = "4.0" 4PV = "4.0"
5 5
6SRC_URI = "git://sourceware.org/git/systemtap.git \ 6SRC_URI = "git://sourceware.org/git/systemtap.git \