diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2014-08-17 12:03:12 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2014-08-17 21:00:19 +0200 |
| commit | dce24bba0d2e85eb4bae50e2b061bd3f3bcbd531 (patch) | |
| tree | 95fa06ff1bbb377342d8dbcd062584cf1ee0634d /package/nut/nut-0002-parallel-build.patch | |
| parent | 702a461c4dd7ab6d0bf104d3dbad3944af5c294a (diff) | |
| download | buildroot-dce24bba0d2e85eb4bae50e2b061bd3f3bcbd531.tar.gz buildroot-dce24bba0d2e85eb4bae50e2b061bd3f3bcbd531.zip | |
package/nut: fix parallel install
Fixes:
http://autobuild.buildroot.net/results/256/2567e13cd5bc702bc3a38a1d6fc8e34022cc7db5/
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/nut/nut-0002-parallel-build.patch')
| -rw-r--r-- | package/nut/nut-0002-parallel-build.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/package/nut/nut-0002-parallel-build.patch b/package/nut/nut-0002-parallel-build.patch new file mode 100644 index 0000000000..f979c19da9 --- /dev/null +++ b/package/nut/nut-0002-parallel-build.patch @@ -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" <yann.morin.1998@free.fr> + +--- +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 |
