package/sslh: fix script, does not build in parallel
PATCH 1/1 package/sslh: fix script, does not build in parallel
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/
--- 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
package/sslh/0002-replace-U+c2a0.patch new file +12 -0
@@ -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'`
package/sslh/sslh.mk +1 -1
@@ -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
Signature · 1 line
2.7.4
PATCH 1/1 package/sslh: fix script, does not build in parallel
Hello Yann,
Quoted 4 lines · Yann E. MORIN
The
Makefileis not parallel-safe, so we build with MAKE1. Since the source is very small, this has minor impact on perforance.The
genver.shscript conaains a troll character U+c2a0 (non-break space)
Minor typo s/conaains/contains/...
Regards,
Peter
Quoted 45 lines
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" <[email protected]>Cc David Bachelart <[email protected]>--- 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.patchpackage/sslh/0002-replace-U+c2a0.patch new file +12
-0@@ -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'`package/sslh/sslh.mk +1
-1@@ -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
PATCH 1/1 package/sslh: fix script, does not build in parallel
In reply to Yann E. MORINHello Yann,
Quoted 2 lines · Yann E. MORIN
The
Makefileis 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
Quoted 47 lines
The
genver.shscript 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" <[email protected]>Cc David Bachelart <[email protected]>--- 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.patchpackage/sslh/0002-replace-U+c2a0.patch new file +12
-0@@ -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'`package/sslh/sslh.mk +1
-1@@ -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
PATCH 1/1 package/sslh: fix script, does not build in parallel
\Peter, All,
On 2017-02-21 22:17 +0100, Peter Seiderer spake thusly:
Quoted 6 lines · Yann E. MORIN
Quoted 3 lines
The
Makefileis 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.
Quoted 47 lines
Quoted 46 lines
The
genver.shscript 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" <[email protected]>Cc David Bachelart <[email protected]>--- 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.patchpackage/sslh/0002-replace-U+c2a0.patch new file +12
-0@@ -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'`package/sslh/sslh.mk +1
-1@@ -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
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'
Thomas Petazzoni
AppliedPATCH 1/1 package/sslh: fix script, does not build in parallel
In reply to Yann E. MORINHello,
Quoted 10 lines · Yann E. MORIN
The
Makefileis not parallel-safe, so we build with MAKE1. Since the source is very small, this has minor impact on perforance.The
genver.shscript 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/
Quoted 7 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc David Bachelart <[email protected]>--- 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
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 1/1 package/sslh: fix script, does not build in parallel
Thomas, All,
On 2017-02-23 21:52 +0100, Thomas Petazzoni spake thusly:
Quoted 19 lines · Yann E. MORIN
Quoted 10 lines
The
Makefileis not parallel-safe, so we build with MAKE1. Since the source is very small, this has minor impact on perforance.The
genver.shscript 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/Quoted 7 lines
Signed-off-by "Yann E. MORIN" <[email protected]>Cc David Bachelart <[email protected]>--- 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
Quoted 1 line
Applied to master after fixing the typoes, thanks!
Thanks!
Quoted 2 lines
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.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | 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. | '------------------------------^-------^------------------^--------------------'