Make sure that all host packages are compile-tested. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- rules/templates/template-class-existing-target-in | 2 +- rules/templates/template-class-in | 2 +- scripts/lib/ptxd_lib_template.sh | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rules/templates/template-class-existing-target-in b/rules/templates/template-class-existing-target-in index 3194d5b33e59..d563fb7bb657 100644 --- a/rules/templates/template-class-existing-target-in +++ b/rules/templates/template-class-existing-target-in @@ -2,6 +2,6 @@ config @CLASS@@PACKAGE@ tristate -@SELECT@ prompt "@package@" +@DEFAULT@@SELECT@ prompt "@package@" help FIXME diff --git a/rules/templates/template-class-in b/rules/templates/template-class-in index 3194d5b33e59..d563fb7bb657 100644 --- a/rules/templates/template-class-in +++ b/rules/templates/template-class-in @@ -2,6 +2,6 @@ config @CLASS@@PACKAGE@ tristate -@SELECT@ prompt "@package@" +@DEFAULT@@SELECT@ prompt "@package@" help FIXME diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh index d25835bd5670..6f91d8629b01 100644 --- a/scripts/lib/ptxd_lib_template.sh +++ b/scripts/lib/ptxd_lib_template.sh @@ -398,6 +398,8 @@ export -a ptxd_template_help_list ptxd_template_new_host() { template=template-class + export DEFAULT=" default y if ALLYES +" ptxd_template_setup_class HOST_ && ptxd_template_read_remote_existing && ptxd_template_write_rules -- 2.39.2
Most host packages are not meant to be selected by users, instead they are selected by target packages. Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- scripts/lib/ptxd_lib_template.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh index 6f91d8629b01..d77c4a73be8c 100644 --- a/scripts/lib/ptxd_lib_template.sh +++ b/scripts/lib/ptxd_lib_template.sh @@ -106,7 +106,12 @@ ptxd_template_read_author() { export -f ptxd_template_read_author ptxd_template_read_section() { - local section_name="${1:-project_specific}" + local section_name + if [ "${action}" = "host" ]; then + section_name="${1:-hosttools_noprompt}" + else + section_name="${1:-project_specific}" + fi ptxd_template_read "enter package section" section "${section_name}" } export -f ptxd_template_read_section -- 2.39.2
On Mon, May 15, 2023 at 10:03:29AM +0200, Roland Hieber wrote: > Most host packages are not meant to be selected by users, instead they > are selected by target packages. > > Signed-off-by: Roland Hieber <rhi@pengutronix.de> > --- > scripts/lib/ptxd_lib_template.sh | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh > index 6f91d8629b01..d77c4a73be8c 100644 > --- a/scripts/lib/ptxd_lib_template.sh > +++ b/scripts/lib/ptxd_lib_template.sh > @@ -106,7 +106,12 @@ ptxd_template_read_author() { > export -f ptxd_template_read_author > > ptxd_template_read_section() { > - local section_name="${1:-project_specific}" > + local section_name > + if [ "${action}" = "host" ]; then > + section_name="${1:-hosttools_noprompt}" We should remove the prompt in that case. Michael > + else > + section_name="${1:-project_specific}" > + fi > ptxd_template_read "enter package section" section "${section_name}" > } > export -f ptxd_template_read_section > -- > 2.39.2 > > > -- 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 |
Signed-off-by: Roland Hieber <rhi@pengutronix.de> --- PATCH 1/2 and PATCH 2/2 can stay as they are. --- rules/templates/template-class-existing-target-in | 4 +--- rules/templates/template-class-in | 4 +--- scripts/lib/ptxd_lib_template.sh | 8 ++++++++ 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/rules/templates/template-class-existing-target-in b/rules/templates/template-class-existing-target-in index d563fb7bb657..b1c8e71023bc 100644 --- a/rules/templates/template-class-existing-target-in +++ b/rules/templates/template-class-existing-target-in @@ -2,6 +2,4 @@ config @CLASS@@PACKAGE@ tristate -@DEFAULT@@SELECT@ prompt "@package@" - help - FIXME +@DEFAULT@@SELECT@@PROMPT@ diff --git a/rules/templates/template-class-in b/rules/templates/template-class-in index d563fb7bb657..b1c8e71023bc 100644 --- a/rules/templates/template-class-in +++ b/rules/templates/template-class-in @@ -2,6 +2,4 @@ config @CLASS@@PACKAGE@ tristate -@DEFAULT@@SELECT@ prompt "@package@" - help - FIXME +@DEFAULT@@SELECT@@PROMPT@ diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh index d77c4a73be8c..8d1e22c80ade 100644 --- a/scripts/lib/ptxd_lib_template.sh +++ b/scripts/lib/ptxd_lib_template.sh @@ -113,6 +113,14 @@ ptxd_template_read_section() { section_name="${1:-project_specific}" fi ptxd_template_read "enter package section" section "${section_name}" + + export PROMPT=' prompt "'${package}'" + help + FIXME +' + case "${section}" in + hosttools_noprompt*) PROMPT="";; + esac } export -f ptxd_template_read_section -- 2.39.2
Thanks, applied as 60f87172d944d8ec630c88cfdb911e2de11e2dff.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:37 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Make sure that all host packages are compile-tested.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230515080329.2027394-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/templates/template-class-existing-target-in b/rules/templates/template-class-existing-target-in
> index 3194d5b33e59..d563fb7bb657 100644
> --- a/rules/templates/template-class-existing-target-in
> +++ b/rules/templates/template-class-existing-target-in
> @@ -2,6 +2,6 @@
>
> config @CLASS@@PACKAGE@
> tristate
> -@SELECT@ prompt "@package@"
> +@DEFAULT@@SELECT@ prompt "@package@"
> help
> FIXME
> diff --git a/rules/templates/template-class-in b/rules/templates/template-class-in
> index 3194d5b33e59..d563fb7bb657 100644
> --- a/rules/templates/template-class-in
> +++ b/rules/templates/template-class-in
> @@ -2,6 +2,6 @@
>
> config @CLASS@@PACKAGE@
> tristate
> -@SELECT@ prompt "@package@"
> +@DEFAULT@@SELECT@ prompt "@package@"
> help
> FIXME
> diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh
> index d25835bd5670..6f91d8629b01 100644
> --- a/scripts/lib/ptxd_lib_template.sh
> +++ b/scripts/lib/ptxd_lib_template.sh
> @@ -398,6 +398,8 @@ export -a ptxd_template_help_list
>
> ptxd_template_new_host() {
> template=template-class
> + export DEFAULT=" default y if ALLYES
> +"
> ptxd_template_setup_class HOST_ &&
> ptxd_template_read_remote_existing &&
> ptxd_template_write_rules
Thanks, applied as 0c5a52b803c8fd6030880a2f6a8d6363c62b8733.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:38 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Most host packages are not meant to be selected by users, instead they
> are selected by target packages.
>
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230515080329.2027394-2-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh
> index 6f91d8629b01..d77c4a73be8c 100644
> --- a/scripts/lib/ptxd_lib_template.sh
> +++ b/scripts/lib/ptxd_lib_template.sh
> @@ -106,7 +106,12 @@ ptxd_template_read_author() {
> export -f ptxd_template_read_author
>
> ptxd_template_read_section() {
> - local section_name="${1:-project_specific}"
> + local section_name
> + if [ "${action}" = "host" ]; then
> + section_name="${1:-hosttools_noprompt}"
> + else
> + section_name="${1:-project_specific}"
> + fi
> ptxd_template_read "enter package section" section "${section_name}"
> }
> export -f ptxd_template_read_section
Thanks, applied as 7a44472d11b0a49cac39581762c1467eae62e71c.
Michael
[sent from post-receive hook]
On Fri, 02 Jun 2023 09:17:38 +0200, Roland Hieber <rhi@pengutronix.de> wrote:
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> Message-Id: <20230524210827.3137666-1-rhi@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/templates/template-class-existing-target-in b/rules/templates/template-class-existing-target-in
> index d563fb7bb657..b1c8e71023bc 100644
> --- a/rules/templates/template-class-existing-target-in
> +++ b/rules/templates/template-class-existing-target-in
> @@ -2,6 +2,4 @@
>
> config @CLASS@@PACKAGE@
> tristate
> -@DEFAULT@@SELECT@ prompt "@package@"
> - help
> - FIXME
> +@DEFAULT@@SELECT@@PROMPT@
> diff --git a/rules/templates/template-class-in b/rules/templates/template-class-in
> index d563fb7bb657..b1c8e71023bc 100644
> --- a/rules/templates/template-class-in
> +++ b/rules/templates/template-class-in
> @@ -2,6 +2,4 @@
>
> config @CLASS@@PACKAGE@
> tristate
> -@DEFAULT@@SELECT@ prompt "@package@"
> - help
> - FIXME
> +@DEFAULT@@SELECT@@PROMPT@
> diff --git a/scripts/lib/ptxd_lib_template.sh b/scripts/lib/ptxd_lib_template.sh
> index d77c4a73be8c..8d1e22c80ade 100644
> --- a/scripts/lib/ptxd_lib_template.sh
> +++ b/scripts/lib/ptxd_lib_template.sh
> @@ -113,6 +113,14 @@ ptxd_template_read_section() {
> section_name="${1:-project_specific}"
> fi
> ptxd_template_read "enter package section" section "${section_name}"
> +
> + export PROMPT=' prompt "'${package}'"
> + help
> + FIXME
> +'
> + case "${section}" in
> + hosttools_noprompt*) PROMPT="";;
> + esac
> }
> export -f ptxd_template_read_section
>