Skip to contentSkip to conversation

package/nut: fix parallel install

PATCH New Yann E. MORIN 2 participants 3 messages Aug 17, 2014

lore
Share & tools
lore

Yann E. MORIN

author
#0 lore raw

PATCH 1/1 package/nut: fix parallel install

Fixes:

    http://autobuild.buildroot.net/results/256/2567e13cd5bc702bc3a38a1d6fc8e34022cc7db5/
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/nut/nut-0002-parallel-build.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/nut/nut-0002-parallel-build.patch
package/nut/nut-0002-parallel-build.patch new file +24 -0
new file mode 100644
index 0000000..f979c19
@@ -0,0 +1,24 @@
+conf: fix parallel install
+
+Do not reference the upsmon.conf.sample twice, otherwise install, with
+a high number of make jobs, may fail, like so:
+    http://autobuild.buildroot.net/results/256/2567e13cd5bc702bc3a38a1d6fc8e34022cc7db5/build-end.log
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+---
+Upstream status:
+    https://github.com/networkupstools/nut/pull/147
+
+diff -durB nut-2.7.2.orig/conf/Makefile.am nut-2.7.2/conf/Makefile.am
+--- nut-2.7.2.orig/conf/Makefile.am	2014-02-14 09:56:53.000000000 +0100
++++ nut-2.7.2/conf/Makefile.am	2014-08-17 11:33:46.804439240 +0200
+@@ -2,7 +2,7 @@
+ 
+ INSTALL_0600 = $(INSTALL) -m 0600
+ 
+-SECFILES = upsmon.conf.sample upsd.conf.sample upsd.users.sample
++SECFILES = upsd.conf.sample upsd.users.sample
+ PUBFILES = nut.conf.sample ups.conf.sample
+ CGIPUB = hosts.conf.sample upsset.conf.sample upsstats.html.sample	\
+  upsstats-single.html.sample
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/1 package/nut: fix parallel install

All,

On 2014-08-17 12:03 +0200, Yann E. MORIN spake thusly:

Quoted 16 lines

Fixes:

    http://autobuild.buildroot.net/results/256/2567e13cd5bc702bc3a38a1d6fc8e34022cc7db5/
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/nut/nut-0002-parallel-build.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/nut/nut-0002-parallel-build.patch
package/nut/nut-0002-parallel-build.patch new file +1 -0
new file mode 100644
index 0000000..f979c19
@@ -0,0 +1,24 @@
+conf: fix parallel install

package/nut/nut-0002-parallel-build.patch line 11

Quoted 10 lines
package/nut/nut-0002-parallel-build.patch new file +10 -0
+
+Do not reference the upsmon.conf.sample twice, otherwise install, with
+a high number of make jobs, may fail, like so:
+    http://autobuild.buildroot.net/results/256/2567e13cd5bc702bc3a38a1d6fc8e34022cc7db5/build-end.log
+
+Signed-off-by: "Yann E. MORIN" <[email protected]>
+
+---
+Upstream status:
+    https://github.com/networkupstools/nut/pull/147

Accepted upstream; ref. the URL above.

Regards,
Yann E. MORIN.

Quoted 15 lines
package/nut/nut-0002-parallel-build.patch new file +12 -0
+diff -durB nut-2.7.2.orig/conf/Makefile.am nut-2.7.2/conf/Makefile.am
+--- nut-2.7.2.orig/conf/Makefile.am	2014-02-14 09:56:53.000000000 +0100
++++ nut-2.7.2/conf/Makefile.am	2014-08-17 11:33:46.804439240 +0200
+@@ -2,7 +2,7 @@
+ 
+ INSTALL_0600 = $(INSTALL) -m 0600
+ 
+-SECFILES = upsmon.conf.sample upsd.conf.sample upsd.users.sample
++SECFILES = upsd.conf.sample upsd.users.sample
+ PUBFILES = nut.conf.sample ups.conf.sample
+ CGIPUB = hosts.conf.sample upsset.conf.sample upsstats.html.sample	\
+  upsstats-single.html.sample
Signature · 1 line
1.9.1
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.  |
'------------------------------^-------^------------------^--------------------'
Applied
#2 lore raw

PATCH 1/1 package/nut: fix parallel install

In reply to Yann E. MORIN

Dear Yann E. MORIN,

Quoted 8 lines · Yann E. MORIN

Fixes:

    http://autobuild.buildroot.net/results/256/2567e13cd5bc702bc3a38a1d6fc8e34022cc7db5/
Signed-off-by "Yann E. MORIN" <[email protected]>
---
 package/nut/nut-0002-parallel-build.patch | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 package/nut/nut-0002-parallel-build.patch

Applied, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com