[ptxdist] [PATCH 1/2] ptxdist: really remove the logfile during distclean action

[ptxdist] [PATCH 1/2] ptxdist: really remove the logfile during distclean action

[Markus Heidelberg]

In contrast to "ptxdist clean", "ptxdist distclean" did not remove
$PTX_LOGFILE. The variable wasn't yet initialized when calling clean()
wherein the logfile should have been removed.

Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---


I'm unsure whether this is the right fix, but without it my description
of the next patch would be partly untrue.

Maybe it was a regression introduced in commit 9f8e963a2c6 ("ptxdist:
don't create the logfile until the platformdir is verified",
2014-02-23).


 bin/ptxdist | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bin/ptxdist b/bin/ptxdist
index 1503d2e33..08d7f03c4 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1798,6 +1798,7 @@ EOF
 			exit
 			;;
 		distclean)
+			setup_logfile &&
 			clean
 
 			echo "${PTXDIST_LOG_PROMPT}removing configuration links..."
-- 
2.43.0

[ptxdist] [PATCH 2/2] ptxdist: remove superfluous deletion of logs in distclean action

[Markus Heidelberg]

There is always a platform build directory, the logfile is not created
in BSP root ($PTXDIST_WORKSPACE/logfile) anymore since commit
83bf2580f8 ("[ptxdist] always use a platform dir", 2010-11-15).

Furthermore, $PTX_LOGFILE is already deleted in clean() invoked at the
beginning of the "distclean" action, so the whole rm command is
unnecessary.

Also remove "logfile" from ignore rules, it is only created in the
platform build directory of the BSP, not in the PTXdist tree.

Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
---
 .gitignore  | 2 --
 bin/ptxdist | 3 ---
 2 files changed, 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 50bfa5185..23623fdb5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,6 @@
 \#*#
 .\#*
 
-logfile
-
 /bin/*
 !/bin/ptxdist
 !/bin/ptxdist-auto-version
diff --git a/bin/ptxdist b/bin/ptxdist
index 08d7f03c4..1f561fdf6 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1815,9 +1815,6 @@ EOF
 				fi
 			done
 
-			echo "${PTXDIST_LOG_PROMPT}removing logs..."
-			rm -f -- "${PTX_LOGFILE}" "${PTXDIST_WORKSPACE}/logfile"
-
 			echo
 			exit
 			;;
-- 
2.43.0

Re: [ptxdist] [APPLIED] ptxdist: really remove the logfile during distclean action

[Michael Olbrich]

Thanks, applied as 23d7d9fecdf86ff22d1576e57eaf0add7e6fde96.

Michael

[sent from post-receive hook]

On Thu, 16 Jan 2025 17:09:40 +0100, Markus Heidelberg <m.heidelberg@cab.de> wrote:
> In contrast to "ptxdist clean", "ptxdist distclean" did not remove
> $PTX_LOGFILE. The variable wasn't yet initialized when calling clean()
> wherein the logfile should have been removed.
> 
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> Message-Id: <20250103150647.136289-1-m.heidelberg@cab.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/bin/ptxdist b/bin/ptxdist
> index 1503d2e33170..08d7f03c476b 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -1798,6 +1798,7 @@ EOF
>  			exit
>  			;;
>  		distclean)
> +			setup_logfile &&
>  			clean
>  
>  			echo "${PTXDIST_LOG_PROMPT}removing configuration links..."

Re: [ptxdist] [APPLIED] ptxdist: remove superfluous deletion of logs in distclean action

[Michael Olbrich]

Thanks, applied as 4db4d8ffe9dd2a78d938d8bd5fc3085219dbf5b7.

Michael

[sent from post-receive hook]

On Thu, 16 Jan 2025 17:09:40 +0100, Markus Heidelberg <m.heidelberg@cab.de> wrote:
> There is always a platform build directory, the logfile is not created
> in BSP root ($PTXDIST_WORKSPACE/logfile) anymore since commit
> 83bf2580f8 ("[ptxdist] always use a platform dir", 2010-11-15).
> 
> Furthermore, $PTX_LOGFILE is already deleted in clean() invoked at the
> beginning of the "distclean" action, so the whole rm command is
> unnecessary.
> 
> Also remove "logfile" from ignore rules, it is only created in the
> platform build directory of the BSP, not in the PTXdist tree.
> 
> Signed-off-by: Markus Heidelberg <m.heidelberg@cab.de>
> Message-Id: <20250103150647.136289-2-m.heidelberg@cab.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/.gitignore b/.gitignore
> index 50bfa5185269..23623fdb5806 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -13,8 +13,6 @@
>  \#*#
>  .\#*
>  
> -logfile
> -
>  /bin/*
>  !/bin/ptxdist
>  !/bin/ptxdist-auto-version
> diff --git a/bin/ptxdist b/bin/ptxdist
> index 08d7f03c476b..1f561fdf69c3 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -1815,9 +1815,6 @@ EOF
>  				fi
>  			done
>  
> -			echo "${PTXDIST_LOG_PROMPT}removing logs..."
> -			rm -f -- "${PTX_LOGFILE}" "${PTXDIST_WORKSPACE}/logfile"
> -
>  			echo
>  			exit
>  			;;