1 files changed, 11 insertions, 36 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>
  staprun/Makefile.am | 12 ++++++------
  2 files changed, 13 insertions(+), 13 deletions(-)
 
-diff --git a/stapbpf/Makefile.am b/stapbpf/Makefile.am
-index 421b044ef..f7daeb2b2 100644
---- a/stapbpf/Makefile.am
-+++ b/stapbpf/Makefile.am
-@@ -39,11 +39,11 @@ git_version.stamp ../git_version.h:
+Index: git/stapbpf/Makefile.am
+===================================================================
+--- git.orig/stapbpf/Makefile.am
++++ git/stapbpf/Makefile.am
+@@ -41,10 +41,10 @@
  
  # Why the "id -u" condition?  This way, an unprivileged user can run
  # make install, and have "sudo stap ...." or "sudo stapbpf ...." work later.
 -install-exec-hook:
--       if [ `id -u` -eq 0 ]; then \
--               getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
--               getent group stapusr >/dev/null \
--               && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
+-       if [ `id -u` -eq 0 ] && (getent group stapusr >/dev/null \
+-                                || groupadd -f -g 156 -r stapusr); then \
+-               chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
 -               && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \
 -       fi
 +#install-exec-hook:
-+#      if [ `id -u` -eq 0 ]; then \
-+#              getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
-+#              getent group stapusr >/dev/null \
-+#              && chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
++##     if [ `id -u` -eq 0 ] && (getent group stapusr >/dev/null \
++##                              || groupadd -f -g 156 -r stapusr); then \
++##             chgrp stapusr "$(DESTDIR)$(bindir)/stapbpf" \
 +#              && chmod 04110 "$(DESTDIR)$(bindir)/stapbpf"; \
 +#      fi
  endif
-diff --git a/staprun/Makefile.am b/staprun/Makefile.am
-index 4073aa01c..2925e34c3 100644
---- a/staprun/Makefile.am
-+++ b/staprun/Makefile.am
-@@ -72,9 +72,9 @@ git_version.stamp ../git_version.h:
- 
- # Why the "id -u" condition?  This way, an unprivileged user can run
- # make install, and have "sudo stap ...." or "sudo staprun ...." work later.
--install-exec-hook:
--       if [ `id -u` -eq 0 ]; then \
--               getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
--               getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \
--               chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \
--       fi
-+#install-exec-hook:
-+#      if [ `id -u` -eq 0 ]; then \
-+#              getent group stapusr >/dev/null || groupadd -g 156 -r stapusr 2>/dev/null || groupadd -r stapusr; \
-+#              getent group stapusr >/dev/null && chgrp stapusr "$(DESTDIR)$(bindir)/staprun"; \
-+#              chmod 04110 "$(DESTDIR)$(bindir)/staprun"; \
-+#      fi
--- 
-2.11.0
-