[DistroKit] [PATCH 1/2] scripts: remove update-diffs scripts

[DistroKit] [PATCH 1/2] scripts: remove update-diffs scripts

[Roland Hieber]

The list of barebox packages in update-diffs-v7a.sh is outdated, and
config diffs are also used for platform-v7a_noneon. However these
scripts are no longer needed anyway since PTXdist 2023.07.0 commit
77d83105dc514354c65e introduced the 'oldconfig all' target.

Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=77d83105dc514354c65e
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 doc/intro.rst                |  6 +++---
 scripts/update-diffs-mips.sh | 14 --------------
 scripts/update-diffs-v7a.sh  | 14 --------------
 3 files changed, 3 insertions(+), 31 deletions(-)
 delete mode 100755 scripts/update-diffs-mips.sh
 delete mode 100755 scripts/update-diffs-v7a.sh

diff --git a/doc/intro.rst b/doc/intro.rst
index d07a238808f6..d91cc20508c3 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -128,9 +128,9 @@ platforms in DistroKit, for example::
 
    $ ./scripts/p-all migrate
 
-The *mips* and *v7a* platforms use config diffs for kernel and/or barebox packages.
-When touching their config files, you can use ``scripts/update-diffs-mips.sh`` and
-``scripts/update-diffs-v7a.sh`` respectively to update the config diffs.
+Some platforms use config diffs for kernel and/or barebox packages.
+When touching their config files, you can use ``ptxdist oldconfig all``
+to update the config files and keep them in sync.
 
 License
 -------
diff --git a/scripts/update-diffs-mips.sh b/scripts/update-diffs-mips.sh
deleted file mode 100755
index b1bdde395def..000000000000
--- a/scripts/update-diffs-mips.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ -z "$PTXDIST" ]; then
-	PTXDIST=ptxdist
-else
-	tput setaf 3 # yellow
-	echo Note: using PTXDIST=$PTXDIST
-	tput sgr 0   # back to normal
-fi
-
-PACKAGES="barebox-common barebox-ar9331 barebox-malta kernel kernel-ar9331 kernel-malta"
-for pkg in $PACKAGES; do
-	$PTXDIST --platformconfig="configs/platform-mips/platformconfig" oldconfig $pkg
-done
diff --git a/scripts/update-diffs-v7a.sh b/scripts/update-diffs-v7a.sh
deleted file mode 100755
index dad3081eb579..000000000000
--- a/scripts/update-diffs-v7a.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-if [ -z "$PTXDIST" ]; then
-	PTXDIST=ptxdist
-else
-	tput setaf 3 # yellow
-	echo Note: using PTXDIST=$PTXDIST
-	tput sgr 0   # back to normal
-fi
-
-BAREBOXES="barebox-common barebox-am335x barebox-mx6 barebox-rpi2 barebox-vexpress"
-for pkg in $BAREBOXES; do
-	$PTXDIST --platformconfig="configs/platform-v7a/platformconfig" oldconfig $pkg
-done
-- 
2.39.2

[DistroKit] [PATCH 2/2] doc: intro: update updating instructions

[Roland Hieber]

For a version update, the versioned PTXdist binary needs to be called
explicitly, otherwise just calling 'ptxdist' will use the PTXdist
version from the current ptxconfig, which will be a no-op.

Explain the purpose of scripts/p-all independently of updating.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 doc/intro.rst | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/doc/intro.rst b/doc/intro.rst
index d91cc20508c3..498d7160444c 100644
--- a/doc/intro.rst
+++ b/doc/intro.rst
@@ -122,10 +122,15 @@ Maintenance scripts
 Before sending your patch, you should run ``ptxdist lint`` and check its output.
 Your patch should not add any new lint errors.
 
-For migrating PTXdist to a new version, there is the wrapper script
-``scripts/p-all`` that runs PTXdist with the supplied arguments on all existing
-platforms in DistroKit, for example::
+The wrapper script ``scripts/p-all`` runs PTXdist with the supplied arguments on
+all existing platforms in DistroKit.
 
