From 562d60b004e3d7ae73c1c7508be529006bd6430f Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Mon, 23 Nov 2009 17:39:16 -0500
Subject: Ensure uprobes/Makefile never returns failure due to setting
 permissions. Ensure uprobes install directory has group 'stap-server'. Rename
 igid_in to in_group.

---
 runtime/uprobes/Makefile | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'runtime')

diff --git a/runtime/uprobes/Makefile b/runtime/uprobes/Makefile
index 443797b8..35942052 100644
--- a/runtime/uprobes/Makefile
+++ b/runtime/uprobes/Makefile
@@ -25,20 +25,26 @@ default:
 			fi \
 		done \
 	fi
-	-chgrp stap-server $(CLEAN_FILES) 2>/dev/null
-	-chmod 664 $(CLEAN_FILES) 2>/dev/null
-	-for d in $(CLEAN_DIRS); do \
-		chgrp stap-server $$d 2>/dev/null; \
-		chmod 775 $$d 2>/dev/null; \
-		for dd in `find $$d -type d`; do \
-			chgrp stap-server $$dd 2>/dev/null; \
-			chmod 775 $$dd 2>/dev/null; \
-		done; \
-		for f in `find $$d -type f`; do \
+	if getent group stap-server >/dev/null; then \
+		for f in $(CLEAN_FILES); do \
+			test ! -f $$f && continue; \
 			chgrp stap-server $$f 2>/dev/null; \
 			chmod 664 $$f 2>/dev/null; \
 		done; \
-	done
+		for d in $(CLEAN_DIRS); do \
+			test ! -d $$d && continue; \
+			chgrp stap-server $$d 2>/dev/null; \
+			chmod 775 $$d 2>/dev/null; \
+			for dd in `find $$d -type d`; do \
+				chgrp stap-server $$dd 2>/dev/null; \
+				chmod 775 $$dd 2>/dev/null; \
+			done; \
+			for f in `find $$d -type f`; do \
+				chgrp stap-server $$f 2>/dev/null; \
+				chmod 664 $$f 2>/dev/null; \
+			done; \
+		done; \
+	fi
 
 # This target is used with "make -q" to see whether a "real" build is needed.
 uprobes.ko: $(DEPENDENCIES)
-- 
cgit