Skip to contentSkip to conversation

ntp: fix build for no-MMU

PATCH New Baruch Siach 2 participants 3 messages Oct 12, 2018 – Oct 23, 2018

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 ntp: fix build for no-MMU

Code rearrange in the latest ntp version exposed code that used to be hidden behind HAVE_WORKING_FORK. Put this code back where it belongs.

Fixes:
http://autobuild.buildroot.net/results/9f4/9f4710b451df1a60f95ab6503cfb7788ad998a65/
http://autobuild.buildroot.net/results/d0b/d0b20a6c0f37a8b06841afc2764c8aab6ffd27d2/
http://autobuild.buildroot.net/results/85c/85c89f5e9d36915567b8d14b9c99e3720c866577/

Cc Artem Panfilov <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/ntp/0003-fix-nommu.patch | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 package/ntp/0003-fix-nommu.patch
package/ntp/0003-fix-nommu.patch new file +22 -0
new file mode 100644
index 000000000000..53bf4dfcf38b
@@ -0,0 +1,22 @@
+Fix no-MMU build
+
+The detach_from_terminal() is unused for no-MMU, but it depends on symbols
+that are not defined for no-MMU. Don't define detach_from_terminal() when
+HAVE_WORKING_FORK is not defined.
+
+Signed-off-by: Baruch Siach <[email protected]>
+---
+Upstream status: http://bugs.ntp.org/show_bug.cgi?id=3538
+
+diff -Nuar ntp-4.2.8p12.orig/ntpd/ntpd.c ntp-4.2.8p12/ntpd/ntpd.c
+--- ntp-4.2.8p12.orig/ntpd/ntpd.c	2018-08-14 14:51:30.000000000 +0300
++++ ntp-4.2.8p12/ntpd/ntpd.c	2018-10-12 08:19:01.291781773 +0300
+@@ -529,7 +529,7 @@
+ }
+ #endif	/* !SIM */
+ 
+-#if !defined(SIM) && !defined(SYS_WINNT)
++#if !defined(SIM) && !defined(SYS_WINNT) && defined(HAVE_WORKING_FORK)
+ /*
+  * Detach from terminal (much like daemon())
+  * Nothe that this function calls exit()
Signature · 1 line
2.19.1
#1 lore raw

PATCH 1/1 ntp: fix build for no-MMU

Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Code rearrange in the latest ntp version exposed code that used to be hidden behind HAVE_WORKING_FORK. Put this code back where it belongs.

Quoted 7 lines

Fixes:
http://autobuild.buildroot.net/results/9f4/9f4710b451df1a60f95ab6503cfb7788ad998a65/
http://autobuild.buildroot.net/results/d0b/d0b20a6c0f37a8b06841afc2764c8aab6ffd27d2/
http://autobuild.buildroot.net/results/85c/85c89f5e9d36915567b8d14b9c99e3720c866577/

Cc Artem Panfilov <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#2 lore raw

PATCH 1/1 ntp: fix build for no-MMU

In reply to Baruch Siach
Quoted 5 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Baruch" == Baruch Siach <[email protected]> writes:

Code rearrange in the latest ntp version exposed code that used to be hidden behind HAVE_WORKING_FORK. Put this code back where it belongs.

Quoted 7 lines

Fixes:
http://autobuild.buildroot.net/results/9f4/9f4710b451df1a60f95ab6503cfb7788ad998a65/
http://autobuild.buildroot.net/results/d0b/d0b20a6c0f37a8b06841afc2764c8aab6ffd27d2/
http://autobuild.buildroot.net/results/85c/85c89f5e9d36915567b8d14b9c99e3720c866577/

Cc Artem Panfilov <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

Committed to 2018.02.x and 2018.08.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard