[ptxdist] [PATCH v2 1/6] platform: bump default toolchain version

[ptxdist] [PATCH v2 1/6] platform: bump default toolchain version

[Roland Hieber]

Provide reasonably recent default values for new platforms.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 v2: no changes

 platforms/toolchain.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/platforms/toolchain.in b/platforms/toolchain.in
index 026e4395c3ad..86e624329afd 100644
--- a/platforms/toolchain.in
+++ b/platforms/toolchain.in
@@ -5,7 +5,7 @@ menu "toolchain                     "
 config CROSSCHAIN_VENDOR
 	string
 	prompt "check for specific toolchain vendor"
-	default "OSELAS.Toolchain-2019.09"
+	default "OSELAS.Toolchain-2020.08"
 	help
 	  Add here an unique vendor string to ensure this project will
 	  be build with the correct toolchain.
@@ -19,7 +19,7 @@ config CROSSCHAIN_VENDOR
 config CROSSCHAIN_CHECK
 	string
 	prompt "check for specific gcc version"
-	default "9.2.1"
+	default "10.2.1"
 	help
 	  PTXdist calls your cross compiler with -dumpversion and
 	  compares the output with this string. This should help
@@ -47,7 +47,7 @@ if LIBC_GLIBC
 config GLIBC_VERSION
 	string
 	prompt "glibc version"
-	default "2.30"
+	default "2.32"
 	help
 	  Specify the glibc version this BSP shall be built with. This information
 	  is used to guess the toolchain path if you use "ptxdist toolchain"
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 2/6] kernel, barebox: add descriptive help text for config options

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 v2: also add a help text for KERNEL_VERSION

 platforms/barebox.in     | 3 +++
 platforms/barebox_mlo.in | 3 +++
 platforms/kernel.in      | 6 ++++++
 3 files changed, 12 insertions(+)

diff --git a/platforms/barebox.in b/platforms/barebox.in
index 526d7ede42ad..70d175fb5a03 100644
--- a/platforms/barebox.in
+++ b/platforms/barebox.in
@@ -30,6 +30,9 @@ config BAREBOX_VERSION
 config BAREBOX_MD5
 	prompt "barebox source md5sum"
 	string
+	help
+	  To ensure integrity of the downloaded source tarball, fill in its
+	  MD5 sum here.
 
 config BAREBOX_CONFIG
 	prompt "config file"
diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in
index 8cdea75f7567..cb7dac1ec9ba 100644
--- a/platforms/barebox_mlo.in
+++ b/platforms/barebox_mlo.in
@@ -19,6 +19,9 @@ config BAREBOX_MLO_MD5
 	prompt "barebox source md5sum"		if !BAREBOX
 	string
 	default "${PTXCONF_BAREBOX_MD5}"	if BAREBOX
+	help
+	  To ensure integrity of the downloaded source tarball, fill in its
+	  MD5 sum here.
 
 config BAREBOX_MLO_ARCH_STRING
 	string
diff --git a/platforms/kernel.in b/platforms/kernel.in
index 34d05c825929..4052cd7a02b1 100644
--- a/platforms/kernel.in
+++ b/platforms/kernel.in
@@ -42,10 +42,16 @@ config KERNEL_VERSION
 	prompt "kernel version"
 	string
 	default "4.15"
+	help
+	  Fill in the kernel version that you want to use. Normally, you should
+	  use the latest stable version, see <https://kernel.org>.
 
 config KERNEL_MD5
 	prompt "kernel source md5sum"
 	string
+	help
+	  To ensure integrity of the downloaded source tarball, fill in its
+	  MD5 sum here.
 
 choice
 	prompt "Image Type          "
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] kernel, barebox: add descriptive help text for config options

[Michael Olbrich]

Thanks, applied as e34a49e568adaaba5a6625157e8d053cf04bfd7a.

Michael

[sent from post-receive hook]

On Wed, 14 Oct 2020 12:30:46 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200922092901.30715-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/barebox.in b/platforms/barebox.in
> index 526d7ede42ad..70d175fb5a03 100644
> --- a/platforms/barebox.in
> +++ b/platforms/barebox.in
> @@ -30,6 +30,9 @@ config BAREBOX_VERSION
>  config BAREBOX_MD5
>  	prompt "barebox source md5sum"
>  	string
> +	help
> +	  To ensure integrity of the downloaded source tarball, fill in its
> +	  MD5 sum here.
>  
>  config BAREBOX_CONFIG
>  	prompt "config file"
> diff --git a/platforms/barebox_mlo.in b/platforms/barebox_mlo.in
> index 8cdea75f7567..cb7dac1ec9ba 100644
> --- a/platforms/barebox_mlo.in
> +++ b/platforms/barebox_mlo.in
> @@ -19,6 +19,9 @@ config BAREBOX_MLO_MD5
>  	prompt "barebox source md5sum"		if !BAREBOX
>  	string
>  	default "${PTXCONF_BAREBOX_MD5}"	if BAREBOX
> +	help
> +	  To ensure integrity of the downloaded source tarball, fill in its
> +	  MD5 sum here.
>  
>  config BAREBOX_MLO_ARCH_STRING
>  	string
> diff --git a/platforms/kernel.in b/platforms/kernel.in
> index 30b70f28349b..68899c0f7dcc 100644
> --- a/platforms/kernel.in
> +++ b/platforms/kernel.in
> @@ -42,10 +42,16 @@ config KERNEL_VERSION
>  	prompt "kernel version"
>  	string
>  	default "4.15"
> +	help
> +	  Fill in the kernel version that you want to use. Normally, you should
> +	  use the latest stable version, see <https://kernel.org>.
>  
>  config KERNEL_MD5
>  	prompt "kernel source md5sum"
>  	string
> +	help
> +	  To ensure integrity of the downloaded source tarball, fill in its
> +	  MD5 sum here.
>  
>  choice
>  	prompt "Image Type          "

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 3/6] image-root-tgz: add a help text

[Roland Hieber]

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 v2: no changes

 platforms/image-root-tgz.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platforms/image-root-tgz.in b/platforms/image-root-tgz.in
index c325209ded6d..797efd4b423b 100644
--- a/platforms/image-root-tgz.in
+++ b/platforms/image-root-tgz.in
@@ -4,7 +4,7 @@ menuconfig IMAGE_ROOT_TGZ
 	tristate
 	prompt "Generate images/root.tgz      "
 	help
-	  FIXME
+	  Build a tar.gz archive containing the root file system.
 
 if IMAGE_ROOT_TGZ
 
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] image-root-tgz: add a help text

[Michael Olbrich]

Thanks, applied as 7e328a6c0c0c41b4395d6bbcd42ac797ef9cb67d.

Michael

[sent from post-receive hook]

On Wed, 14 Oct 2020 12:30:47 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200922092901.30715-3-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/image-root-tgz.in b/platforms/image-root-tgz.in
> index c325209ded6d..797efd4b423b 100644
> --- a/platforms/image-root-tgz.in
> +++ b/platforms/image-root-tgz.in
> @@ -4,7 +4,7 @@ menuconfig IMAGE_ROOT_TGZ
>  	tristate
>  	prompt "Generate images/root.tgz      "
>  	help
> -	  FIXME
> +	  Build a tar.gz archive containing the root file system.
>  
>  if IMAGE_ROOT_TGZ
>  

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 4/6] ptxdist: implement 'defconfig' commands for kconfig packages

[Roland Hieber]

The current process to generate a kernel .config file from a defconfig
is a bit cumbersome:

  $ ptxdist extract kernel
  $ cd platform-foo/build-target/linux-<version>
  $ make ARCH=... CROSS_COMPILE=... foo_defconfig
  $ cp .config ../../../configs/platform-foo/kernelconfig

All kernel and barebox rules and templates already support the
<package>_%config target since commit b0f9f2fe33ca9027a554 (2020-08-07,
"barebox, kernel: enable use of {allyes, allno, allmod, alldef,
rand}config"), so we only need to wire them into the command line
parser, and then we can easily get a defconfig like this:

  $ ptxdist defconfig kernel                # most ARCHs
  $ ptxdist imx_v6_v7_defconfig kernel      # e.g. with ARCH=arm

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 * v2: fix <pkg> in help text, it's not an optional parameter

 bin/ptxdist           | 15 ++++++++++++++-
 doc/ref_parameter.rst |  9 +++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/bin/ptxdist b/bin/ptxdist
index 0d5e4328e1d6..000879f45187 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -705,6 +705,9 @@ Setup and Project Actions:
 
   menuconfig barebox		configure the bootloader Barebox
 
+  [<prefix>]defconfig <pkg>	generate a default config file for <pkg>
+				e.g.: ptxdist multi_v7_defconfig kernel
+
   oldconfig			run 'make oldconfig' on ptxconfig file
   allmodconfig			run 'make allmodconfig' on ptxconfig file
   allyesconfig			run 'make allyesconfig' on ptxconfig file
@@ -1267,6 +1270,16 @@ do_config()
 	case "${config}" in
 	menuconfig|nconfig|oldconfig|all*config|randconfig)
 		;;
+	*defconfig)
+		case "${part}" in
+			"ptx"|"ptxdist"|""|"setup"|"platform"|"board"|"user"|"collection")
+				echo
+				echo "${PTXDIST_LOG_PROMPT}error: cannot do a '${config}' for part '${part}'"
+				echo
+				exit 1
+				;;
+		esac
+		;;
 	*)
 		echo
 		echo "${PTXDIST_LOG_PROMPT}error: invalid use of '${FUNCNAME} ${@}'"
@@ -1625,7 +1638,7 @@ parse_second()
 
 ######## *config, *setup, toolchain
 
-		menuconfig|nconfig|oldconfig|allmodconfig|allyesconfig|allnoconfig|alldefconfig|randconfig)
+		menuconfig|nconfig|oldconfig|allmodconfig|allyesconfig|allnoconfig|*defconfig|randconfig)
 			do_config "${cmd}" "${@}"
 			exit
 			;;
diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
index 1d54fa4b4428..cac35cddb5ac 100644
--- a/doc/ref_parameter.rst
+++ b/doc/ref_parameter.rst
@@ -95,6 +95,15 @@ Setup and Project Actions
   functionality as ``menuconfig``. It can be used instead of ``menuconfig``
   for all the component described above.
 
+``[<prefix>]defconfig <package>``
+  generate a default config file for kconfig-based packages (kernel, barebox).
+  The ``[<prefix>]`` can be given optionally to use a specific defconfig file,
+  which depends on the respective package and the architecture.
+  Examples::
+
+    $ ptxdist defconfig kernel                # most ARCHs
+    $ ptxdist imx_v6_v7_defconfig kernel      # e.g. for ARCH=arm
+
 ``oldconfig [<component>]``, ``allmodconfig [<component>]``, ``allyesconfig [<component>]``, ``allnoconfig [<component>]``, ``alldefconfig [<component>]``, ``randconfig [<component>]``
   this action will run the corresponding kconfig action for the specified
   component. ``oldconfig`` will prompt for all new options.
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH v2 4/6] ptxdist: implement 'defconfig' commands for kconfig packages

[Alexander Dahl]

Hei Roland,

Am Dienstag, 22. September 2020, 11:28:59 CEST schrieb Roland Hieber:
> The current process to generate a kernel .config file from a defconfig
> is a bit cumbersome:
> 
>   $ ptxdist extract kernel
>   $ cd platform-foo/build-target/linux-<version>
>   $ make ARCH=... CROSS_COMPILE=... foo_defconfig
>   $ cp .config ../../../configs/platform-foo/kernelconfig

What about the following?

	$ ptxdist extract kernel
	$ cp platform-foo/build-target/linux-<version>/arch/arm/configs/
bar_defconfig configs/platform-foo/kernelconfig
	$ ptxdist oldconfig kernel

> All kernel and barebox rules and templates already support the
> <package>_%config target since commit b0f9f2fe33ca9027a554 (2020-08-07,
> "barebox, kernel: enable use of {allyes, allno, allmod, alldef,
> rand}config"), so we only need to wire them into the command line
> parser, and then we can easily get a defconfig like this:
> 
>   $ ptxdist defconfig kernel                # most ARCHs
>   $ ptxdist imx_v6_v7_defconfig kernel      # e.g. with ARCH=arm

This looks somehow like a weird syntax, but I have no idea for a better one. 
:-/

What about U-Boot?  Currently there's PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY and 
you can just use a defconfig name in there.

(That was actually not supposed to target defconfig in particular, but the pre 
kconfig U-Boot config mechanism, but it also works for recent U-Boot 
defconfigs.)

Greets
Alex

> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  * v2: fix <pkg> in help text, it's not an optional parameter
> 
>  bin/ptxdist           | 15 ++++++++++++++-
>  doc/ref_parameter.rst |  9 +++++++++
>  2 files changed, 23 insertions(+), 1 deletion(-)
> 
> diff --git a/bin/ptxdist b/bin/ptxdist
> index 0d5e4328e1d6..000879f45187 100755
> --- a/bin/ptxdist
> +++ b/bin/ptxdist
> @@ -705,6 +705,9 @@ Setup and Project Actions:
> 
>    menuconfig barebox		configure the bootloader Barebox
> 
> +  [<prefix>]defconfig <pkg>	generate a default config file for <pkg>
> +				e.g.: ptxdist multi_v7_defconfig kernel
> +
>    oldconfig			run 'make oldconfig' on ptxconfig file
>    allmodconfig			run 'make allmodconfig' on ptxconfig file
>    allyesconfig			run 'make allyesconfig' on ptxconfig file
> @@ -1267,6 +1270,16 @@ do_config()
>  	case "${config}" in
>  	menuconfig|nconfig|oldconfig|all*config|randconfig)
>  		;;
> +	*defconfig)
> +		case "${part}" in
> +			"ptx"|"ptxdist"|""|"setup"|"platform"|"board"|"user"|"collection")
> +				echo
> +				echo "${PTXDIST_LOG_PROMPT}error: cannot do a '${config}' for part
> '${part}'" +				echo
> +				exit 1
> +				;;
> +		esac
> +		;;
>  	*)
>  		echo
>  		echo "${PTXDIST_LOG_PROMPT}error: invalid use of '${FUNCNAME} ${@}'"
> @@ -1625,7 +1638,7 @@ parse_second()
> 
>  ######## *config, *setup, toolchain
> 
> -		menuconfig|nconfig|oldconfig|allmodconfig|allyesconfig|allnoconfig|
alldef
> config|randconfig)
> +		menuconfig|nconfig|oldconfig|allmodconfig|allyesconfig|allnoconfig|*defc
> onfig|randconfig) do_config "${cmd}" "${@}"
>  			exit
>  			;;
> diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
> index 1d54fa4b4428..cac35cddb5ac 100644
> --- a/doc/ref_parameter.rst
> +++ b/doc/ref_parameter.rst
> @@ -95,6 +95,15 @@ Setup and Project Actions
>    functionality as ``menuconfig``. It can be used instead of ``menuconfig``
> for all the component described above.
> 
> +``[<prefix>]defconfig <package>``
> +  generate a default config file for kconfig-based packages (kernel,
> barebox). +  The ``[<prefix>]`` can be given optionally to use a specific
> defconfig file, +  which depends on the respective package and the
> architecture.
> +  Examples::
> +
> +    $ ptxdist defconfig kernel                # most ARCHs
> +    $ ptxdist imx_v6_v7_defconfig kernel      # e.g. for ARCH=arm
> +
>  ``oldconfig [<component>]``, ``allmodconfig [<component>]``, ``allyesconfig
> [<component>]``, ``allnoconfig [<component>]``, ``alldefconfig
> [<component>]``, ``randconfig [<component>]`` this action will run the
> corresponding kconfig action for the specified component. ``oldconfig``
> will prompt for all new options.





_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [PATCH v2 4/6] ptxdist: implement 'defconfig' commands for kconfig packages

[Michael Olbrich]

On Mon, Sep 28, 2020 at 03:34:45PM +0200, Alexander Dahl wrote:
> Hei Roland,
> 
> Am Dienstag, 22. September 2020, 11:28:59 CEST schrieb Roland Hieber:
> > The current process to generate a kernel .config file from a defconfig
> > is a bit cumbersome:
> > 
> >   $ ptxdist extract kernel
> >   $ cd platform-foo/build-target/linux-<version>
> >   $ make ARCH=... CROSS_COMPILE=... foo_defconfig
> >   $ cp .config ../../../configs/platform-foo/kernelconfig
> 
> What about the following?
> 
> 	$ ptxdist extract kernel
> 	$ cp platform-foo/build-target/linux-<version>/arch/arm/configs/
> bar_defconfig configs/platform-foo/kernelconfig
> 	$ ptxdist oldconfig kernel
> 
> > All kernel and barebox rules and templates already support the
> > <package>_%config target since commit b0f9f2fe33ca9027a554 (2020-08-07,
> > "barebox, kernel: enable use of {allyes, allno, allmod, alldef,
> > rand}config"), so we only need to wire them into the command line
> > parser, and then we can easily get a defconfig like this:
> > 
> >   $ ptxdist defconfig kernel                # most ARCHs
> >   $ ptxdist imx_v6_v7_defconfig kernel      # e.g. with ARCH=arm
> 
> This looks somehow like a weird syntax, but I have no idea for a better one. 
> :-/

Hmm, I agree that this looks weird. And having a wildcard for a ptxdist
command is not something that I want. Maybe:

ptxdist defconfig kernel imx_v6_v7

Michael

> What about U-Boot?  Currently there's PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY and 
> you can just use a defconfig name in there.
> 
> (That was actually not supposed to target defconfig in particular, but the pre 
> kconfig U-Boot config mechanism, but it also works for recent U-Boot 
> defconfigs.)
> 
> Greets
> Alex
> 
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> >  * v2: fix <pkg> in help text, it's not an optional parameter
> > 
> >  bin/ptxdist           | 15 ++++++++++++++-
> >  doc/ref_parameter.rst |  9 +++++++++
> >  2 files changed, 23 insertions(+), 1 deletion(-)
> > 
> > diff --git a/bin/ptxdist b/bin/ptxdist
> > index 0d5e4328e1d6..000879f45187 100755
> > --- a/bin/ptxdist
> > +++ b/bin/ptxdist
> > @@ -705,6 +705,9 @@ Setup and Project Actions:
> > 
> >    menuconfig barebox		configure the bootloader Barebox
> > 
> > +  [<prefix>]defconfig <pkg>	generate a default config file for <pkg>
> > +				e.g.: ptxdist multi_v7_defconfig kernel
> > +
> >    oldconfig			run 'make oldconfig' on ptxconfig file
> >    allmodconfig			run 'make allmodconfig' on ptxconfig file
> >    allyesconfig			run 'make allyesconfig' on ptxconfig file
> > @@ -1267,6 +1270,16 @@ do_config()
> >  	case "${config}" in
> >  	menuconfig|nconfig|oldconfig|all*config|randconfig)
> >  		;;
> > +	*defconfig)
> > +		case "${part}" in
> > +			"ptx"|"ptxdist"|""|"setup"|"platform"|"board"|"user"|"collection")
> > +				echo
> > +				echo "${PTXDIST_LOG_PROMPT}error: cannot do a '${config}' for part
> > '${part}'" +				echo
> > +				exit 1
> > +				;;
> > +		esac
> > +		;;
> >  	*)
> >  		echo
> >  		echo "${PTXDIST_LOG_PROMPT}error: invalid use of '${FUNCNAME} ${@}'"
> > @@ -1625,7 +1638,7 @@ parse_second()
> > 
> >  ######## *config, *setup, toolchain
> > 
> > -		menuconfig|nconfig|oldconfig|allmodconfig|allyesconfig|allnoconfig|
> alldef
> > config|randconfig)
> > +		menuconfig|nconfig|oldconfig|allmodconfig|allyesconfig|allnoconfig|*defc
> > onfig|randconfig) do_config "${cmd}" "${@}"
> >  			exit
> >  			;;
> > diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
> > index 1d54fa4b4428..cac35cddb5ac 100644
> > --- a/doc/ref_parameter.rst
> > +++ b/doc/ref_parameter.rst
> > @@ -95,6 +95,15 @@ Setup and Project Actions
> >    functionality as ``menuconfig``. It can be used instead of ``menuconfig``
> > for all the component described above.
> > 
> > +``[<prefix>]defconfig <package>``
> > +  generate a default config file for kconfig-based packages (kernel,
> > barebox). +  The ``[<prefix>]`` can be given optionally to use a specific
> > defconfig file, +  which depends on the respective package and the
> > architecture.
> > +  Examples::
> > +
> > +    $ ptxdist defconfig kernel                # most ARCHs
> > +    $ ptxdist imx_v6_v7_defconfig kernel      # e.g. for ARCH=arm
> > +
> >  ``oldconfig [<component>]``, ``allmodconfig [<component>]``, ``allyesconfig
> > [<component>]``, ``allnoconfig [<component>]``, ``alldefconfig
> > [<component>]``, ``randconfig [<component>]`` this action will run the
> > corresponding kconfig action for the specified component. ``oldconfig``
> > will prompt for all new options.
> 
> 
> 
> 
> 
> _______________________________________________
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 5/6] rules: move magic symbol into rules/ptxdist-version.in

[Roland Hieber]

