mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-16 04:17:25 +00:00
ntp: cleanup recipes and fix SSL support
* Move common definitions to the inc file * Drop override of do_configure which doesn't seem to be needed anymore * Fold ntp-ssl into the ntp recipe as a PACKAGECONFIG option for those who want it (default to off) and fix configure-time checks to detect OpenSSL properly so that it gets enabled when selected * Remove ntp-bin package and put its contents in currently empty ntp-utils package (with migration path) * Fix hardcoded paths in ntpd initscript * Specify ntpd.conf as a configuration file for packaging purposes * Rearrange so that packaging definitions are towards the end in the expected order * Delete unused "ntp" initscript file * Add SUMMARY * Update HOMEPAGE This reapplies some of the changes from the original patch by Morgan Little <morgan.little@windriver.com>. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
committed by
Joe MacDonald
parent
11a6ce97f7
commit
93f71dafeb
@@ -0,0 +1,59 @@
|
||||
Hack OpenSSL check to work when libssl and libcrypto aren't in same dir
|
||||
|
||||
Upstream-Status: Inappropriate [config]
|
||||
|
||||
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
|
||||
---
|
||||
configure | 4 ++--
|
||||
m4/ntp_openssl.m4 | 4 ++--
|
||||
sntp/configure | 4 ++--
|
||||
3 files changed, 6 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/configure b/configure
|
||||
index aae2c01..6a3c15e 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -22868,8 +22868,8 @@ case "$ans" in
|
||||
test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
|
||||
;;
|
||||
*)
|
||||
- test -f $i/libcrypto.so -a -f $i/libssl.so && break
|
||||
- test -f $i/libcrypto.a -a -f $i/libssl.a && break
|
||||
+ test -f $i/libssl.so && break
|
||||
+ test -f $i/libssl.a && break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
diff --git a/m4/ntp_openssl.m4 b/m4/ntp_openssl.m4
|
||||
index 7d9f477..67bdd55 100644
|
||||
--- a/m4/ntp_openssl.m4
|
||||
+++ b/m4/ntp_openssl.m4
|
||||
@@ -41,8 +41,8 @@ case "$ans" in
|
||||
test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
|
||||
;;
|
||||
*)
|
||||
- test -f $i/libcrypto.so -a -f $i/libssl.so && break
|
||||
- test -f $i/libcrypto.a -a -f $i/libssl.a && break
|
||||
+ test -f $i/libssl.so && break
|
||||
+ test -f $i/libssl.a && break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
diff --git a/sntp/configure b/sntp/configure
|
||||
index 7782c29..55e82d9 100755
|
||||
--- a/sntp/configure
|
||||
+++ b/sntp/configure
|
||||
@@ -14810,8 +14810,8 @@ case "$ans" in
|
||||
test -f $i/libcrypto.dylib -a -f $i/libssl.dylib && break
|
||||
;;
|
||||
*)
|
||||
- test -f $i/libcrypto.so -a -f $i/libssl.so && break
|
||||
- test -f $i/libcrypto.a -a -f $i/libssl.a && break
|
||||
+ test -f $i/libssl.so && break
|
||||
+ test -f $i/libssl.a && break
|
||||
;;
|
||||
esac
|
||||
done
|
||||
--
|
||||
1.7.1
|
||||
|
||||
Reference in New Issue
Block a user