Make use of $(TAR_CMD) instead of tar.

Tested on x64 DSM 6.2.4 @ DSM 7.1
SynoCommunity · Jan 17, 2025 · cb64f40 · cb64f40
1 parent 979cb12
commit cb64f40
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/cross/dotnet8-runtime/Makefile b/cross/dotnet8-runtime/Makefile
@@ -35,4 +35,5 @@ include ../../mk/spksrc.install-resources.mk
 .PHONY: dotnet_runtime_custom_install
 dotnet_runtime_custom_install:
 	mkdir -p "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"
-	tar -cf - -C $(EXTRACT_PATH) . | tar -xf - -C "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"
+	$(TAR_CMD) -cf - -C $(EXTRACT_PATH) . | $(TAR_CMD) -xf - -C "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"
+
diff --git a/cross/dotnet9-runtime/Makefile b/cross/dotnet9-runtime/Makefile
@@ -35,4 +35,5 @@ include ../../mk/spksrc.install-resources.mk
 .PHONY: dotnet_runtime_custom_install
 dotnet_runtime_custom_install:
 	mkdir -p "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"
-	tar -cf - -C $(EXTRACT_PATH) . | tar -xf - -C "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"
+	$(TAR_CMD) -cf - -C $(EXTRACT_PATH) . | $(TAR_CMD) -xf - -C "$(INSTALL_DIR)/$(INSTALL_PREFIX)/share/dotnet/"
+
diff --git a/mk/spksrc.spk.mk b/mk/spksrc.spk.mk
@@ -330,7 +330,7 @@ $(DSM_LICENSE_FILE): $(LICENSE_FILE)
 $(WORK_DIR)/package.tgz: icon service
 	$(create_target_dir)
 	@[ -f $@ ] && rm $@ || true
-	(cd $(STAGING_DIR) && find . -mindepth 1 -maxdepth 1 -not -empty | tar cpzf $@ --owner=root --group=root --files-from=/dev/stdin)
+	(cd $(STAGING_DIR) && find . -mindepth 1 -maxdepth 1 -not -empty | $(TAR_CMD) cpzf $@ --owner=root --group=root --files-from=/dev/stdin)
 
 DSM_SCRIPTS = $(addprefix $(DSM_SCRIPTS_DIR)/,$(DSM_SCRIPT_FILES))
 
@@ -486,7 +486,7 @@ endif
 
 $(SPK_FILE_NAME): $(WORK_DIR)/package.tgz $(WORK_DIR)/INFO info-checksum icons service $(DSM_SCRIPTS) wizards $(DSM_LICENSE) conf
 	$(create_target_dir)
-	(cd $(WORK_DIR) && tar cpf $@ --group=root --owner=root $(SPK_CONTENT))
+	(cd $(WORK_DIR) && $(TAR_CMD) cpf $@ --group=root --owner=root $(SPK_CONTENT))
 
 package: $(SPK_FILE_NAME)