Inspired by platforms/platform.in, this makes it possible to re-use the
magic symbol in a slimmed-down kconfig menu.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 v2: no changes

 rules/Kconfig            | 5 -----
 rules/ptxdist-version.in | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules/Kconfig b/rules/Kconfig
index 1e40b5b08298..de3156c256ed 100644
--- a/rules/Kconfig
+++ b/rules/Kconfig
@@ -5,11 +5,6 @@
 
 source "generated/ptxdist_version.in"
 
-config _ptxconfig_MAGIC__
-	bool
-	option modules
-	default y
-
 comment "--------- Host Options -------------"
 
 menu "PTXdist Options               "
diff --git a/rules/ptxdist-version.in b/rules/ptxdist-version.in
index af4907e8f26a..8ab8bcaaac73 100644
--- a/rules/ptxdist-version.in
+++ b/rules/ptxdist-version.in
@@ -3,3 +3,8 @@
 config CONFIGFILE_VERSION
 	string
 	default "$(PTXDIST_VERSION_FULL)"
+
+config _ptxconfig_MAGIC__
+	bool
+	option modules
+	default y
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] rules: move magic symbol into rules/ptxdist-version.in

[Michael Olbrich]

Thanks, applied as 017223f96d1c10098ab3a0f9be5a7afc9184ce75.

Michael

[sent from post-receive hook]

On Wed, 14 Oct 2020 12:30:47 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Inspired by platforms/platform.in, this makes it possible to re-use the
> magic symbol in a slimmed-down kconfig menu.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200922092901.30715-5-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/Kconfig b/rules/Kconfig
> index 1e40b5b08298..de3156c256ed 100644
> --- a/rules/Kconfig
> +++ b/rules/Kconfig
> @@ -5,11 +5,6 @@
>  
>  source "generated/ptxdist_version.in"
>  
> -config _ptxconfig_MAGIC__
> -	bool
> -	option modules
> -	default y
> -
>  comment "--------- Host Options -------------"
>  
>  menu "PTXdist Options               "
> diff --git a/rules/ptxdist-version.in b/rules/ptxdist-version.in
> index af4907e8f26a..8ab8bcaaac73 100644
> --- a/rules/ptxdist-version.in
> +++ b/rules/ptxdist-version.in
> @@ -3,3 +3,8 @@
>  config CONFIGFILE_VERSION
>  	string
>  	default "$(PTXDIST_VERSION_FULL)"
> +
> +config _ptxconfig_MAGIC__
> +	bool
> +	option modules
> +	default y

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

[ptxdist] [PATCH v2 6/6] ptxdist: add 'init' commands to create new configs

[Roland Hieber]

The goal here is to give users a way to create a working BSP or platform
from scratch by asking only a minimal set of relevant questions and
letting the user press Enter about 15 times, instead of asking every
question in the whole platform and ptxconfig menu, which would require
pressing Enter about 428 times.

For that, we create two separate Kconfig menus, rules/Kconfig-init for
the ptxconfig, and platforms/Kconfig-init for the platformconfig, which
include only the relevant .in files from the full menus. Still, some
options from these .in files can be set to reasonable defaults for new
BSPs or platforms, which is done with two new defconfig files instead of
further outsourcing the relevant config options into single .in files.

With the 'init' subcommand, PTXdist first creates a standard directory
structure under configs/ if necessary, then creates a minimal config
file from the respective defconfig, and finally calls kconfig on the
respective Kconfig-init menu, asking the user for the remaining config
options. A silenced oldconfig run on the full menu file then takes care
to set all other config options to their defaults.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 * v2: add IMAGE_ROOT_TGZ to platforms/init_defconfig

 bin/ptxdist                     | 46 ++++++++++++++++
 doc/ref_parameter.rst           |  5 ++
 platforms/Kconfig-init          | 13 +++++
 platforms/init_defconfig        | 19 +++++++
 rules/Kconfig-init              | 62 +++++++++++++++++++++
 rules/init_defconfig            | 21 ++++++++
 rules/initmethod.in             |  3 ++
 scripts/lib/ptxd_lib_init.sh    | 96 +++++++++++++++++++++++++++++++++
 scripts/lib/ptxd_lib_kconfig.sh | 10 ++++
 9 files changed, 275 insertions(+)
 create mode 100644 platforms/Kconfig-init
 create mode 100644 platforms/init_defconfig
 create mode 100644 rules/Kconfig-init
 create mode 100644 rules/init_defconfig
 create mode 100644 scripts/lib/ptxd_lib_init.sh

diff --git a/bin/ptxdist b/bin/ptxdist
index 000879f45187..a2aabb6193ad 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -687,6 +687,9 @@ PTXdist $(printf "%-24s" ${PTXDIST_VERSION_FULL}) Build System for Embedded Linu
 
 Setup and Project Actions:
 
+  init [<platformname>]		initialise a new BSP in the current directory
+  init platform [<name>]	initialise a new platform in the current BSP
+
   menu				enter main control menu
 
   setup				setup per-user preferences
@@ -1803,6 +1806,49 @@ EOF
 			do_${cmd}
 			exit
 			;;
