From patchwork Tue Nov 28 17:12:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 119894 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1973493qgn; Tue, 28 Nov 2017 09:12:13 -0800 (PST) X-Google-Smtp-Source: AGs4zMaA7OKJkg+BC92qlXXpcIK7IGbAvZ6aLajHjH7YmmaoAFVRJdS4593BZYleS+DvflLWO1cO X-Received: by 10.98.71.144 with SMTP id p16mr41111048pfi.15.1511889133088; Tue, 28 Nov 2017 09:12:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511889133; cv=none; d=google.com; s=arc-20160816; b=cL16RJxG262xLKsQnQ1rzAByXnliO7NncTlj2unsMi2HjLnQTtmwUU8CmFH9HHU4pN msiTvvTxUG2ykpwe3PSOvaaal4VBrB5IlIjHuNGa/tj5/C/KW7tFgYbsympRsTg5DFUa LCQXBZjRwxzvvxmiKhp0dvHkfEqP39nky8senflhvD1M1MNRy1VKyYeE4+nuVrgGmFSQ o2EXTNGQVNmsxPydsXefcBlcfwsZy0KNxwkgOJI4X7v18zjRe821TTMMwOYucQnpzxld yNMaBil8AfdlIy7MRMsngQ0yugMEziw9zNXPAUUBBOsZfAeoAVZDS2LEAnR8Tk2l9I/b yOlg== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=fWmmKAEuLE1JPt9bP4UNTsFuxLk83pAWnn0Spp37wXI=; b=xwcQvKC/6hFcoqV6h9irnClJmp5EOBAyv6Uf2Q70TGsam4zEAtYVYfWu02WP/2oqPq Q44ey4dujyNg4JKry5XfK0HlcZYTxP12rhEe6YxOk6jKjIa/9o+tPGgHKZSgBEIVaiFl wekBFqM0c4+92U1RpkdfPwN92CZZalez2kISSmAW3exl5pi37SHO3Ub2Q59XRMGMG3Bh wuncORqSYOlX7WYAnpxwRxmrfM3nSuc1VTLUn5u+PxP7qq23hCosM5bRTqBtCO6sVT0b /KH5bRKMqiADIGo4EcqHIqjH66F1q22BqFHP2RtqrPcCSrzEHsZtZB2L/n2pgHO8prw1 JlCw== 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=zRA11IlW; 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 s7si24811135pgr.336.2017.11.28.09.12.12; Tue, 28 Nov 2017 09:12:13 -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=zRA11IlW; 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 B0EEB780FA; Tue, 28 Nov 2017 17:12:08 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by mail.openembedded.org (Postfix) with ESMTP id 1A307780BD for ; Tue, 28 Nov 2017 17:12:06 +0000 (UTC) Received: by mail-wm0-f66.google.com with SMTP id v19so884765wmh.5 for ; Tue, 28 Nov 2017 09:12:08 -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; bh=k0gp3aeK4fXJh/HrSKi9+CA7rxX6FmFOmx/PHsmeoP0=; b=zRA11IlW88GD6iATv/i9iAyF/+N2WiQG4koJIzOoOJpseY3ycxODfdX/A7h8DDH78L LW3H9QkLAqr6VdyhVhJNmIIlfcuNItxVqhZ81zCuZkZX79Qak//4lTvi1afMx9qz0mtW EfGnIgsAtJLu6Yxhn1D8fXufYc9McKvF10TMYweZvONO7xF6ouwYsf1WBa68sxxVlXlb yBFffLDabzS2aT/fTM8O17vEHgU1w+TBsdDqQiB/1Z6tW+viVGbrXSNwh1zIlqreYDwF 5qx45Nrt2dziqCMRARASln7SyIrjC5mqxn41JcFBkUztANUyKgFxvAh4hUYdtXeNsF/R N4zg== 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; bh=k0gp3aeK4fXJh/HrSKi9+CA7rxX6FmFOmx/PHsmeoP0=; b=MjtitDrVgpcyKOX5sfqrjtnmT6uFEuvvYlZN+Lo496x+OJZlxNfsSnh3GHa5kjh8JL tDWVaTVizBImq/yqigdwPX52divOBDTbfrxYCttDpdfnypZcCbVL+B+FzwuVDTtjVCtk GhSwaH8uphZToq0p4BxMGtxJD0x+KDM6H9xs/fjoQ4nI391guDJq+dhVPp/pcMJeKXKB q69mSWNn2aqLqrCtk56mSiOztJSQIqHL6qCwYsrSEztxPiPXxtx5kHHAoBrCRFz3YEgq 1EayPv/Nea4GbXkcD3TIKESXe4NUTJV3/Txr2efWILB2halc90jzPavfYbqz7pkQnFfz qEdg== X-Gm-Message-State: AJaThX4VoOKwWfcIBtWodviCDxAzKjMIddHNkei268+qNhKfo0JSpV02 hWKf330zxXHJ+rXbWExA5l0jGxZ7 X-Received: by 10.80.245.181 with SMTP id u50mr3594347edm.171.1511889127497; Tue, 28 Nov 2017 09:12:07 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id d58sm12451678ede.62.2017.11.28.09.12.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 28 Nov 2017 09:12:06 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Tue, 28 Nov 2017 17:12:04 +0000 Message-Id: <20171128171204.11665-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] bash: disable aclocal 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 Bash hand-maintains their aclocal.m4, so stop autoreconf from invoking aclocal and overwriting it. This means we can remove the kludge to copy aclocal.m4 to acinclude.m4. Signed-off-by: Ross Burton --- meta/recipes-extended/bash/bash.inc | 8 +------- 1 file changed, 1 insertion(+), 7 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-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index f4e1f7a11f4..89c35bd59c1 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -6,7 +6,7 @@ DEPENDS = "ncurses bison-native virtual/libiconv" inherit autotools gettext texinfo update-alternatives ptest -EXTRA_AUTORECONF += "--exclude=autoheader" +EXTRA_AUTORECONF += "--exclude=autoheader --exclude=aclocal" EXTRA_OECONF = "--enable-job-control --without-bash-malloc" # If NON_INTERACTIVE_LOGIN_SHELLS is defined, all login shells read the @@ -33,12 +33,6 @@ USERADD_PARAM_${PN}-ptest = "--create-home --user-group test" CACHED_CONFIGUREVARS += "headersdir=${includedir}/${PN}" -do_configure_prepend () { - if [ ! -e ${S}/acinclude.m4 ]; then - cat ${S}/aclocal.m4 > ${S}/acinclude.m4 - fi -} - do_compile_ptest () { oe_runmake buildtest }