From patchwork Thu Nov 30 13:19:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 120189 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp660142qgn; Thu, 30 Nov 2017 05:20:14 -0800 (PST) X-Google-Smtp-Source: AGs4zMaNEVAZKK+jeHQHSPka2B5MITSOOVSqGFsTxvIkFEBHt89xOSWKF8YX68x2zMm7A/OsMRXK X-Received: by 10.84.178.131 with SMTP id z3mr2585574plb.165.1512048014325; Thu, 30 Nov 2017 05:20:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512048014; cv=none; d=google.com; s=arc-20160816; b=P66HckrVM/x+nAQ6fEmhK/kSxQfzW9dHec5DcG1N322hXs0fgV/RiAyyfIYziaqX+M eeTxKWhX+bMmUr3A22JZ9suq85j+MhqDq7ETuaelJtGlAD5nar/fVrHygpTIuvYs7WN+ N6WO9h5J5YKNuzgYKkDJgMUx9Sdfb35L8kpEsZFZPOCxcQ06qE1xxe8+YNeu9w9yhF5G g+2A3Rk9YUYKueriZyW97Xu1ce+Qtl3H7CJGxrM4TxeIHOL6ppDp+1MRSuipxEDmOK/G 2NvIe2Q1VWifAbWKUIs3GM+m1W0mYZrWufe+LXsxKW3NhMwul3Nj0osGZCSOljGE4B6M Lcqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=87HS/iTQ83yByJ9mVQKjsfTMm18QbpHil4hIVIpGJ44=; b=nP0h1jzc6kuxc97q3Tiv+DA6Ljha3z9UtNAOs0KI4JXIU5+FQ+ujFxUV6iH84CHhU2 XRyAvQgRUxdCTWRjk/OwjFFYcEsRQw7NMz9LIKFXT17QhG0RQToSIW1wDm3Bdz8zkwc4 7tPS/k1IjZhtmgpDYiZqGQcczdmflV2iW7cONbmJm/RmKltc+xvebW+0mDq12/AudGEz CVGd5bfXjrMyY0FnTZHC5OAQA9Gf3iRjR8jCHcinvrERg6YL1h5qtSWzjtc4kda+oyxb Q4Kc0JwDW8qXJqTDsn6NwMMwVG7ktLRatCjbuEdfHMdG93gOFCQGyw8y8pfOphwkOsTt RcOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=I44Sf4sn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id u10si3148004plz.134.2017.11.30.05.20.14; Thu, 30 Nov 2017 05:20:14 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=I44Sf4sn; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from review.yoctoproject.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 69B2378489; Thu, 30 Nov 2017 13:20:11 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by mail.openembedded.org (Postfix) with ESMTP id 45D35602D9 for ; Thu, 30 Nov 2017 13:19:43 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id s66so6544620wrc.9 for ; Thu, 30 Nov 2017 05:19:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=i9b5z9dsHqHq6rl/iYM+haWiSoqnCUBs4Dgycq+LNS0=; b=I44Sf4snVXfQQn86h/sO6Qvcy0QTj+Cbu+Qdi4H/HHavMHbGeQuBAFOqNAgLeOQYFG /0Arodqrz4RBrI009FFDbm7/Eckc3lRW+kv8efC2fl7tSdhB/dlLv4LeFOTGmWLovEin uzaIp9Sd2jRch/FF+Wv2KNHZoHL7kkQOdKzQPtuSwOSDYi588gPiEhtVaNsw20B058kO 0DRFaO+q/kUONDkIdh3imerhTMpWgtrflYruuHeiQ9+WbM2beA9aYMEw1eoagpfoM2Tl uMyrLr2RdznswrT+ihg6FZeQlJ35HL8cKoGcXP/bWROhk9/eceghVNzIZ55Y3AIOCC9a 0UMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=i9b5z9dsHqHq6rl/iYM+haWiSoqnCUBs4Dgycq+LNS0=; b=LXLeozzr6n9Ib9VS6hPq0aCIDuTcw2tSOVX8yBTFNLty3hsZvvmBkIuSDUUlxbcfsG 0o42HTSldz4u1d7k5z+pv8hKg+eR9eZ9zQDk0d5yxUQMaz85aeFMmELrFlmjyZu5oP1P iI3Htps4QusMNF9rXNE/3v11jLofY/j4RlYAuxWYd1eManf4GPPlgRIZhwD7F+SP4bjn TGoItasgTkIXjFfSKGHwMTeQC7qz5n4a0wadErdbdF9sFCJgDeGr3DBxlQrsd8whZWt3 Cmn5bSk75Bmnm2e/zXZEzXWonf96rjJqMjcKs3QvoZy3UTuRTwNU53u/202vN80dAa14 h1nw== X-Gm-Message-State: AJaThX4SYDUfxPx8uV2NhSWIpJ0w5O01glDZg4l/peW8IiJqt62HJFb+ UMBrvxSu2cVtOojC60sAJ9/fDftE X-Received: by 10.223.151.197 with SMTP id t5mr1846040wrb.263.1512047984688; Thu, 30 Nov 2017 05:19:44 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id q15sm3602780wra.91.2017.11.30.05.19.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 05:19:43 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 30 Nov 2017 13:19:33 +0000 Message-Id: <20171130131935.20771-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171130131935.20771-1-ross.burton@intel.com> References: <20171130131935.20771-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/4] openssh: don't do aclocal/acinclude dance X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org Instead, just stop running aclocal. Signed-off-by: Ross Burton --- meta/recipes-connectivity/openssh/openssh_7.6p1.bb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core 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" -