+		init)
+			local do_ptxconfig=1
+			if [ "$1" = "platform" ]; then
+				shift
+				do_ptxconfig=
+			fi
+
+			local platform="$1"
+			if [ -z "$platform" ]; then
+				echo
+				echo "${PTXDIST_LOG_PROMPT}error: Please specify a platform name."
+				echo
+				exit 1
+			fi
+
+			PTXDIST_PLATFORMCONFIG="configs/platform-${platform}/platformconfig"
+			PTXDIST_PTXCONFIG="configs/ptxconfig"
+
+			# abort early
+			ptxd_lib_init_platform_check &&
+			if [ -n "$do_ptxconfig" ]; then
+				ptxd_lib_init_check
+			fi &&
+
+			ptxd_lib_init_platform "${platform}" &&
+			if [ -n "$do_ptxconfig" ]; then
+				ptxd_lib_init
+			fi &&
+
+			if [ -n "$do_ptxconfig" ]; then
+				ptxd_dialog_msgbox \
+					"Adapt the new BSP to your needs by running:\n\n" \
+					"    ptxdist menuconfig\n" \
+					"    ptxdist menuconfig platform\n" \
+					"    ptxdist menuconfig kernel"
+			else
+				ptxd_dialog_msgbox \
+					"Adapt the new platform to your needs by running:\n\n" \
+					"    ptxdist menuconfig platform\n" \
+					"    ptxdist menuconfig kernel"
+			fi
+			exit
+			;;
 		image)
 			PTXDIST_OPTIMIZE_IO=true
 			if [ ${#} -eq 0 ]; then
diff --git a/doc/ref_parameter.rst b/doc/ref_parameter.rst
index cac35cddb5ac..7df33a64fa8f 100644
--- a/doc/ref_parameter.rst
+++ b/doc/ref_parameter.rst
@@ -12,6 +12,11 @@ PTXdist is a command line tool, which is basically called as:
 Setup and Project Actions
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
+``init <platformname>``, ``init platform <platformname>``
+  initialise a new BSP in the current directory, or add a new platform to the
+  current BSP. This action creates all required config files, and then calls
+  *menuconfig* on them, and can be used to start a new BSP from scratch.
+
 ``menu``
   this starts a dialog based frontend for those who do not like typing
   commands. It will gain us access to the most common parameters to
diff --git a/platforms/Kconfig-init b/platforms/Kconfig-init
new file mode 100644
index 000000000000..9e42556d77d3
--- /dev/null
+++ b/platforms/Kconfig-init
@@ -0,0 +1,13 @@
+#
+# a kconfig menu structure that asks only a minimal amount of questions to
+# quickly get started with a new platform
+#
+source "generated/platform_version.in"
+source "platforms/architecture.in"
+source "platforms/toolchain.in"
+
+# dependencies for kernel rule:
+source "generated/hosttools_noprompt.in"
+source "generated/hosttools_platform.in"
+
+source "platforms/kernel.in"
diff --git a/platforms/init_defconfig b/platforms/init_defconfig
new file mode 100644
index 000000000000..f8f3d4cbee9a
--- /dev/null
+++ b/platforms/init_defconfig
@@ -0,0 +1,19 @@
+PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
+PTXCONF_COMPILER_PREFIX_KERNEL="${PTXCONF_COMPILER_PREFIX}"
+PTXCONF_COMPILER_PREFIX_BOOTLOADER="${PTXCONF_COMPILER_PREFIX}"
+PTXCONF_LIBC_GLIBC=y
+# PTXCONF_LIBC_UCLIBC is not set
+PTXCONF_KERNEL=y
+# PTXCONF_KERNEL_MODULES is not set
+# PTXCONF_KERNEL_ZSTD is not set
+# PTXCONF_KERNEL_XZ is not set
+# PTXCONF_KERNEL_LZOP is not set
+# PTXCONF_KERNEL_LZ4 is not set
+# PTXCONF_KERNEL_OPENSSL is not set
+# PTXCONF_KERNEL_LIBELF is not set
+# PTXCONF_KERNEL_GCC_PLUGINS is not set
+# PTXCONF_KERNEL_CONFIG_BASE_VERSION is not set
+PTXCONF_KERNEL_SERIES="series"
+PTXCONF_KERNEL_CONFIG="kernelconfig-${PTXCONF_KERNEL_VERSION}"
+PTXCONF_KERNEL_EXTRA_MAKEVARS=""
+PTXCONF_IMAGE_ROOT_TGZ=y
diff --git a/rules/Kconfig-init b/rules/Kconfig-init
new file mode 100644
index 000000000000..2355d070de9b
--- /dev/null
+++ b/rules/Kconfig-init
@@ -0,0 +1,62 @@
+#
+# a kconfig menu structure that asks only a minimal amount of questions to
+# quickly get started with a new BSP
+#
+source "rules/ptxdist-dgen.in"
+source "rules/ptxdist-version.in"
+source "generated/ptxdist_options.in"
+
+source "rules/project-name.in"
+
+#
+# stubs for options that we want to ask for or enable by default, but not ask
+# for all their suboptions
+#
+
+config BUSYBOX
+	default y
+	bool
+
+# busybox installs init, poweroff, halt etc. by default. This conflicts with
+# systemd, but since busybox brings its own kconfig menu in-tree, we cannot
+# easily influence its defaults. Therefore we first disable those options in
+# init_defconfig, and explicitely select them when needed.
+# Note: these option need to have a prompt, otherwise kconfig doesn't write them
+# to the config file if they are disabled, and busybox's default will kick in.
+config BUSYBOX_HALT
+	bool "busybox /usr/sbin/halt"
+config BUSYBOX_INIT
+	bool "busybox /usr/sbin/init"
+config BUSYBOX_POWEROFF
+	bool "busybox /usr/sbin/poweroff"
+config BUSYBOX_REBOOT
+	bool "busybox /usr/sbin/reboot"
+config BUSYBOX_RUNLEVEL
+	bool "busybox /usr/sbin/runlevel"
+
+choice
+	prompt "init method"
+	default INITMETHOD_SYSTEMD
+
+	config INITMETHOD_BBINIT
+		bool
+		prompt "busybox init    "
+		select BUSYBOX_HALT
+		select BUSYBOX_INIT
+		select BUSYBOX_POWEROFF
+		select BUSYBOX_REBOOT
+		select BUSYBOX_RUNLEVEL
+
+	config INITMETHOD_SYSTEMD
+		bool
+		prompt "systemd         "
+
+	config INITMETHOD_INITRAMFS
+		bool
+		prompt "initramfs init  "
+		select BUSYBOX_HALT
+		select BUSYBOX_INIT
+		select BUSYBOX_POWEROFF
+		select BUSYBOX_REBOOT
+		select BUSYBOX_RUNLEVEL
+endchoice
diff --git a/rules/init_defconfig b/rules/init_defconfig
new file mode 100644
index 000000000000..9fa9ab00a60b
--- /dev/null
+++ b/rules/init_defconfig
@@ -0,0 +1,21 @@
+# PTXCONF_ALLYES is not set
+# PTXCONF_BROKEN is not set
+PTXCONF_FIX_PERMISSIONS=y
+PTXCONF_PROJECT_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
+# PTXCONF_PROJECT_CREATE_DEVPKGS is not set
+# PTXCONF_PROJECT_USE_DEVPKGS is not set
+PTXCONF_PROJECT_DEVPKGDIR=""
+PTXCONF_PROJECT_DEVMIRROR=""
+# PTXCONF_PROJECT_CHECK_LICENSES is not set
+PTXCONF_REPRODUCIBLE_TIMESTAMP_PTXDIST=y
+# PTXCONF_REPRODUCIBLE_TIMESTAMP_TOOLCHAIN is not set
+# PTXCONF_REPRODUCIBLE_TIMESTAMP_CUSTOM is not set
+# PTXCONF_REPRODUCIBLE_TIMESTAMP_STRING is not set
+PTXCONF_DEBUG_PACKAGES=y
+# initmethod will enable the following busybox tools if needed:
+# PTXCONF_BUSYBOX_HALT is not set
+# PTXCONF_BUSYBOX_INIT is not set
+# PTXCONF_BUSYBOX_POWEROFF is not set
+# PTXCONF_BUSYBOX_REBOOT is not set
+# PTXCONF_BUSYBOX_RUNLEVEL is not set
+# PTXCONF_STAGING is not set
diff --git a/rules/initmethod.in b/rules/initmethod.in
index b8c0b9f97b30..604fae3b4f7b 100644
--- a/rules/initmethod.in
+++ b/rules/initmethod.in
@@ -10,6 +10,9 @@ menuconfig INITMETHOD
 if INITMETHOD
 
 choice
+	#
+	# NOTE: if you add options here, also add them to rules/init_defconfig
+	#
 	prompt "init method"
 	default INITMETHOD_SYSTEMD
 
diff --git a/scripts/lib/ptxd_lib_init.sh b/scripts/lib/ptxd_lib_init.sh
new file mode 100644
index 000000000000..54fcb4d27eee
--- /dev/null
+++ b/scripts/lib/ptxd_lib_init.sh
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+ptxd_lib_init_check() {
+	if [ -z "${PTXDIST_PTXCONFIG}" ]; then
+		echo
+		echo "${PTXDIST_LOG_PROMPT}error: cannot create empty ptxconfig file."
+		echo
+		return 1
+	fi
+
+	if [ -z "${PTXDIST_FORCE}" ] && [ -e "${PTXDIST_PTXCONFIG}" ]; then
+		echo
+		echo "${PTXDIST_LOG_PROMPT}error: the file '${PTXDIST_PTXCONFIG}' already exists,"
+		echo "${PTXDIST_LOG_PROMPT}       use '--force' to overwrite it."
+		echo
+		return 1
+	fi
+
+	if [ -z "${PTXDIST_FORCE}" ] && [ -e "${PTXDIST_PTXCONFIG_DEFAULT}" ]; then
+		echo
+		echo "${PTXDIST_LOG_PROMPT}error: the file '${PTXDIST_PTXCONFIG_DEFAULT}' already exists,"
+		echo "${PTXDIST_LOG_PROMPT}       use '--force' to overwrite it."
+		echo
+		return 1
+	fi
+}
+export -f ptxd_lib_init_check
+
+ptxd_lib_init() {
+	ptxd_lib_init_check &&
+
+	mkdir -p "$(dirname "${PTXDIST_PTXCONFIG}")" &&
+	cat "${PTXDIST_TOPDIR}/rules/init_defconfig" > "${PTXDIST_PTXCONFIG}" &&
+
+	PTXDIST_FORCE=true do_select ptxconfig "${PTXDIST_PTXCONFIG}" &&
+
+	# only ask the important questions first, then do silentdefconfig for
+	# all other options
+	PTXDIST_DEP_TARGET="all" ptxd_kconfig oldconfig "init-ptx" &&
+
+	# ... then do a silent defconfig for all other defaults
+	PTXDIST_DEP_TARGET="all" PTXDIST_FORCE=true \
+		yes '' | ptxd_kconfig oldconfig ptx > /dev/null
+}
+export -f ptxd_lib_init
+
+ptxd_lib_init_platform_check() {
+	if [ -z "${PTXDIST_PLATFORMCONFIG}" ]; then
+		echo
+		echo "${PTXDIST_LOG_PROMPT}error: cannot create empty platformconfig file."
+		echo
+		return 1
+	fi
+
+	if [ -z "${PTXDIST_FORCE}" ] && [ -e "${PTXDIST_PLATFORMCONFIG}" ]; then
+		echo
+		echo "${PTXDIST_LOG_PROMPT}error: the file '${PTXDIST_PLATFORMCONFIG}' already exists,"
+		echo "${PTXDIST_LOG_PROMPT}       use '--force' to overwrite it."
+		echo
+		return 1
+	fi
+
+	if [ -z "${PTXDIST_FORCE}" ] && [ -e "${PTXDIST_PLATFORMCONFIG_DEFAULT}" ]; then
+		echo
+		echo "${PTXDIST_LOG_PROMPT}error: the file '${PTXDIST_PLATFORMCONFIG_DEFAULT}' already exists,"
+		echo "${PTXDIST_LOG_PROMPT}       use '--force' to overwrite it."
+		echo
+		return 1
+	fi
+}
+export -f ptxd_lib_init_platform_check
+
+ptxd_lib_init_platform() {
+	local platformname="$1"
+	ptxd_lib_init_platform_check &&
+
+	mkdir -p "$(dirname "${PTXDIST_PLATFORMCONFIG}")" &&
+
+	# pre-prime with defaults
+	echo "PTXCONF_PLATFORM=\"${platformname}\"" > "${PTXDIST_PLATFORMCONFIG}" &&
+	cat "${PTXDIST_TOPDIR}/platforms/init_defconfig" >> "${PTXDIST_PLATFORMCONFIG}" &&
+
+	# pretend we have a toolchain, otherwise do_select will try to
+	# autodetect it from an incomplete platformconfig
+	PTX_toolchain_SET=true PTXDIST_FORCE=true \
+		do_select platformconfig "${PTXDIST_PLATFORMCONFIG}" &&
+	
+	# only ask the important questions first...
+	PTXDIST_DEP_TARGET="all" \
+		ptxd_kconfig oldconfig init-platform &&
+
+	# ... then do a silent defconfig for all other defaults
+	PTXDIST_DEP_TARGET="all" PTXDIST_FORCE=true \
+		yes '' | ptxd_kconfig oldconfig platform > /dev/null
+}
+export -f ptxd_lib_init_platform
diff --git a/scripts/lib/ptxd_lib_kconfig.sh b/scripts/lib/ptxd_lib_kconfig.sh
index ca56a65a19c3..58f45e056182 100644
--- a/scripts/lib/ptxd_lib_kconfig.sh
+++ b/scripts/lib/ptxd_lib_kconfig.sh
@@ -687,11 +687,21 @@ ptxd_kconfig() {
 	file_kconfig="${ptxd_reply}"
 	file_dotconfig="${PTXDIST_PTXCONFIG}"
 	;;
+    init-ptx)
+	part="ptx"
+	file_kconfig="rules/Kconfig-init"
+	file_dotconfig="${PTXDIST_PTXCONFIG}"
+	;;
     platform)
 	ptxd_in_path PTXDIST_PATH_LAYERS "platforms/Kconfig"
 	file_kconfig="${ptxd_reply}"
 	file_dotconfig="${PTXDIST_PLATFORMCONFIG}"
 	;;
+    init-platform)
+	part="platform"
+	file_kconfig="platforms/Kconfig-init"
+	file_dotconfig="${PTXDIST_PLATFORMCONFIG}"
+	;;
     collection)
 	file_dotconfig="${PTXDIST_PTXCONFIG}"
 	ptxd_normalize_config
-- 
2.28.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de

Re: [ptxdist] [APPLIED] platform: bump default toolchain version

[Michael Olbrich]

Thanks, applied as f244603280985e703b0d227a3bb8211c3b63962e.

Michael

[sent from post-receive hook]

On Wed, 14 Oct 2020 12:30:46 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Provide reasonably recent default values for new platforms.
> 
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20200922092901.30715-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/platforms/toolchain.in b/platforms/toolchain.in
> index 026e4395c3ad..86e624329afd 100644
> --- a/platforms/toolchain.in
> +++ b/platforms/toolchain.in
> @@ -5,7 +5,7 @@ menu "toolchain                     "
>  config CROSSCHAIN_VENDOR
>  	string
>  	prompt "check for specific toolchain vendor"
> -	default "OSELAS.Toolchain-2019.09"
> +	default "OSELAS.Toolchain-2020.08"
>  	help
>  	  Add here an unique vendor string to ensure this project will
>  	  be build with the correct toolchain.
> @@ -19,7 +19,7 @@ config CROSSCHAIN_VENDOR
>  config CROSSCHAIN_CHECK
>  	string
>  	prompt "check for specific gcc version"
> -	default "9.2.1"
> +	default "10.2.1"
>  	help
>  	  PTXdist calls your cross compiler with -dumpversion and
>  	  compares the output with this string. This should help
> @@ -47,7 +47,7 @@ if LIBC_GLIBC
>  config GLIBC_VERSION
>  	string
>  	prompt "glibc version"
> -	default "2.30"
> +	default "2.32"
>  	help
>  	  Specify the glibc version this BSP shall be built with. This information
>  	  is used to guess the toolchain path if you use "ptxdist toolchain"

_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de