summaryrefslogtreecommitdiffstats
path: root/package/nut/0002-parallel-build.patch
diff options
context:
space:
mode:
authorYann E. MORIN <yann.morin.1998@free.fr>2017-01-01 10:00:56 +0100
committerPeter Korsgaard <peter@korsgaard.com>2017-01-04 17:10:15 +0100
commit5993f7acd1fb2f284d99b637c1bf3c6f64b32cdd (patch)
tree5f480ebaeedca6f0c4b823656581fc121944cda8 /package/nut/0002-parallel-build.patch
parentce12407148b9efcc607742bf0e8d3999723420d8 (diff)
downloadbuildroot-5993f7acd1fb2f284d99b637c1bf3c6f64b32cdd.tar.gz
buildroot-5993f7acd1fb2f284d99b637c1bf3c6f64b32cdd.zip
package/nut: bump version
Update our patches: - drop patch 1, replaced by an upstream equivalent; adapt config options and env accordingly, - drop patch 2, applied upstream, - rename patch 3 gdlib-config and net-snmp-config are only used when said support is enabled (resp. CGI and SNMP), so no need to pass them unconditionally. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/nut/0002-parallel-build.patch')
-rw-r--r--package/nut/0002-parallel-build.patch24
1 files changed, 0 insertions, 24 deletions
diff --git a/package/nut/0002-parallel-build.patch b/package/nut/0002-parallel-build.patch
deleted file mode 100644
index f979c19da9..0000000000
--- a/package/nut/0002-parallel-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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
OpenPOWER on IntegriCloud