* [ptxdist] [PATCH] openssh: Disable config check in installation.
@ 2023-04-09 8:02 Christian Melki
2023-04-12 6:43 ` Michael Olbrich
0 siblings, 1 reply; 3+ messages in thread
From: Christian Melki @ 2023-04-09 8:02 UTC (permalink / raw)
To: ptxdist
OpenSSH tries to run cross compiled target sshd on host
when installing. It uses the config validation function.
This gets an ugly install error (which ptxdist ignores?).
Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
...0001-Makefile.in-Remove-check-config.patch | 25 +++++++++++++++++++
patches/openssh-9.3p1/series | 4 +++
2 files changed, 29 insertions(+)
create mode 100644 patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
create mode 100644 patches/openssh-9.3p1/series
diff --git a/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch b/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
new file mode 100644
index 000000000..572e3d883
--- /dev/null
+++ b/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
@@ -0,0 +1,25 @@
+From: Christian Melki <christian.melki@t2data.com>
+Date: Sat, 8 Apr 2023 10:12:02 +0200
+Subject: [PATCH] Makefile.in: Remove check-config.
+
+OpenSSH tries to run target sshd on host when cross compiling.
+This results in an install failure.
+
+Signed-off-by: Christian Melki <christian.melki@t2data.com>
+---
+ Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 70287f51fb81..0b131c92a781 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -377,7 +377,7 @@ distprep: catman-do depend-check
+ $(AUTORECONF)
+ -rm -rf autom4te.cache .depend.bak
+
+-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
++install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key
+ install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
+ install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
+
diff --git a/patches/openssh-9.3p1/series b/patches/openssh-9.3p1/series
new file mode 100644
index 000000000..b274d1052
--- /dev/null
+++ b/patches/openssh-9.3p1/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Makefile.in-Remove-check-config.patch
+# e29227a4207a58013be625ec869e9ca7 - git-ptx-patches magic
--
2.34.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [ptxdist] [PATCH] openssh: Disable config check in installation.
2023-04-09 8:02 [ptxdist] [PATCH] openssh: Disable config check in installation Christian Melki
@ 2023-04-12 6:43 ` Michael Olbrich
2023-04-12 6:46 ` Christian Melki
0 siblings, 1 reply; 3+ messages in thread
From: Michael Olbrich @ 2023-04-12 6:43 UTC (permalink / raw)
To: Christian Melki; +Cc: ptxdist
On Sun, Apr 09, 2023 at 10:02:25AM +0200, Christian Melki wrote:
> OpenSSH tries to run cross compiled target sshd on host
> when installing. It uses the config validation function.
> This gets an ugly install error (which ptxdist ignores?).
Actually, it's the openssh buildsystem that ignored the error.
Note the '-' as first character of the command.
I'd rather not carry a patch. It cannot go upstream like this so we would
have to keep it forever and its just cosmetic anyway.
PTXdist never calls 'make' with '-i' to ignore errors. So if you find any
explicitly ignored errors then the buildsystem of the package ignores the
error.
What's your usecase for this?
Michael
> Signed-off-by: Christian Melki <christian.melki@t2data.com>
> ---
> ...0001-Makefile.in-Remove-check-config.patch | 25 +++++++++++++++++++
> patches/openssh-9.3p1/series | 4 +++
> 2 files changed, 29 insertions(+)
> create mode 100644 patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
> create mode 100644 patches/openssh-9.3p1/series
>
> diff --git a/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch b/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
> new file mode 100644
> index 000000000..572e3d883
> --- /dev/null
> +++ b/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
> @@ -0,0 +1,25 @@
> +From: Christian Melki <christian.melki@t2data.com>
> +Date: Sat, 8 Apr 2023 10:12:02 +0200
> +Subject: [PATCH] Makefile.in: Remove check-config.
> +
> +OpenSSH tries to run target sshd on host when cross compiling.
> +This results in an install failure.
> +
> +Signed-off-by: Christian Melki <christian.melki@t2data.com>
> +---
> + Makefile.in | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/Makefile.in b/Makefile.in
> +index 70287f51fb81..0b131c92a781 100644
> +--- a/Makefile.in
> ++++ b/Makefile.in
> +@@ -377,7 +377,7 @@ distprep: catman-do depend-check
> + $(AUTORECONF)
> + -rm -rf autom4te.cache .depend.bak
> +
> +-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
> ++install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key
> + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
> + install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
> +
> diff --git a/patches/openssh-9.3p1/series b/patches/openssh-9.3p1/series
> new file mode 100644
> index 000000000..b274d1052
> --- /dev/null
> +++ b/patches/openssh-9.3p1/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-Makefile.in-Remove-check-config.patch
> +# e29227a4207a58013be625ec869e9ca7 - git-ptx-patches magic
> --
> 2.34.1
>
>
>
--
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] 3+ messages in thread
* Re: [ptxdist] [PATCH] openssh: Disable config check in installation.
2023-04-12 6:43 ` Michael Olbrich
@ 2023-04-12 6:46 ` Christian Melki
0 siblings, 0 replies; 3+ messages in thread
From: Christian Melki @ 2023-04-12 6:46 UTC (permalink / raw)
To: ptxdist
On 4/12/23 08:43, Michael Olbrich wrote:
> On Sun, Apr 09, 2023 at 10:02:25AM +0200, Christian Melki wrote:
>> OpenSSH tries to run cross compiled target sshd on host
>> when installing. It uses the config validation function.
>> This gets an ugly install error (which ptxdist ignores?).
>
> Actually, it's the openssh buildsystem that ignored the error.
> Note the '-' as first character of the command.
>
> I'd rather not carry a patch. It cannot go upstream like this so we would
> have to keep it forever and its just cosmetic anyway.
>
> PTXdist never calls 'make' with '-i' to ignore errors. So if you find any
> explicitly ignored errors then the buildsystem of the package ignores the
> error.
>
> What's your usecase for this?
>
> Michael
>
I understand. I'm ok with a drop.
The usecase was just cleaning up install errors.
They look ugly when reviewing the logs and raise questions if the
package makefile completed the install or not (I missed the '-')
/Christian
>> Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> ---
>> ...0001-Makefile.in-Remove-check-config.patch | 25 +++++++++++++++++++
>> patches/openssh-9.3p1/series | 4 +++
>> 2 files changed, 29 insertions(+)
>> create mode 100644 patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
>> create mode 100644 patches/openssh-9.3p1/series
>>
>> diff --git a/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch b/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
>> new file mode 100644
>> index 000000000..572e3d883
>> --- /dev/null
>> +++ b/patches/openssh-9.3p1/0001-Makefile.in-Remove-check-config.patch
>> @@ -0,0 +1,25 @@
>> +From: Christian Melki <christian.melki@t2data.com>
>> +Date: Sat, 8 Apr 2023 10:12:02 +0200
>> +Subject: [PATCH] Makefile.in: Remove check-config.
>> +
>> +OpenSSH tries to run target sshd on host when cross compiling.
>> +This results in an install failure.
>> +
>> +Signed-off-by: Christian Melki <christian.melki@t2data.com>
>> +---
>> + Makefile.in | 2 +-
>> + 1 file changed, 1 insertion(+), 1 deletion(-)
>> +
>> +diff --git a/Makefile.in b/Makefile.in
>> +index 70287f51fb81..0b131c92a781 100644
>> +--- a/Makefile.in
>> ++++ b/Makefile.in
>> +@@ -377,7 +377,7 @@ distprep: catman-do depend-check
>> + $(AUTORECONF)
>> + -rm -rf autom4te.cache .depend.bak
>> +
>> +-install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key check-config
>> ++install: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf host-key
>> + install-nokeys: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files install-sysconf
>> + install-nosysconf: $(CONFIGFILES) $(MANPAGES) $(TARGETS) install-files
>> +
>> diff --git a/patches/openssh-9.3p1/series b/patches/openssh-9.3p1/series
>> new file mode 100644
>> index 000000000..b274d1052
>> --- /dev/null
>> +++ b/patches/openssh-9.3p1/series
>> @@ -0,0 +1,4 @@
>> +# generated by git-ptx-patches
>> +#tag:base --start-number 1
>> +0001-Makefile.in-Remove-check-config.patch
>> +# e29227a4207a58013be625ec869e9ca7 - git-ptx-patches magic
>> --
>> 2.34.1
>>
>>
>>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-04-12 6:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-09 8:02 [ptxdist] [PATCH] openssh: Disable config check in installation Christian Melki
2023-04-12 6:43 ` Michael Olbrich
2023-04-12 6:46 ` Christian Melki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox