diff mbox series

[meta-oe] openldap: Remove unnecessary use-urandom.patch

Message ID 20220520094257.2906304-1-jiaqing.zhao@linux.intel.com
State Under Review
Headers show
Series [meta-oe] openldap: Remove unnecessary use-urandom.patch | expand

Commit Message

Jiaqing Zhao May 20, 2022, 9:42 a.m. UTC 
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>
---
 .../openldap/openldap/use-urandom.patch       | 35 -------------------
 .../openldap/openldap_2.5.12.bb               |  1 -
 2 files changed, 36 deletions(-)
 delete mode 100644 meta-oe/recipes-support/openldap/openldap/use-urandom.patch
diff mbox series

Patch

diff --git a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch b/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
deleted file mode 100644
index 0b7e3a28a..000000000
--- a/meta-oe/recipes-support/openldap/openldap/use-urandom.patch
+++ /dev/null
@@ -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 ----------------------------------------------------------------
diff --git a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
index e4475e506..a0ca2b5d3 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.5.12.bb
@@ -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 \