From 547fc42ff9629912dc7fc2de279fab1e4760745e Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 6 Aug 2014 14:09:21 +0200
Subject: [PATCH] Improve haveged patch

---
 ...fter-initial-setup-and-disable-tests.patch | 33 +++++++++++++++++++
 ...er-initial-setup-and-don-t-run-tests.patch | 27 ---------------
 2 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch
 delete mode 100644 patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch

diff --git a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch
new file mode 100644
index 00000000..915dfff0
--- /dev/null
+++ b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-disable-tests.patch
@@ -0,0 +1,33 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sat, 26 Jul 2014 18:06:07 +0200
+Subject: haveged: start directly after initial setup and disable tests
+
+diff --git a/utils/haveged/Makefile b/utils/haveged/Makefile
+index 12a6237..e9ff3f1 100644
+--- a/utils/haveged/Makefile
++++ b/utils/haveged/Makefile
+@@ -41,8 +41,9 @@ define Package/libhavege
+ endef
+ 
+ CONFIGURE_ARGS+= \
+-      --enable-daemon=yes
+-      --enable-threads=no
++      --enable-daemon=yes \
++      --enable-threads=no \
++      --enable-olt=no
+ 
+ define Build/InstallDev
+ 	$(INSTALL_DIR) $(1)/usr/include
+diff --git a/utils/haveged/files/haveged.init b/utils/haveged/files/haveged.init
+index ce28e61..113d64f 100644
+--- a/utils/haveged/files/haveged.init
++++ b/utils/haveged/files/haveged.init
+@@ -1,7 +1,7 @@
+ #!/bin/sh /etc/rc.common
+ # Copyright (C) 2012 OpenWrt.org
+ 
+-START=98
++START=13
+ 
+ HAVEGED_THRESHOLD=1024
+ HAVEGED_DCACHE=32
diff --git a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch b/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch
deleted file mode 100644
index ff3d871e..00000000
--- a/patches/packages/openwrt/0001-haveged-start-directly-after-initial-setup-and-don-t-run-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 26 Jul 2014 18:06:07 +0200
-Subject: haveged: start directly after initial setup and don't run tests
-
-diff --git a/utils/haveged/files/haveged.init b/utils/haveged/files/haveged.init
-index ce28e61..aa8d3c7 100644
---- a/utils/haveged/files/haveged.init
-+++ b/utils/haveged/files/haveged.init
-@@ -1,14 +1,16 @@
- #!/bin/sh /etc/rc.common
- # Copyright (C) 2012 OpenWrt.org
- 
--START=98
-+START=13
- 
- HAVEGED_THRESHOLD=1024
- HAVEGED_DCACHE=32
- HAVEGED_ICACHE=32
-+HAVEGED_TESTS_TOT=
-+HAVEGED_TESTS_CONT=
- 
- start() {
--	service_start /usr/sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1
-+	service_start /usr/sbin/haveged -w $HAVEGED_THRESHOLD -d $HAVEGED_DCACHE -i $HAVEGED_ICACHE -v 1 -o t${HAVEGED_TESTS_TOT}c${HAVEGED_TESTS_CONT}
- }
- 
- stop() {