+To migrate DistroKit to a new PTXdist version, first update the *ptxconfig* by
+calling the new PTXdist version explicitely, then use ``scripts/p-all`` (which
+will use the PTXdist version from the updated ptxconfig) to update all
+*platformconfigs:*:
+
+   $ ptxdist-2024.08.0 migrate
    $ ./scripts/p-all migrate
 
 Some platforms use config diffs for kernel and/or barebox packages.
-- 
2.39.2

Re: [DistroKit] [PATCH 1/2] scripts: remove update-diffs scripts

[Robert Schwebel]

series applied to next

On Thu, Aug 08, 2024 at 02:58:23PM +0200, Roland Hieber wrote:
> The list of barebox packages in update-diffs-v7a.sh is outdated, and
> config diffs are also used for platform-v7a_noneon. However these
> scripts are no longer needed anyway since PTXdist 2023.07.0 commit
> 77d83105dc514354c65e introduced the 'oldconfig all' target.
> 
> Link: https://git.pengutronix.de/cgit/ptxdist/commit/?h=77d83105dc514354c65e
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  doc/intro.rst                |  6 +++---
>  scripts/update-diffs-mips.sh | 14 --------------
>  scripts/update-diffs-v7a.sh  | 14 --------------
>  3 files changed, 3 insertions(+), 31 deletions(-)
>  delete mode 100755 scripts/update-diffs-mips.sh
>  delete mode 100755 scripts/update-diffs-v7a.sh
> 
> diff --git a/doc/intro.rst b/doc/intro.rst
> index d07a238808f6..d91cc20508c3 100644
> --- a/doc/intro.rst
> +++ b/doc/intro.rst
> @@ -128,9 +128,9 @@ platforms in DistroKit, for example::
>  
>     $ ./scripts/p-all migrate
>  
> -The *mips* and *v7a* platforms use config diffs for kernel and/or barebox packages.
> -When touching their config files, you can use ``scripts/update-diffs-mips.sh`` and
> -``scripts/update-diffs-v7a.sh`` respectively to update the config diffs.
> +Some platforms use config diffs for kernel and/or barebox packages.
> +When touching their config files, you can use ``ptxdist oldconfig all``
> +to update the config files and keep them in sync.
>  
>  License
>  -------
> diff --git a/scripts/update-diffs-mips.sh b/scripts/update-diffs-mips.sh
> deleted file mode 100755
> index b1bdde395def..000000000000
> --- a/scripts/update-diffs-mips.sh
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -#!/bin/sh
> -
> -if [ -z "$PTXDIST" ]; then
> -	PTXDIST=ptxdist
> -else
> -	tput setaf 3 # yellow
> -	echo Note: using PTXDIST=$PTXDIST
> -	tput sgr 0   # back to normal
> -fi
> -
> -PACKAGES="barebox-common barebox-ar9331 barebox-malta kernel kernel-ar9331 kernel-malta"
> -for pkg in $PACKAGES; do
> -	$PTXDIST --platformconfig="configs/platform-mips/platformconfig" oldconfig $pkg
> -done
> diff --git a/scripts/update-diffs-v7a.sh b/scripts/update-diffs-v7a.sh
> deleted file mode 100755
> index dad3081eb579..000000000000
> --- a/scripts/update-diffs-v7a.sh
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -#!/bin/sh
> -
> -if [ -z "$PTXDIST" ]; then
> -	PTXDIST=ptxdist
> -else
> -	tput setaf 3 # yellow
> -	echo Note: using PTXDIST=$PTXDIST
> -	tput sgr 0   # back to normal
> -fi
> -
> -BAREBOXES="barebox-common barebox-am335x barebox-mx6 barebox-rpi2 barebox-vexpress"
> -for pkg in $BAREBOXES; do
> -	$PTXDIST --platformconfig="configs/platform-v7a/platformconfig" oldconfig $pkg
> -done
> -- 
> 2.39.2
> 
> 
> 

-- 
Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |