Rework setting of group and permissions on generated files and directories.

1 files changed, 21 insertions, 8 deletions

diff --git a/runtime/uprobes/Makefile b/runtime/uprobes/Makefile
index 3be92ff6..443797b8 100644
--- a/runtime/uprobes/Makefile
+++ b/runtime/uprobes/Makefile
@@ -9,6 +9,13 @@ CLEAN_FILES := $(shell echo *.mod.c *.ko *.o .*.cmd *~ *.sgn)
 CLEAN_FILES += Module.markers modules.order Module.symvers
 CLEAN_DIRS  := .tmp_versions
 
+# Build the module and sign it.
+# Make sure that all of the generated files belong the group stap-server
+# and are writable by that group. This is so that the stap-server service
+# can build or rebuild the module, if necessary.
+# If the chgrp and/or chmod commands fail, it is because we are not the
+# owner of the file for directory. In this case the file or directory
+# was created during a previous build and already has the correct permissions.
 default:
 	$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
 	if test -f ../../../../bin/stap-sign-module; then \
@@ -18,14 +25,20 @@ default:
 			fi \
 		done \
 	fi
-	if test `id -u` -eq 0; then \
-		for f in $(CLEAN_FILES); do \
-			test -e $$f && chgrp stap-server $$f && chmod 664 $$f; done; \
-		for d in $(CLEAN_DIRS); do \
-			test -d $$d && chgrp stap-server $$d && chmod 775 $$d; done \
-	fi
-	for d in $(CLEAN_DIRS); do \
-		test -d $$d && chgrp stap-server $$d/* && chmod 664 $$d/*; done;
+	-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 \
+			chgrp stap-server $$f 2>/dev/null; \
+			chmod 664 $$f 2>/dev/null; \
+		done; \
+	done
 
 # This target is used with "make -q" to see whether a "real" build is needed.
 uprobes.ko: $(DEPENDENCIES)