Loading...
bsd/dev/dtrace/scripts/Makefile xnu-12377.121.6 xnu-4570.71.2
--- xnu/xnu-12377.121.6/bsd/dev/dtrace/scripts/Makefile
+++ xnu/xnu-4570.71.2/bsd/dev/dtrace/scripts/Makefile
@@ -6,7 +6,7 @@
 include $(MakeInc_cmd)
 include $(MakeInc_def)
 
-INSTALL_DTRACE_MI_SCRIPTS_LIST =	\
+INSTALL_DTRACE_SCRIPTS_LIST =	\
 	darwin.d \
 	errno.d \
 	io.d \
@@ -19,42 +19,27 @@
 
 INSTALL_DTRACE_LIBEXEC_LIST = \
 	log_unnest_badness.d \
-	suspicious_task_vm_info_count.d \
-	vm_map_delete_permanent.d \
-	vm_map_delete_permanent_deny.d \
-	vm_map_delete_permanent_prot_none.d \
-	vm_object_ownership.d
+	vm_map_delete_permanent.d
 
 ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
-INSTALL_DTRACE_MI_SCRIPTS_LIST += mptcp.d
+INSTALL_DTRACE_SCRIPTS_LIST += mptcp.d
 endif
 
 
 ifeq ($(CURRENT_ARCH_CONFIG),ARM64)
-INSTALL_DTRACE_MD_SCRIPTS_LIST = regs_arm64.d ptrauth_arm64.d
-INSTALL_DTRACE_MD_DIR = arm64
+INSTALL_DTRACE_SCRIPTS_LIST += regs_arm64.d
 else ifeq ($(CURRENT_ARCH_CONFIG),ARM)
-INSTALL_DTRACE_MD_SCRIPTS_LIST = regs_arm.d
-INSTALL_DTRACE_MD_DIR = arm
+INSTALL_DTRACE_SCRIPTS_LIST += regs_arm.d
 else
-INSTALL_DTRACE_MD_SCRIPTS_LIST = regs_x86_64.d vmx_compat.d
-INSTALL_DTRACE_MD_DIR = x86_64
+INSTALL_DTRACE_SCRIPTS_LIST += regs_x86_64.d
 endif
 
-INSTALL_DTRACE_MI_SCRIPTS_FILES = \
-	$(addprefix $(DSTROOT)/$(INSTALL_DTRACE_SCRIPTS_DIR)/, $(INSTALL_DTRACE_MI_SCRIPTS_LIST))
+INSTALL_DTRACE_SCRIPTS_FILES = \
+	$(addprefix $(DSTROOT)/$(INSTALL_DTRACE_SCRIPTS_DIR)/, $(INSTALL_DTRACE_SCRIPTS_LIST))
 
-INSTALL_DTRACE_MD_SCRIPTS_FILES = \
-	$(addprefix $(DSTROOT)/$(INSTALL_DTRACE_SCRIPTS_DIR)/$(INSTALL_DTRACE_MD_DIR)/, $(INSTALL_DTRACE_MD_SCRIPTS_LIST))
-
-$(INSTALL_DTRACE_MD_SCRIPTS_FILES): $(DSTROOT)/$(INSTALL_DTRACE_SCRIPTS_DIR)/$(INSTALL_DTRACE_MD_DIR)/% : %
-	$(_v)$(MKDIR) $(DSTROOT)/$(INSTALL_DTRACE_SCRIPTS_DIR)/$(INSTALL_DTRACE_MD_DIR)
-	@$(LOG_INSTALL) $(@F)
-	$(_v)$(INSTALL) $(DATA_INSTALL_FLAGS) $< $@
-
-$(INSTALL_DTRACE_MI_SCRIPTS_FILES): $(DSTROOT)/$(INSTALL_DTRACE_SCRIPTS_DIR)/% : %
+$(INSTALL_DTRACE_SCRIPTS_FILES): $(DSTROOT)/$(INSTALL_DTRACE_SCRIPTS_DIR)/% : %
 	$(_v)$(MKDIR) $(DSTROOT)/$(INSTALL_DTRACE_SCRIPTS_DIR)
-	@$(LOG_INSTALL) $(@F)
+	@echo INSTALL $(@F)
 	$(_v)$(INSTALL) $(DATA_INSTALL_FLAGS) $< $@
 
 INSTALL_DTRACE_LIBEXEC_FILES = \
@@ -62,12 +47,10 @@
 
 $(INSTALL_DTRACE_LIBEXEC_FILES): $(DSTROOT)/$(INSTALL_DTRACE_LIBEXEC_DIR)/% : %
 	$(_v)$(MKDIR) $(DSTROOT)/$(INSTALL_DTRACE_LIBEXEC_DIR)
-	@$(LOG_INSTALL) $(@F)
+	@echo INSTALL $(@F)
 	$(_v)$(INSTALL) $(EXEC_INSTALL_FLAGS) $< $@
 
-do_textfiles_install_mi:: $(INSTALL_DTRACE_MI_SCRIPTS_FILES) $(INSTALL_DTRACE_LIBEXEC_FILES)
-
-do_textfiles_install_md:: $(INSTALL_DTRACE_MD_SCRIPTS_FILES)
+do_textfiles_install:: $(INSTALL_DTRACE_SCRIPTS_FILES) $(INSTALL_DTRACE_LIBEXEC_FILES)
 
 include $(MakeInc_rule)
 include $(MakeInc_dir)