File netlabel_tools-0.20.diff of Package netlabel

Overview Repositories Revisions Requests Users Attributes Meta

File netlabel_tools-0.20.diff of Package netlabel (Revision 6de70e1dfb450656e41da14ba83ef121)

Currently displaying revision 6de70e1dfb450656e41da14ba83ef121 , Show latest

--- macros.mk
+++ macros.mk	2014/03/26 09:55:31
@@ -164,7 +164,7 @@ ARCHIVE += $(AR) -cru $@ $?;
 ifeq ($(V),0)
 	LINK_EXEC = @echo " LD $@";
 endif
-LINK_EXEC += $(GCC) $(LDFLAGS) -o $@ $^ $(LIBFLAGS);
+LINK_EXEC += $(GCC) -o $@ $^ $(LIBFLAGS) $(LDFLAGS); 
 
 ifeq ($(V),0)
 	LINK_LIB = @echo " LD $@" \
@@ -181,28 +181,22 @@ ifeq ($(V),0)
 	INSTALL_SBIN_MACRO = @echo " INSTALL $^ ($(INSTALL_SBIN_DIR))";
 endif
 INSTALL_SBIN_MACRO += \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
-			-d "$(INSTALL_SBIN_DIR)"; \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0755 \
-			$^ "$(INSTALL_SBIN_DIR)";
+		$(INSTALL) -d 0755 "$(INSTALL_SBIN_DIR)"; \
+		$(INSTALL) -m 0755 $^ "$(INSTALL_SBIN_DIR)";
 
 ifeq ($(V),0)
 	INSTALL_SYSD_MACRO = @echo " INSTALL $^ ($(INSTALL_SYSD_DIR))";
 endif
 INSTALL_SYSD_MACRO += \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
-			-d "$(INSTALL_SYSD_DIR)"; \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
-			$^ "$(INSTALL_SYSD_DIR)";
+		$(INSTALL) -d -m 0755 "$(INSTALL_SYSD_DIR)"; \
+		$(INSTALL) -m 0644 $^ "$(INSTALL_SYSD_DIR)";
 
 ifeq ($(V),0)
 	INSTALL_ETC_MACRO = @echo " INSTALL $^ ($(INSTALL_ETC_DIR))";
 endif
 INSTALL_ETC_MACRO += \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
-			-d "$(INSTALL_ETC_DIR)"; \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
-			$^ "$(INSTALL_ETC_DIR)";
+		$(INSTALL) -d -m 0755 "$(INSTALL_ETC_DIR)"; \
+		$(INSTALL) -m 0644 $^ "$(INSTALL_ETC_DIR)";
 
 ifeq ($(V),0)
 	INSTALL_LIB_MACRO = @echo " INSTALL $^ ($(INSTALL_LIB_DIR)/$^)";
@@ -210,10 +204,8 @@ endif
 INSTALL_LIB_MACRO += \
 		basename=$$(echo $^ | sed -e 's/.so.*$$/.so/'); \
 		soname=$$(objdump -p $^ | grep "SONAME" | awk '{print $$2}'); \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
-			-d "$(INSTALL_LIB_DIR)"; \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0755 \
-			$^ "$(INSTALL_LIB_DIR)"; \
+		$(INSTALL) -d -m 0755 "$(INSTALL_LIB_DIR)"; \
+		$(INSTALL) -m 0755 $^ "$(INSTALL_LIB_DIR)"; \
 		(cd "$(INSTALL_LIB_DIR)"; $(RM) $$soname); \
 		(cd "$(INSTALL_LIB_DIR)"; $(LN) -s $^ $$soname); \
 		(cd "$(INSTALL_LIB_DIR)"; $(RM) $$basname); \
@@ -225,30 +217,24 @@ ifeq ($(V),0)
 		  " ($(INSTALL_LIB_DIR)/pkgconfig)";
 endif
 INSTALL_PC_MACRO += \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
-			-d "$(INSTALL_LIB_DIR)/pkgconfig"; \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
-			"$$(cat /proc/$$$$/cmdline | awk '{print $$(NF)}')" \
+		$(INSTALL) -d  -m 0755 "$(INSTALL_LIB_DIR)/pkgconfig"; \
+		$(INSTALL) -m 0644 "$$(cat /proc/$$$$/cmdline | awk '{print $$(NF)}')" \
 			"$(INSTALL_LIB_DIR)/pkgconfig"; \#
 
 ifeq ($(V),0)
 	INSTALL_INC_MACRO = @echo " INSTALL $^ ($(INSTALL_INC_DIR))";
 endif
 INSTALL_INC_MACRO += \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
-			-d "$(INSTALL_INC_DIR)"; \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
-			$^ "$(INSTALL_INC_DIR)";
+		$(INSTALL) -d -m 0755 "$(INSTALL_INC_DIR)"; \
+		$(INSTALL) -m 0644 $^ "$(INSTALL_INC_DIR)";
 
 ifeq ($(V),0)
 	INSTALL_MAN8_MACRO = \
 		@echo " INSTALL manpages ($(INSTALL_MAN_DIR)/man8)";
 endif
 INSTALL_MAN8_MACRO += \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) \
-			-d "$(INSTALL_MAN_DIR)/man8"; \
-		$(INSTALL) -o $(INSTALL_OWNER) -g $(INSTALL_GROUP) -m 0644 \
-			$^ "$(INSTALL_MAN_DIR)/man8";
+		$(INSTALL) -d -m 0755 "$(INSTALL_MAN_DIR)/man8"; \
+		$(INSTALL) -m 0644 $^ "$(INSTALL_MAN_DIR)/man8";
 
 #
 # default build targets
--- netlabelctl/netlabel.service
+++ netlabelctl/netlabel.service	2014/03/26 10:03:22
@@ -3,7 +3,7 @@ Description=NetLabel Kernel Configuratio
 After=systemd-modules-load.service
 Before=network.target
 Before=libvirtd.service
-Before=NetworkManager.service
+Before=network.service
 
 [Service]
 Type=oneshot

Places

File netlabel_tools-0.20.diff of Package netlabel (Revision 6de70e1dfb450656e41da14ba83ef121)

Places