* [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel
@ 2017-02-21 21:12 Yann E. MORIN
2017-02-21 21:15 ` Peter Seiderer
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Yann E. MORIN @ 2017-02-21 21:12 UTC (permalink / raw)
To: buildroot
The Makefile is not parallel-safe, so we build with MAKE1. Since the
source is very small, this has minor impact on perforance.
The genver.sh script conaains a troll character U+c2a0 (non-break space)
which is refused by some versions of /bin/sh. Patch it away.
Fixes:
http://autobuild.buildroot.net/results/867/867c74ed74fd04ab06d1a10ff34ca177fe005fd2/
http://autobuild.buildroot.net/results/f97/f971629bc99147f9014e52c6ef71c3417faa6b67/
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: David Bachelart <david.bachelart@bbright.com>
---
package/sslh/0002-replace-U+c2a0.patch | 12 ++++++++++++
package/sslh/sslh.mk | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
create mode 100644 package/sslh/0002-replace-U+c2a0.patch
diff --git a/package/sslh/0002-replace-U+c2a0.patch b/package/sslh/0002-replace-U+c2a0.patch
new file mode 100644
index 0000000..38093fa
--- /dev/null
+++ b/package/sslh/0002-replace-U+c2a0.patch
@@ -0,0 +1,12 @@
+diff -durN sslh-v1.18.orig/genver.sh sslh-v1.18/genver.sh
+--- sslh-v1.18.orig/genver.sh 2017-02-21 22:03:40.849161283 +0100
++++ sslh-v1.18/genver.sh 2017-02-21 22:03:59.173402356 +0100
+@@ -25,7 +25,7 @@
+ fi
+ fi
+
+-if [ -d .git ]?&& head=`git rev-parse --verify HEAD 2>/dev/null`; then
++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
+ # generate the version info based on the tag
+ release=`(git describe --tags || git --describe || git describe --all --long) \
+ 2>/dev/null | tr -d '\n'`
diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
index 3177444..17aafd1 100644
--- a/package/sslh/sslh.mk
+++ b/package/sslh/sslh.mk
@@ -12,7 +12,7 @@ SSLH_LICENSE_FILES = COPYING
SSLH_DEPENDENCIES = libconfig
define SSLH_BUILD_CMDS
- $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+ $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
endef
define SSLH_INSTALL_TARGET_CMDS
--
2.7.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel
2017-02-21 21:12 [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel Yann E. MORIN
@ 2017-02-21 21:15 ` Peter Seiderer
2017-02-21 21:17 ` Peter Seiderer
2017-02-23 20:52 ` Thomas Petazzoni
2 siblings, 0 replies; 6+ messages in thread
From: Peter Seiderer @ 2017-02-21 21:15 UTC (permalink / raw)
To: buildroot
Hello Yann,
On Tue, 21 Feb 2017 22:12:22 +0100, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> The Makefile is not parallel-safe, so we build with MAKE1. Since the
> source is very small, this has minor impact on perforance.
>
> The genver.sh script conaains a troll character U+c2a0 (non-break space)
Minor typo s/conaains/contains/...
Regards,
Peter
> which is refused by some versions of /bin/sh. Patch it away.
>
> Fixes:
> http://autobuild.buildroot.net/results/867/867c74ed74fd04ab06d1a10ff34ca177fe005fd2/
> http://autobuild.buildroot.net/results/f97/f971629bc99147f9014e52c6ef71c3417faa6b67/
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: David Bachelart <david.bachelart@bbright.com>
> ---
> package/sslh/0002-replace-U+c2a0.patch | 12 ++++++++++++
> package/sslh/sslh.mk | 2 +-
> 2 files changed, 13 insertions(+), 1 deletion(-)
> create mode 100644 package/sslh/0002-replace-U+c2a0.patch
>
> diff --git a/package/sslh/0002-replace-U+c2a0.patch b/package/sslh/0002-replace-U+c2a0.patch
> new file mode 100644
> index 0000000..38093fa
> --- /dev/null
> +++ b/package/sslh/0002-replace-U+c2a0.patch
> @@ -0,0 +1,12 @@
> +diff -durN sslh-v1.18.orig/genver.sh sslh-v1.18/genver.sh
> +--- sslh-v1.18.orig/genver.sh 2017-02-21 22:03:40.849161283 +0100
> ++++ sslh-v1.18/genver.sh 2017-02-21 22:03:59.173402356 +0100
> +@@ -25,7 +25,7 @@
> + fi
> + fi
> +
> +-if [ -d .git ]?&& head=`git rev-parse --verify HEAD 2>/dev/null`; then
> ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
> + # generate the version info based on the tag
> + release=`(git describe --tags || git --describe || git describe --all --long) \
> + 2>/dev/null | tr -d '\n'`
> diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
> index 3177444..17aafd1 100644
> --- a/package/sslh/sslh.mk
> +++ b/package/sslh/sslh.mk
> @@ -12,7 +12,7 @@ SSLH_LICENSE_FILES = COPYING
> SSLH_DEPENDENCIES = libconfig
>
> define SSLH_BUILD_CMDS
> - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> + $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> endef
>
> define SSLH_INSTALL_TARGET_CMDS
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel
2017-02-21 21:12 [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel Yann E. MORIN
2017-02-21 21:15 ` Peter Seiderer
@ 2017-02-21 21:17 ` Peter Seiderer
2017-02-21 21:22 ` Yann E. MORIN
2017-02-23 20:52 ` Thomas Petazzoni
2 siblings, 1 reply; 6+ messages in thread
From: Peter Seiderer @ 2017-02-21 21:17 UTC (permalink / raw)
To: buildroot
Hello Yann,
On Tue, 21 Feb 2017 22:12:22 +0100, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
> The Makefile is not parallel-safe, so we build with MAKE1. Since the
> source is very small, this has minor impact on perforance.
Second minor typo s/perforance/performance/...
Regards,
Peter
>
> The genver.sh script conaains a troll character U+c2a0 (non-break space)
> which is refused by some versions of /bin/sh. Patch it away.
>
> Fixes:
> http://autobuild.buildroot.net/results/867/867c74ed74fd04ab06d1a10ff34ca177fe005fd2/
> http://autobuild.buildroot.net/results/f97/f971629bc99147f9014e52c6ef71c3417faa6b67/
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: David Bachelart <david.bachelart@bbright.com>
> ---
> package/sslh/0002-replace-U+c2a0.patch | 12 ++++++++++++
> package/sslh/sslh.mk | 2 +-
> 2 files changed, 13 insertions(+), 1 deletion(-)
> create mode 100644 package/sslh/0002-replace-U+c2a0.patch
>
> diff --git a/package/sslh/0002-replace-U+c2a0.patch b/package/sslh/0002-replace-U+c2a0.patch
> new file mode 100644
> index 0000000..38093fa
> --- /dev/null
> +++ b/package/sslh/0002-replace-U+c2a0.patch
> @@ -0,0 +1,12 @@
> +diff -durN sslh-v1.18.orig/genver.sh sslh-v1.18/genver.sh
> +--- sslh-v1.18.orig/genver.sh 2017-02-21 22:03:40.849161283 +0100
> ++++ sslh-v1.18/genver.sh 2017-02-21 22:03:59.173402356 +0100
> +@@ -25,7 +25,7 @@
> + fi
> + fi
> +
> +-if [ -d .git ]?&& head=`git rev-parse --verify HEAD 2>/dev/null`; then
> ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
> + # generate the version info based on the tag
> + release=`(git describe --tags || git --describe || git describe --all --long) \
> + 2>/dev/null | tr -d '\n'`
> diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
> index 3177444..17aafd1 100644
> --- a/package/sslh/sslh.mk
> +++ b/package/sslh/sslh.mk
> @@ -12,7 +12,7 @@ SSLH_LICENSE_FILES = COPYING
> SSLH_DEPENDENCIES = libconfig
>
> define SSLH_BUILD_CMDS
> - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> + $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> endef
>
> define SSLH_INSTALL_TARGET_CMDS
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel
2017-02-21 21:17 ` Peter Seiderer
@ 2017-02-21 21:22 ` Yann E. MORIN
0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2017-02-21 21:22 UTC (permalink / raw)
To: buildroot
\Peter, All,
On 2017-02-21 22:17 +0100, Peter Seiderer spake thusly:
> On Tue, 21 Feb 2017 22:12:22 +0100, "Yann E. MORIN" <yann.morin.1998@free.fr> wrote:
>
> > The Makefile is not parallel-safe, so we build with MAKE1. Since the
> > source is very small, this has minor impact on perforance.
>
> Second minor typo s/perforance/performance/...
You know what? My troll-catcher plugin does not catch all troll
characters. Because, obviously, those are only troll characters, not
typoes on my side. Everybody would know it by now if I ever did typoes.
Oh wait... ;-)
Thanks!
Regards,
Yann E. MORIN.
> > The genver.sh script conaains a troll character U+c2a0 (non-break space)
> > which is refused by some versions of /bin/sh. Patch it away.
> >
> > Fixes:
> > http://autobuild.buildroot.net/results/867/867c74ed74fd04ab06d1a10ff34ca177fe005fd2/
> > http://autobuild.buildroot.net/results/f97/f971629bc99147f9014e52c6ef71c3417faa6b67/
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: David Bachelart <david.bachelart@bbright.com>
> > ---
> > package/sslh/0002-replace-U+c2a0.patch | 12 ++++++++++++
> > package/sslh/sslh.mk | 2 +-
> > 2 files changed, 13 insertions(+), 1 deletion(-)
> > create mode 100644 package/sslh/0002-replace-U+c2a0.patch
> >
> > diff --git a/package/sslh/0002-replace-U+c2a0.patch b/package/sslh/0002-replace-U+c2a0.patch
> > new file mode 100644
> > index 0000000..38093fa
> > --- /dev/null
> > +++ b/package/sslh/0002-replace-U+c2a0.patch
> > @@ -0,0 +1,12 @@
> > +diff -durN sslh-v1.18.orig/genver.sh sslh-v1.18/genver.sh
> > +--- sslh-v1.18.orig/genver.sh 2017-02-21 22:03:40.849161283 +0100
> > ++++ sslh-v1.18/genver.sh 2017-02-21 22:03:59.173402356 +0100
> > +@@ -25,7 +25,7 @@
> > + fi
> > + fi
> > +
> > +-if [ -d .git ]?&& head=`git rev-parse --verify HEAD 2>/dev/null`; then
> > ++if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then
> > + # generate the version info based on the tag
> > + release=`(git describe --tags || git --describe || git describe --all --long) \
> > + 2>/dev/null | tr -d '\n'`
> > diff --git a/package/sslh/sslh.mk b/package/sslh/sslh.mk
> > index 3177444..17aafd1 100644
> > --- a/package/sslh/sslh.mk
> > +++ b/package/sslh/sslh.mk
> > @@ -12,7 +12,7 @@ SSLH_LICENSE_FILES = COPYING
> > SSLH_DEPENDENCIES = libconfig
> >
> > define SSLH_BUILD_CMDS
> > - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> > + $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D)
> > endef
> >
> > define SSLH_INSTALL_TARGET_CMDS
>
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel
2017-02-21 21:12 [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel Yann E. MORIN
2017-02-21 21:15 ` Peter Seiderer
2017-02-21 21:17 ` Peter Seiderer
@ 2017-02-23 20:52 ` Thomas Petazzoni
2017-02-23 20:56 ` Yann E. MORIN
2 siblings, 1 reply; 6+ messages in thread
From: Thomas Petazzoni @ 2017-02-23 20:52 UTC (permalink / raw)
To: buildroot
Hello,
On Tue, 21 Feb 2017 22:12:22 +0100, Yann E. MORIN wrote:
> The Makefile is not parallel-safe, so we build with MAKE1. Since the
> source is very small, this has minor impact on perforance.
>
> The genver.sh script conaains a troll character U+c2a0 (non-break space)
> which is refused by some versions of /bin/sh. Patch it away.
>
> Fixes:
> http://autobuild.buildroot.net/results/867/867c74ed74fd04ab06d1a10ff34ca177fe005fd2/
> http://autobuild.buildroot.net/results/f97/f971629bc99147f9014e52c6ef71c3417faa6b67/
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> Cc: David Bachelart <david.bachelart@bbright.com>
> ---
> package/sslh/0002-replace-U+c2a0.patch | 12 ++++++++++++
> package/sslh/sslh.mk | 2 +-
> 2 files changed, 13 insertions(+), 1 deletion(-)
> create mode 100644 package/sslh/0002-replace-U+c2a0.patch
Applied to master after fixing the typoes, thanks! Did you submit the
patch to the upstream project, and report the parallel build issue?
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 6+ messages in thread
* [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel
2017-02-23 20:52 ` Thomas Petazzoni
@ 2017-02-23 20:56 ` Yann E. MORIN
0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2017-02-23 20:56 UTC (permalink / raw)
To: buildroot
Thomas, All,
On 2017-02-23 21:52 +0100, Thomas Petazzoni spake thusly:
> On Tue, 21 Feb 2017 22:12:22 +0100, Yann E. MORIN wrote:
> > The Makefile is not parallel-safe, so we build with MAKE1. Since the
> > source is very small, this has minor impact on perforance.
> >
> > The genver.sh script conaains a troll character U+c2a0 (non-break space)
> > which is refused by some versions of /bin/sh. Patch it away.
> >
> > Fixes:
> > http://autobuild.buildroot.net/results/867/867c74ed74fd04ab06d1a10ff34ca177fe005fd2/
> > http://autobuild.buildroot.net/results/f97/f971629bc99147f9014e52c6ef71c3417faa6b67/
> >
> > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
> > Cc: David Bachelart <david.bachelart@bbright.com>
> > ---
> > package/sslh/0002-replace-U+c2a0.patch | 12 ++++++++++++
> > package/sslh/sslh.mk | 2 +-
> > 2 files changed, 13 insertions(+), 1 deletion(-)
> > create mode 100644 package/sslh/0002-replace-U+c2a0.patch
>
> Applied to master after fixing the typoes, thanks!
Thanks!
> Did you submit the
> patch to the upstream project, and report the parallel build issue?
I was about to do that, yes.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-02-23 20:56 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-21 21:12 [Buildroot] [PATCH] package/sslh: fix script, does not build in parallel Yann E. MORIN
2017-02-21 21:15 ` Peter Seiderer
2017-02-21 21:17 ` Peter Seiderer
2017-02-21 21:22 ` Yann E. MORIN
2017-02-23 20:52 ` Thomas Petazzoni
2017-02-23 20:56 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox