* [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support
@ 2022-09-01 8:59 Marco Felsch
2022-09-01 8:59 ` [ptxdist] [PATCH 2/3] host-system-python3: add ply and pyyaml option Marco Felsch
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Marco Felsch @ 2022-09-01 8:59 UTC (permalink / raw)
To: ptxdist
Add a Kconfig switch to set the linxu-appendroot option to true. This
can be very useful for the Barebox bootloader.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
platforms/blspec-entry.in | 10 ++++++++++
projectroot/loader/entries/default.conf | 1 +
rules/blspec-entry.make | 10 +++++++++-
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
index aed65d40a..1a4ecb26c 100644
--- a/platforms/blspec-entry.in
+++ b/platforms/blspec-entry.in
@@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE
string
prompt "kernel command-line"
+config BLSPEC_ENTRY_APPENDROOT
+ bool
+ prompt "Set linux-appendroot to true"
+ help
+ If enabled this options adds 'linux-appendroot true' to the blspec
+ entry else 'linux-appendroot false' is added. This is a useful
+ Barebox specific option. Barebox will set the the 'root=' kernel
+ command line parameter to the source from which Barebox loaded the
+ kernel image if specified.
+
endif
diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
index 5650907ab..d28156975 100644
--- a/projectroot/loader/entries/default.conf
+++ b/projectroot/loader/entries/default.conf
@@ -3,3 +3,4 @@ version @VERSION@
options @CMDLINE@
linux @KERNEL@
@DEVICETREE@
+@LINUXAPPENDROOT@
diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
index f393b1bda..c0d2416cf 100644
--- a/rules/blspec-entry.make
+++ b/rules/blspec-entry.make
@@ -35,6 +35,12 @@ else
BLSPEC_KERNEL_IMAGE = $(KERNEL_IMAGE)
endif
+ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT
+BLSPEC_APPENDROOT = linux-appendroot\ttrue
+else
+BLSPEC_APPENDROOT = linux-appendroot\tfalse
+endif
+
$(STATEDIR)/blspec-entry.targetinstall:
@$(call targetinfo)
@@ -56,7 +62,9 @@ $(STATEDIR)/blspec-entry.targetinstall:
$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
@KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \
$(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
- @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl))
+ @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \
+ $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
+ @LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl))
@$(call install_finish,blspec-entry)
--
2.30.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH 2/3] host-system-python3: add ply and pyyaml option
2022-09-01 8:59 [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support Marco Felsch
@ 2022-09-01 8:59 ` Marco Felsch
2022-09-11 7:10 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-01 8:59 ` [ptxdist] [PATCH 3/3] host-system-python3: order options alphabetical Marco Felsch
2022-09-02 7:20 ` [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support Michael Olbrich
2 siblings, 1 reply; 9+ messages in thread
From: Marco Felsch @ 2022-09-01 8:59 UTC (permalink / raw)
To: ptxdist
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
rules/host-system-python3.in | 6 ++++++
rules/host-system-python3.make | 12 ++++++++++++
2 files changed, 18 insertions(+)
diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in
index 4be968f43..21d02e9e7 100644
--- a/rules/host-system-python3.in
+++ b/rules/host-system-python3.in
@@ -23,9 +23,15 @@ config HOST_SYSTEM_PYTHON3_SETUPTOOLS
config HOST_SYSTEM_PYTHON3_SIX
bool
+config HOST_SYSTEM_PYTHON3_PLY
+ bool
+
config HOST_SYSTEM_PYTHON3_PYELFTOOLS
bool
+config HOST_SYSTEM_PYTHON3_PYYAML
+ bool
+
config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
bool
diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make
index 02e9da141..217f1f56d 100644
--- a/rules/host-system-python3.make
+++ b/rules/host-system-python3.make
@@ -60,12 +60,24 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_SIX
ptxd_bailout "Python six module not found! \
Please install python3-six (debian)";
endif
+ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PLY
+ @echo "Checking for Python ply ..."
+ @$(SYSTEMPYTHON3) -c 'import ply' 2>/dev/null || \
+ ptxd_bailout "Python ply module not found! \
+ Please install python3-ply (debian)";
+endif
ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYELFTOOLS
@echo "Checking for Python Pyelftools ..."
@$(SYSTEMPYTHON3) -c 'import elftools' 2>/dev/null || \
ptxd_bailout "Python elftools module not found! \
Please install python3-pyelftools (debian)";
endif
+ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYYAML
+ @echo "Checking for Python pyyaml ..."
+ @$(SYSTEMPYTHON3) -c 'import yaml' 2>/dev/null || \
+ ptxd_bailout "Python pyyaml module not found! \
+ Please install python3-yaml (debian)";
+endif
ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
@echo "Checking for Python Cryptography ..."
@$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \
--
2.30.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* [ptxdist] [PATCH 3/3] host-system-python3: order options alphabetical
2022-09-01 8:59 [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support Marco Felsch
2022-09-01 8:59 ` [ptxdist] [PATCH 2/3] host-system-python3: add ply and pyyaml option Marco Felsch
@ 2022-09-01 8:59 ` Marco Felsch
2022-09-11 7:10 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-02 7:20 ` [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support Michael Olbrich
2 siblings, 1 reply; 9+ messages in thread
From: Marco Felsch @ 2022-09-01 8:59 UTC (permalink / raw)
To: ptxdist
No functional changes.
Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
---
rules/host-system-python3.in | 6 +++---
rules/host-system-python3.make | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in
index 21d02e9e7..25201e93f 100644
--- a/rules/host-system-python3.in
+++ b/rules/host-system-python3.in
@@ -5,6 +5,9 @@ config HOST_SYSTEM_PYTHON3
if HOST_SYSTEM_PYTHON3
+config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
+ bool
+
config HOST_SYSTEM_PYTHON3_DEV
bool
@@ -32,7 +35,4 @@ config HOST_SYSTEM_PYTHON3_PYELFTOOLS
config HOST_SYSTEM_PYTHON3_PYYAML
bool
-config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
- bool
-
endif
diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make
index 217f1f56d..b03efd8bb 100644
--- a/rules/host-system-python3.make
+++ b/rules/host-system-python3.make
@@ -24,6 +24,12 @@ $(STATEDIR)/host-system-python3.prepare:
@$(SYSTEMPYTHON3) -V >/dev/null 2>&1 || \
ptxd_bailout "'python3' not found! Please install.";
@echo
+ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
+ @echo "Checking for Python Cryptography ..."
+ @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \
+ ptxd_bailout "Python cryptography module not found! \
+ Please install python3-cryptography (debian)";
+endif
ifdef PTXCONF_HOST_SYSTEM_PYTHON3_DEV
@echo "Checking for Python development files ..."
@$(SYSTEMPYTHON3)-config --includes &>/dev/null || \
@@ -77,12 +83,6 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYYAML
@$(SYSTEMPYTHON3) -c 'import yaml' 2>/dev/null || \
ptxd_bailout "Python pyyaml module not found! \
Please install python3-yaml (debian)";
-endif
-ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
- @echo "Checking for Python Cryptography ..."
- @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \
- ptxd_bailout "Python cryptography module not found! \
- Please install python3-cryptography (debian)";
endif
@$(call touch)
--
2.30.2
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support
2022-09-01 8:59 [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support Marco Felsch
2022-09-01 8:59 ` [ptxdist] [PATCH 2/3] host-system-python3: add ply and pyyaml option Marco Felsch
2022-09-01 8:59 ` [ptxdist] [PATCH 3/3] host-system-python3: order options alphabetical Marco Felsch
@ 2022-09-02 7:20 ` Michael Olbrich
2022-09-02 8:03 ` Marco Felsch
2 siblings, 1 reply; 9+ messages in thread
From: Michael Olbrich @ 2022-09-02 7:20 UTC (permalink / raw)
To: Marco Felsch; +Cc: ptxdist
On Thu, Sep 01, 2022 at 10:59:39AM +0200, Marco Felsch wrote:
> Add a Kconfig switch to set the linxu-appendroot option to true. This
> can be very useful for the Barebox bootloader.
>
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> ---
> platforms/blspec-entry.in | 10 ++++++++++
> projectroot/loader/entries/default.conf | 1 +
> rules/blspec-entry.make | 10 +++++++++-
> 3 files changed, 20 insertions(+), 1 deletion(-)
>
> diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
> index aed65d40a..1a4ecb26c 100644
> --- a/platforms/blspec-entry.in
> +++ b/platforms/blspec-entry.in
> @@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE
> string
> prompt "kernel command-line"
>
> +config BLSPEC_ENTRY_APPENDROOT
> + bool
> + prompt "Set linux-appendroot to true"
> + help
> + If enabled this options adds 'linux-appendroot true' to the blspec
> + entry else 'linux-appendroot false' is added. This is a useful
> + Barebox specific option. Barebox will set the the 'root=' kernel
> + command line parameter to the source from which Barebox loaded the
> + kernel image if specified.
> +
> endif
> diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
> index 5650907ab..d28156975 100644
> --- a/projectroot/loader/entries/default.conf
> +++ b/projectroot/loader/entries/default.conf
> @@ -3,3 +3,4 @@ version @VERSION@
> options @CMDLINE@
> linux @KERNEL@
> @DEVICETREE@
> +@LINUXAPPENDROOT@
> diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
> index f393b1bda..c0d2416cf 100644
> --- a/rules/blspec-entry.make
> +++ b/rules/blspec-entry.make
> @@ -35,6 +35,12 @@ else
> BLSPEC_KERNEL_IMAGE = $(KERNEL_IMAGE)
> endif
>
> +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT
> +BLSPEC_APPENDROOT = linux-appendroot\ttrue
> +else
> +BLSPEC_APPENDROOT = linux-appendroot\tfalse
Hmm, that's the default, right? So use an empty string here. It keeps the
file shorter and (mostly) unchanged for those that keep the option
disabled. It's a non-standard option so I'd prefer to not have it here
unless it is explicitly enabled.
Michael
> +endif
> +
> $(STATEDIR)/blspec-entry.targetinstall:
> @$(call targetinfo)
>
> @@ -56,7 +62,9 @@ $(STATEDIR)/blspec-entry.targetinstall:
> $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
> @KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \
> $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
> - @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl))
> + @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \
> + $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \
> + @LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl))
>
> @$(call install_finish,blspec-entry)
>
> --
> 2.30.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 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support
2022-09-02 7:20 ` [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support Michael Olbrich
@ 2022-09-02 8:03 ` Marco Felsch
2022-09-02 9:22 ` Michael Olbrich
0 siblings, 1 reply; 9+ messages in thread
From: Marco Felsch @ 2022-09-02 8:03 UTC (permalink / raw)
To: ptxdist
Hi Michael,
On 22-09-02, Michael Olbrich wrote:
> On Thu, Sep 01, 2022 at 10:59:39AM +0200, Marco Felsch wrote:
> > Add a Kconfig switch to set the linxu-appendroot option to true. This
> > can be very useful for the Barebox bootloader.
> >
> > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > ---
> > platforms/blspec-entry.in | 10 ++++++++++
> > projectroot/loader/entries/default.conf | 1 +
> > rules/blspec-entry.make | 10 +++++++++-
> > 3 files changed, 20 insertions(+), 1 deletion(-)
> >
> > diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
> > index aed65d40a..1a4ecb26c 100644
> > --- a/platforms/blspec-entry.in
> > +++ b/platforms/blspec-entry.in
> > @@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE
> > string
> > prompt "kernel command-line"
> >
> > +config BLSPEC_ENTRY_APPENDROOT
> > + bool
> > + prompt "Set linux-appendroot to true"
> > + help
> > + If enabled this options adds 'linux-appendroot true' to the blspec
> > + entry else 'linux-appendroot false' is added. This is a useful
> > + Barebox specific option. Barebox will set the the 'root=' kernel
> > + command line parameter to the source from which Barebox loaded the
> > + kernel image if specified.
> > +
> > endif
> > diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
> > index 5650907ab..d28156975 100644
> > --- a/projectroot/loader/entries/default.conf
> > +++ b/projectroot/loader/entries/default.conf
> > @@ -3,3 +3,4 @@ version @VERSION@
> > options @CMDLINE@
> > linux @KERNEL@
> > @DEVICETREE@
> > +@LINUXAPPENDROOT@
> > diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
> > index f393b1bda..c0d2416cf 100644
> > --- a/rules/blspec-entry.make
> > +++ b/rules/blspec-entry.make
> > @@ -35,6 +35,12 @@ else
> > BLSPEC_KERNEL_IMAGE = $(KERNEL_IMAGE)
> > endif
> >
> > +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT
> > +BLSPEC_APPENDROOT = linux-appendroot\ttrue
> > +else
> > +BLSPEC_APPENDROOT = linux-appendroot\tfalse
>
> Hmm, that's the default, right? So use an empty string here. It keeps the
> file shorter and (mostly) unchanged for those that keep the option
> disabled. It's a non-standard option so I'd prefer to not have it here
> unless it is explicitly enabled.
Okay, I will do that. Just one question will it add a blank line instead
or is the line taken by @LINUXAPPENDROOT@ completely gone?
Regards,
Marco
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support
2022-09-02 8:03 ` Marco Felsch
@ 2022-09-02 9:22 ` Michael Olbrich
2022-09-02 10:37 ` Marco Felsch
0 siblings, 1 reply; 9+ messages in thread
From: Michael Olbrich @ 2022-09-02 9:22 UTC (permalink / raw)
To: Marco Felsch; +Cc: ptxdist
On Fri, Sep 02, 2022 at 10:03:42AM +0200, Marco Felsch wrote:
> On 22-09-02, Michael Olbrich wrote:
> > On Thu, Sep 01, 2022 at 10:59:39AM +0200, Marco Felsch wrote:
> > > Add a Kconfig switch to set the linxu-appendroot option to true. This
> > > can be very useful for the Barebox bootloader.
> > >
> > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > > ---
> > > platforms/blspec-entry.in | 10 ++++++++++
> > > projectroot/loader/entries/default.conf | 1 +
> > > rules/blspec-entry.make | 10 +++++++++-
> > > 3 files changed, 20 insertions(+), 1 deletion(-)
> > >
> > > diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
> > > index aed65d40a..1a4ecb26c 100644
> > > --- a/platforms/blspec-entry.in
> > > +++ b/platforms/blspec-entry.in
> > > @@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE
> > > string
> > > prompt "kernel command-line"
> > >
> > > +config BLSPEC_ENTRY_APPENDROOT
> > > + bool
> > > + prompt "Set linux-appendroot to true"
> > > + help
> > > + If enabled this options adds 'linux-appendroot true' to the blspec
> > > + entry else 'linux-appendroot false' is added. This is a useful
> > > + Barebox specific option. Barebox will set the the 'root=' kernel
> > > + command line parameter to the source from which Barebox loaded the
> > > + kernel image if specified.
> > > +
> > > endif
> > > diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
> > > index 5650907ab..d28156975 100644
> > > --- a/projectroot/loader/entries/default.conf
> > > +++ b/projectroot/loader/entries/default.conf
> > > @@ -3,3 +3,4 @@ version @VERSION@
> > > options @CMDLINE@
> > > linux @KERNEL@
> > > @DEVICETREE@
> > > +@LINUXAPPENDROOT@
> > > diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
> > > index f393b1bda..c0d2416cf 100644
> > > --- a/rules/blspec-entry.make
> > > +++ b/rules/blspec-entry.make
> > > @@ -35,6 +35,12 @@ else
> > > BLSPEC_KERNEL_IMAGE = $(KERNEL_IMAGE)
> > > endif
> > >
> > > +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT
> > > +BLSPEC_APPENDROOT = linux-appendroot\ttrue
> > > +else
> > > +BLSPEC_APPENDROOT = linux-appendroot\tfalse
> >
> > Hmm, that's the default, right? So use an empty string here. It keeps the
> > file shorter and (mostly) unchanged for those that keep the option
> > disabled. It's a non-standard option so I'd prefer to not have it here
> > unless it is explicitly enabled.
>
> Okay, I will do that. Just one question will it add a blank line instead
> or is the line taken by @LINUXAPPENDROOT@ completely gone?
It will be a blank line, but I think that's ok. You could merge it with the
@DEVICETREE@ line and add a '\n' at the beginning of the substitution.
But I'm not sure if it's worth it.
Michael
--
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 |
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support
2022-09-02 9:22 ` Michael Olbrich
@ 2022-09-02 10:37 ` Marco Felsch
0 siblings, 0 replies; 9+ messages in thread
From: Marco Felsch @ 2022-09-02 10:37 UTC (permalink / raw)
To: ptxdist
On 22-09-02, Michael Olbrich wrote:
> On Fri, Sep 02, 2022 at 10:03:42AM +0200, Marco Felsch wrote:
> > On 22-09-02, Michael Olbrich wrote:
> > > On Thu, Sep 01, 2022 at 10:59:39AM +0200, Marco Felsch wrote:
> > > > Add a Kconfig switch to set the linxu-appendroot option to true. This
> > > > can be very useful for the Barebox bootloader.
> > > >
> > > > Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> > > > ---
> > > > platforms/blspec-entry.in | 10 ++++++++++
> > > > projectroot/loader/entries/default.conf | 1 +
> > > > rules/blspec-entry.make | 10 +++++++++-
> > > > 3 files changed, 20 insertions(+), 1 deletion(-)
> > > >
> > > > diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in
> > > > index aed65d40a..1a4ecb26c 100644
> > > > --- a/platforms/blspec-entry.in
> > > > +++ b/platforms/blspec-entry.in
> > > > @@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE
> > > > string
> > > > prompt "kernel command-line"
> > > >
> > > > +config BLSPEC_ENTRY_APPENDROOT
> > > > + bool
> > > > + prompt "Set linux-appendroot to true"
> > > > + help
> > > > + If enabled this options adds 'linux-appendroot true' to the blspec
> > > > + entry else 'linux-appendroot false' is added. This is a useful
> > > > + Barebox specific option. Barebox will set the the 'root=' kernel
> > > > + command line parameter to the source from which Barebox loaded the
> > > > + kernel image if specified.
> > > > +
> > > > endif
> > > > diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf
> > > > index 5650907ab..d28156975 100644
> > > > --- a/projectroot/loader/entries/default.conf
> > > > +++ b/projectroot/loader/entries/default.conf
> > > > @@ -3,3 +3,4 @@ version @VERSION@
> > > > options @CMDLINE@
> > > > linux @KERNEL@
> > > > @DEVICETREE@
> > > > +@LINUXAPPENDROOT@
> > > > diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
> > > > index f393b1bda..c0d2416cf 100644
> > > > --- a/rules/blspec-entry.make
> > > > +++ b/rules/blspec-entry.make
> > > > @@ -35,6 +35,12 @@ else
> > > > BLSPEC_KERNEL_IMAGE = $(KERNEL_IMAGE)
> > > > endif
> > > >
> > > > +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT
> > > > +BLSPEC_APPENDROOT = linux-appendroot\ttrue
> > > > +else
> > > > +BLSPEC_APPENDROOT = linux-appendroot\tfalse
> > >
> > > Hmm, that's the default, right? So use an empty string here. It keeps the
> > > file shorter and (mostly) unchanged for those that keep the option
> > > disabled. It's a non-standard option so I'd prefer to not have it here
> > > unless it is explicitly enabled.
> >
> > Okay, I will do that. Just one question will it add a blank line instead
> > or is the line taken by @LINUXAPPENDROOT@ completely gone?
>
> It will be a blank line, but I think that's ok.
Okay, so blank line it is :) I will send a v2.
Regards,
Marco
> You could merge it with the @DEVICETREE@ line and add a '\n' at the
> beginning of the substitution. But I'm not sure if it's worth it.
>
> Michael
>
> --
> 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 |
>
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [APPLIED] host-system-python3: add ply and pyyaml option
2022-09-01 8:59 ` [ptxdist] [PATCH 2/3] host-system-python3: add ply and pyyaml option Marco Felsch
@ 2022-09-11 7:10 ` Michael Olbrich
0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-09-11 7:10 UTC (permalink / raw)
To: ptxdist; +Cc: Marco Felsch
Thanks, applied as f01ac2e6f14504164b5b8ccdbcbbcea19ffcd257.
Michael
[sent from post-receive hook]
On Sun, 11 Sep 2022 09:10:05 +0200, Marco Felsch <m.felsch@pengutronix.de> wrote:
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> Message-Id: <20220901085941.2597793-2-m.felsch@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in
> index 4be968f435ee..21d02e9e7e5e 100644
> --- a/rules/host-system-python3.in
> +++ b/rules/host-system-python3.in
> @@ -23,9 +23,15 @@ config HOST_SYSTEM_PYTHON3_SETUPTOOLS
> config HOST_SYSTEM_PYTHON3_SIX
> bool
>
> +config HOST_SYSTEM_PYTHON3_PLY
> + bool
> +
> config HOST_SYSTEM_PYTHON3_PYELFTOOLS
> bool
>
> +config HOST_SYSTEM_PYTHON3_PYYAML
> + bool
> +
> config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
> bool
>
> diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make
> index 02e9da1410fc..217f1f56d763 100644
> --- a/rules/host-system-python3.make
> +++ b/rules/host-system-python3.make
> @@ -60,12 +60,24 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_SIX
> ptxd_bailout "Python six module not found! \
> Please install python3-six (debian)";
> endif
> +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PLY
> + @echo "Checking for Python ply ..."
> + @$(SYSTEMPYTHON3) -c 'import ply' 2>/dev/null || \
> + ptxd_bailout "Python ply module not found! \
> + Please install python3-ply (debian)";
> +endif
> ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYELFTOOLS
> @echo "Checking for Python Pyelftools ..."
> @$(SYSTEMPYTHON3) -c 'import elftools' 2>/dev/null || \
> ptxd_bailout "Python elftools module not found! \
> Please install python3-pyelftools (debian)";
> endif
> +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYYAML
> + @echo "Checking for Python pyyaml ..."
> + @$(SYSTEMPYTHON3) -c 'import yaml' 2>/dev/null || \
> + ptxd_bailout "Python pyyaml module not found! \
> + Please install python3-yaml (debian)";
> +endif
> ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
> @echo "Checking for Python Cryptography ..."
> @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [ptxdist] [APPLIED] host-system-python3: order options alphabetical
2022-09-01 8:59 ` [ptxdist] [PATCH 3/3] host-system-python3: order options alphabetical Marco Felsch
@ 2022-09-11 7:10 ` Michael Olbrich
0 siblings, 0 replies; 9+ messages in thread
From: Michael Olbrich @ 2022-09-11 7:10 UTC (permalink / raw)
To: ptxdist; +Cc: Marco Felsch
Thanks, applied as d802a5edf3a3bdce76be29ff5b9f5c5afdb03f19.
Michael
[sent from post-receive hook]
On Sun, 11 Sep 2022 09:10:07 +0200, Marco Felsch <m.felsch@pengutronix.de> wrote:
> No functional changes.
>
> Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
> Message-Id: <20220901085941.2597793-3-m.felsch@pengutronix.de>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in
> index 21d02e9e7e5e..25201e93fda8 100644
> --- a/rules/host-system-python3.in
> +++ b/rules/host-system-python3.in
> @@ -5,6 +5,9 @@ config HOST_SYSTEM_PYTHON3
>
> if HOST_SYSTEM_PYTHON3
>
> +config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
> + bool
> +
> config HOST_SYSTEM_PYTHON3_DEV
> bool
>
> @@ -32,7 +35,4 @@ config HOST_SYSTEM_PYTHON3_PYELFTOOLS
> config HOST_SYSTEM_PYTHON3_PYYAML
> bool
>
> -config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
> - bool
> -
> endif
> diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make
> index 217f1f56d763..b03efd8bbf31 100644
> --- a/rules/host-system-python3.make
> +++ b/rules/host-system-python3.make
> @@ -24,6 +24,12 @@ $(STATEDIR)/host-system-python3.prepare:
> @$(SYSTEMPYTHON3) -V >/dev/null 2>&1 || \
> ptxd_bailout "'python3' not found! Please install.";
> @echo
> +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
> + @echo "Checking for Python Cryptography ..."
> + @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \
> + ptxd_bailout "Python cryptography module not found! \
> + Please install python3-cryptography (debian)";
> +endif
> ifdef PTXCONF_HOST_SYSTEM_PYTHON3_DEV
> @echo "Checking for Python development files ..."
> @$(SYSTEMPYTHON3)-config --includes &>/dev/null || \
> @@ -77,12 +83,6 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYYAML
> @$(SYSTEMPYTHON3) -c 'import yaml' 2>/dev/null || \
> ptxd_bailout "Python pyyaml module not found! \
> Please install python3-yaml (debian)";
> -endif
> -ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY
> - @echo "Checking for Python Cryptography ..."
> - @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \
> - ptxd_bailout "Python cryptography module not found! \
> - Please install python3-cryptography (debian)";
> endif
> @$(call touch)
>
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-09-11 7:11 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-01 8:59 [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support Marco Felsch
2022-09-01 8:59 ` [ptxdist] [PATCH 2/3] host-system-python3: add ply and pyyaml option Marco Felsch
2022-09-11 7:10 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-01 8:59 ` [ptxdist] [PATCH 3/3] host-system-python3: order options alphabetical Marco Felsch
2022-09-11 7:10 ` [ptxdist] [APPLIED] " Michael Olbrich
2022-09-02 7:20 ` [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support Michael Olbrich
2022-09-02 8:03 ` Marco Felsch
2022-09-02 9:22 ` Michael Olbrich
2022-09-02 10:37 ` Marco Felsch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox