[cadcdev-svn-commits] [SCM] branch master updated. v2.0.0-981-g413df90

[ljsebald <ljs...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "A pseudo Operating System for the Dreamcast.".

The branch, master has been updated
       via  413df90b79485f3b86696af67cf145e5adea1a2e (commit)
       via  89b530b659cc74c467a1b956f3051aecc1282975 (commit)
      from  fa92fd20540f5560a976633bc394a286f272d9fd (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 413df90b79485f3b86696af67cf145e5adea1a2e
Merge: fa92fd2 89b530b
Author: Lawrence Sebald <ljs...@us...>
Date:   Thu Jul 6 17:37:58 2023 -0400

    Merge pull request #252 from KallistiOS/make_clean
    
    Relocate dc-chain patch stamps to source directory

commit 89b530b659cc74c467a1b956f3051aecc1282975
Author: darc <da...@pr...>
Date:   Tue Jun 27 19:24:56 2023 -0500

    Relocate dc-chain patch stamps to source directory

-----------------------------------------------------------------------

Summary of changes:
 utils/dc-chain/scripts/clean.mk | 5 +++--
 utils/dc-chain/scripts/patch.mk | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/utils/dc-chain/scripts/clean.mk b/utils/dc-chain/scripts/clean.mk
index 1175e29..15fe19c 100644
--- a/utils/dc-chain/scripts/clean.mk
+++ b/utils/dc-chain/scripts/clean.mk
@@ -7,12 +7,13 @@
 
 clean: clean-archives clean-downloads clean-builds clean_patches_stamp
 
+clean-keep-archives: clean-downloads clean-builds clean_patches_stamp
+
 clean_patches_stamp:
 	-@tmpdir=.tmp; \
 	if ! test -d "$${tmpdir}"; then \
 		mkdir "$${tmpdir}"; \
 	fi; \
-	mv patch-*.stamp $${tmpdir} 2>/dev/null; \
 	mv $(stamp_gdb_download) $${tmpdir} 2>/dev/null; \
 	mv $(stamp_gdb_patch) $${tmpdir} 2>/dev/null; \
 	rm -f *.stamp; \
@@ -30,7 +31,7 @@ clean-builds: clean_patches_stamp
 	-rm -rf build-$(gdb_name)
 
 clean-downloads: clean-gdb-sources clean-arm-sources clean-sh-sources
-	
+
 clean-gdb-sources:
 	-rm -rf $(gdb_name)
 
diff --git a/utils/dc-chain/scripts/patch.mk b/utils/dc-chain/scripts/patch.mk
index 71f04d6..8f86ab4 100644
--- a/utils/dc-chain/scripts/patch.mk
+++ b/utils/dc-chain/scripts/patch.mk
@@ -76,7 +76,7 @@ uname_s := $(shell uname -s)
 
 # This is a common 'patch_apply' function used in all the cases
 define patch_apply
-	@stamp_file=patch-$(stamp_radical_name).stamp; \
+	@stamp_file=$(src_dir)/$(patch_target_name)_patch.stamp; \
 	patches=$$(echo "$(diff_patches)" | xargs); \
 	if ! test -f "$${stamp_file}"; then \
 		if ! test -z "$${patches}"; then \


hooks/post-receive
-- 
A pseudo Operating System for the Dreamcast.