mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
openldap: Remove unnecessary use-urandom.patch
use-urandom.patch sets URANDOM_DEVICE to /dev/urandom when cross compiling, but the same value is also defined in the recipe's compile flags. This patch removes that unnecessary patch and resolves the redefinition warning. Signed-off-by: Jiaqing Zhao <jiaqing.zhao@linux.intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
1de8b9c7e2
commit
b2261dbb95
|
|
@ -1,35 +0,0 @@
|
|||
openldap: assume /dev/urandom exists
|
||||
|
||||
When we are cross-compiling, we want to assume
|
||||
that /dev/urandom exists. We could change the source
|
||||
code to look for it, but this is the easy way out.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Joe Slater <jslater@windriver.com>
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -2117,6 +2117,7 @@ AC_SUBST(systemdsystemunitdir)
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
dnl Check for entropy sources
|
||||
+dev=no
|
||||
if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then
|
||||
dev=no
|
||||
if test -r /dev/urandom ; then
|
||||
@@ -2131,9 +2132,11 @@ if test $cross_compiling != yes && test "$ac_cv_mingw32" != yes ; then
|
||||
dev="/idev/random";
|
||||
fi
|
||||
|
||||
- if test $dev != no ; then
|
||||
- AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device])
|
||||
- fi
|
||||
+elif test $cross_compiling == yes ; then
|
||||
+ dev="/dev/urandom";
|
||||
+fi
|
||||
+if test $dev != no ; then
|
||||
+ AC_DEFINE_UNQUOTED(URANDOM_DEVICE,"$dev",[set to urandom device])
|
||||
fi
|
||||
|
||||
dnl ----------------------------------------------------------------
|
||||
|
|
@ -15,7 +15,6 @@ SECTION = "libs"
|
|||
LDAP_VER = "${@'.'.join(d.getVar('PV').split('.')[0:2])}"
|
||||
|
||||
SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/${BP}.tgz \
|
||||
file://use-urandom.patch \
|
||||
file://initscript \
|
||||
file://slapd.service \
|
||||
file://remove-user-host-pwd-from-version.patch \
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user