[ptxdist] [PATCH 1/2] ptxdist: introduce the "clean target" subcommand

[ptxdist] [PATCH 1/2] ptxdist: introduce the "clean target" subcommand

[Roland Hieber]

From: Roland Hieber <rhi@pengutronix.de>

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 bin/ptxdist           | 17 +++++++++++++++++
 doc/ref_parameter.inc |  6 ++++++
 2 files changed, 23 insertions(+)

diff --git a/bin/ptxdist b/bin/ptxdist
index f52a668d3..a7be5cb3e 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -963,6 +963,7 @@ Clean Actions:
 
   clean				cleanup build-host and build-cross dirs
   clean root			cleanup root directory for target
+  clean target			cleanup all target packages
   distclean			cleanup everything
 
 Misc:
@@ -1059,6 +1060,22 @@ clean() {
 		return
 	fi
 
+	# we want to clean all target packages
+	if [ "${1}" = "target" ]; then
+		if [ ! -n "${PTXDIST_FORCE}${PTXDIST_QUIET}${PTXCONF_SETUP_DIRECT_CLEAN}" ]; then
+			read -e -p "really clean all target packages? [y/N] " r
+			case "${r}" in
+				y|Y) ;;
+				*) exit 1 ;;
+			esac
+		fi
+		check_premake_compiler &&
+		pkgs=($(ptxd_make "/print-PACKAGES /print-EXTRA_PACKAGES /print-LAZY_PACKAGES")) &&
+		ptxd_make_log "${pkgs[@]/%/_clean}" &&
+		clean root
+		return
+	fi
+
 	# we want to clean a single package
 	if [ -n "${1}" ]; then
 		check_if_selected "${@}" &&
diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.inc
index 0b11563c9..4aecb0471 100644
--- a/doc/ref_parameter.inc
+++ b/doc/ref_parameter.inc
@@ -162,6 +162,12 @@ Clean Actions
   The ``clean root`` and ``go`` action is useful if the
   *targetinstall* stage for all packages should run again.
 
+``clean target``
+  this action will call the ``clean`` action for each target package,
+  and also clean the root file system afterwards.
+  This can be useful if you want to rebuild the target file system from
+  scratch, without throwing away the already built host and cross packages.
+
 ``clean <package>``
   this action will only clean the dedicated
   <package>. It will remove its build directory and all installed files
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/2] ptxdist: clean root should clean all image packages too

[Roland Hieber]

From: Roland Hieber <rhi@pengutronix.de>

The images are already removed by 'clean root', so the image packages
are built again anyways on the next build. Remove all left-over state
for the image packages too, as those files are now useless.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 bin/ptxdist           | 2 ++
 doc/ref_parameter.inc | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/ptxdist b/bin/ptxdist
index a7be5cb3e..007e496da 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -1041,6 +1041,8 @@ clean() {
 	# we want to clean the root dir
 	if [ "${1}" = "root" ]; then
 		echo
+		echo "${PTXDIST_LOG_PROMPT}cleaning image packages..."
+		rm -fr -- "${STATEDIR}"/image-*
 		echo "${PTXDIST_LOG_PROMPT}cleaning image directory..."
 		rm -fr -- "${IMAGEDIR}"
 		echo "${PTXDIST_LOG_PROMPT}cleaning root directory..."
diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.inc
index 4aecb0471..35e689722 100644
--- a/doc/ref_parameter.inc
+++ b/doc/ref_parameter.inc
@@ -154,7 +154,7 @@ Clean Actions
   This is a way to start a fresh build cycle.
 
 ``clean root``
-  this action will only clean the root filesystem
+  this action will only clean the image packages and the root filesystem
   directories. All the build directories are left untouched.
   After using this action, the next ``go`` action  will regenerate all opkg
   archives from the already built packages as well as the root filesystem
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/2] ptxdist: introduce the "clean target" subcommand

[Michael Olbrich]

On Fri, May 17, 2019 at 12:12:33PM +0200, Roland Hieber wrote:
> From: Roland Hieber <rhi@pengutronix.de>
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  bin/ptxdist           | 17 +++++++++++++++++
>  doc/ref_parameter.inc |  6 ++++++
>  2 files changed, 23 insertions(+)
> 
> diff --git a/bin/ptxdist b/bin/ptxdist
> index f52a668d3..a7be5cb3e 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -963,6 +963,7 @@ Clean Actions:
>  
>    clean				cleanup build-host and build-cross dirs
>    clean root			cleanup root directory for target
> +  clean target			cleanup all target packages
>    distclean			cleanup everything
>  
>  Misc:
> @@ -1059,6 +1060,22 @@ clean() {
>  		return
>  	fi
>  
> +	# we want to clean all target packages
> +	if [ "${1}" = "target" ]; then
> +		if [ ! -n "${PTXDIST_FORCE}${PTXDIST_QUIET}${PTXCONF_SETUP_DIRECT_CLEAN}" ]; then
> +			read -e -p "really clean all target packages? [y/N] " r
> +			case "${r}" in
> +				y|Y) ;;
> +				*) exit 1 ;;
> +			esac
> +		fi
> +		check_premake_compiler &&
> +		pkgs=($(ptxd_make "/print-PACKAGES /print-EXTRA_PACKAGES /print-LAZY_PACKAGES")) &&
> +		ptxd_make_log "${pkgs[@]/%/_clean}" &&
> +		clean root

Maybe move this section above the 'root' part. Then we can do a
'fall-through' instead of calling 'clean' recursively.

Michael

> +		return
> +	fi
> +
>  	# we want to clean a single package
>  	if [ -n "${1}" ]; then
>  		check_if_selected "${@}" &&
> diff --git a/doc/ref_parameter.inc b/doc/ref_parameter.inc
> index 0b11563c9..4aecb0471 100644
> --- a/doc/ref_parameter.inc
> +++ b/doc/ref_parameter.inc
> @@ -162,6 +162,12 @@ Clean Actions
>    The ``clean root`` and ``go`` action is useful if the
>    *targetinstall* stage for all packages should run again.
>  
> +``clean target``
> +  this action will call the ``clean`` action for each target package,
> +  and also clean the root file system afterwards.
> +  This can be useful if you want to rebuild the target file system from
> +  scratch, without throwing away the already built host and cross packages.
> +
>  ``clean <package>``
>    this action will only clean the dedicated
>    <package>. It will remove its build directory and all installed files
> -- 
> 2.20.1
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de