[prev in list] [next in list] [prev in thread] [next in thread] 

List:       openembedded-core
Subject:    [OE-core] [PATCH 2/4] openssh: don't do aclocal/acinclude dance
From:       Ross Burton <ross.burton () intel ! com>
Date:       2017-11-30 13:19:33
Message-ID: 20171130131935.20771-2-ross.burton () intel ! com
[Download RAW message or body]

Instead, just stop running aclocal.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-connectivity/openssh/openssh_7.6p1.bb | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-connectivity/openssh/openssh_7.6p1.bb \
b/meta/recipes-connectivity/openssh/openssh_7.6p1.bb index ebb9a5734dd..9d940d45907 \
                100644
--- a/meta/recipes-connectivity/openssh/openssh_7.6p1.bb
+++ b/meta/recipes-connectivity/openssh/openssh_7.6p1.bb
@@ -48,6 +48,8 @@ inherit autotools-brokensep ptest
 # LFS support:
 CFLAGS += "-D__FILE_OFFSET_BITS=64"
 
+EXTRA_AUTORECONF += "--exclude=aclocal"
+
 # login path is hardcoded in sshd
 EXTRA_OECONF = "'LOGIN_PROGRAM=${base_bindir}/login' \
                 ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--with-pam', \
'--without-pam', d)} \ @@ -73,9 +75,6 @@ do_configure_prepend () {
 	export LD="${CC}"
 	install -m 0644 ${WORKDIR}/sshd_config ${B}/
 	install -m 0644 ${WORKDIR}/ssh_config ${B}/
-	if [ ! -e acinclude.m4 -a -e aclocal.m4 ]; then
-		cp aclocal.m4 acinclude.m4
-	fi
 }
 
 do_compile_ptest() {
@@ -162,4 +161,3 @@ CONFFILES_${PN}-ssh = "${sysconfdir}/ssh/ssh_config"
 ALTERNATIVE_PRIORITY = "90"
 ALTERNATIVE_${PN}-scp = "scp"
 ALTERNATIVE_${PN}-ssh = "ssh"
-
-- 
2.11.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core


[prev in list] [next in list] [prev in thread] [next in thread]