From patchwork Thu Nov 30 13:56:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 120195 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp698492qgn; Thu, 30 Nov 2017 05:57:06 -0800 (PST) X-Google-Smtp-Source: AGs4zMaJhaSbfjOSTFnxjZmBcSGFKsQ8rV3ETveXueEVnOEHHXdxklU4QQ1NHnFPjd1fzUzDtdP7 X-Received: by 10.98.249.67 with SMTP id g3mr6776441pfm.197.1512050226546; Thu, 30 Nov 2017 05:57:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512050226; cv=none; d=google.com; s=arc-20160816; b=BOutW8m/aB6+/0M8lWnjLsnsqa39la82ZDIBQ/cg+zgMN27nXigysX662amwuoiOd7 OiD0WTgucCPCNZ6p6cCduL+CVPZ5wtIrmT83CHOqBC1ON+PDsmnUSRNYWwfV7Xp+sEAF mLuY2DN4BG8VasPwvzhPv2B+L0oJV4qtRT4lUTCZYED0Oz+33BoY97x+4QGBARovYIUD 2BImiAZB+lt9cJOkIcr15yrvHjfAdfLEpxqxsL8SXxwgeaXLdkr6ycPWuvAI2zf4ao+E jHJ8lR+JYQntj+SrDCWih6JKZtgyBBYTUst1dtbi+YdDL//6ywljxz7SSkwL+BNjvZQn 1yIA== 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=B4inCUtfVSuuXzENJ5Fmk6O4c0iTYa/e5QqlM3I+zh0=; b=i+wYjqHyvYt8BYoy3HoaN7zqGvm8MgqQlp2k4aSNDlFJWtVIXj3vC3SPMeHG2v4JlL FxvlVuQW97jk/aaAfj7xzTCpULkaeZ7rRGJrCOAP1A45nNbmZlSix0HrW6ZXFEFFdyVw b0P0Ng6n3qEaLTuTikCCesDRmRCQ0UpwDt+qrrZWvjb++YRvP5QzM/TZQuxPLIcjfU+R CsVpe27JEJt3YzL/fjjmrc+GsqXx3boTQAplAAQ/uNgXrMTGQSRWpZf7f68kwLXf2VOn N5SgiuY06D3dN66hB2S8msBIRqhu1R9xaK9Iysec5jgXEWiqaIcmuH69Ys8rWly0Utx7 LYog== 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=Vz32xIqA; 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 b3si3223901pli.459.2017.11.30.05.57.05; Thu, 30 Nov 2017 05:57:06 -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=Vz32xIqA; 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 194CF78493; Thu, 30 Nov 2017 13:57:01 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by mail.openembedded.org (Postfix) with ESMTP id 807FD60851 for ; Thu, 30 Nov 2017 13:56:57 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id z34so6675118wrz.10 for ; Thu, 30 Nov 2017 05:56:59 -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=4YWGRz+rxxnc39L1aFSKVB9ikZ03CKNCKICxK5gsgdA=; b=Vz32xIqAI60nBLxBPNX8FJvEtH/B6eNjaSZRGuK1yEFl0USAdWBy8X+f29/oQwr5Hr aFimz85kjsqPgjMAqXT97B0uolbV2Ih3Zt+lc38+zQ0ILMnTbcgI0Y2etF7Q1b0TBCe/ 6XMz0iY64z87EX2ZrVoXuue7zrJn7LWOYd6n59qmFgn4p6LA/tDUTxq9iMsxYS0iwYzL g+v7TqaaSErdTt1PB1/gik5W47KcmRKUZqhxt6SLh0/MH3n2fUTfSKF/xF7IB2EV2m5t YtBsGqMFqeZF4EVLQCkiVYTAQF2j846zY9LXRkvs5gUWOk61Ju04NT/Bbj6xXdcx8iNb jk6w== 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=4YWGRz+rxxnc39L1aFSKVB9ikZ03CKNCKICxK5gsgdA=; b=TRv2AQlRgEt6E2ihyNGeqkBs/CArJh+QX7udK18UUotTH1I+jfmdh4FUcwFeu+DVLP 9LQrfd81MyBW0JP1/P410ZMJuAd54Ue1seI1nBZPdEAzj8qcECVdzOsah8fphfLerF3c 14LyuJgy2HxmnknA+SYmUWH+4NvgbU7ZzzhQED/X9y3vwddumJpCNNUVzuoVsFxC7vob 4Zir/e0ZUTDW4f12DRJf4o6QpwSX4xfoBIUDU/r3mSLGnFzfSjX1ii79x+40cm9eP+Od gElZuON9ygj/gjaHHhBJTeoAYuPKGl4yisL6m4mc08L8v0d7bHdX3qN1Sr83wpHaLXkN Ipaw== X-Gm-Message-State: AJaThX6Y3P3B17TgJA0SeO4q6ANNYVqqzndm48Ljaa6UpzOXEkFtddpB fBORoMBjsoqLeHu+q05TV1OhbeME X-Received: by 10.223.186.67 with SMTP id t3mr2117598wrg.276.1512050218704; Thu, 30 Nov 2017 05:56:58 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id v23sm1934568wmh.8.2017.11.30.05.56.56 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 05:56:57 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Thu, 30 Nov 2017 13:56:55 +0000 Message-Id: <20171130135655.4309-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] quilt: don't patch in an old acinclude.m4, just excude 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 Signed-off-by: Ross Burton --- meta/recipes-devtools/quilt/quilt/aclocal.patch | 128 ------------------------ meta/recipes-devtools/quilt/quilt_0.65.bb | 8 +- 2 files changed, 5 insertions(+), 131 deletions(-) delete mode 100644 meta/recipes-devtools/quilt/quilt/aclocal.patch -- 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-devtools/quilt/quilt/aclocal.patch b/meta/recipes-devtools/quilt/quilt/aclocal.patch deleted file mode 100644 index daf44295ec0..00000000000 --- a/meta/recipes-devtools/quilt/quilt/aclocal.patch +++ /dev/null @@ -1,128 +0,0 @@ -Upstream-Status: Pending - -Add the aclocal.m4 as acinclude.m4 - -Index: quilt-0.47/acinclude.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ quilt-0.47/acinclude.m4 2006-10-10 17:05:56.000000000 +0100 -@@ -0,0 +1,119 @@ -+dnl Allow configure to specify a specific binary -+dnl 1: Environment variable -+dnl 2: binary name -+dnl 3: optional list of alternative binary names -+dnl 4: optional list of additional search directories -+AC_DEFUN([QUILT_COMPAT_PROG_PATH],[ -+ m4_define([internal_$2_cmd],[esyscmd(ls compat/$2.in 2>/dev/null)]) -+ -+ AC_ARG_WITH($2, AC_HELP_STRING( -+ [--with-$2], [name of the $2 executable to use] -+ m4_if(internal_$2_cmd,[],[],[ (use --without-$2 -+ to use an internal mechanism)])), -+ [ -+ if test x"$withval" = xnone; then -+ AC_MSG_ERROR([Invalid configure argument. use --without-$2]) -+ fi -+ if test x"$withval" != xno; then -+ AC_MSG_CHECKING(for $2) -+ $1="$withval" -+ if test -e "$$1"; then -+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then -+ AC_MSG_ERROR([$$1 is not an executable file]) -+ fi -+ fi -+ AC_MSG_RESULT([$$1]) -+ if test ! -e "$$1"; then -+ AC_MSG_WARN([$$1 does not exist]) -+ fi -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ fi -+ ],[ -+ m4_if([$3],[],[ -+ AC_PATH_PROG($1,$2,,$PATH:$4) -+ ],[ -+ AC_PATH_PROGS($1,$3,,$PATH:$4) -+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ fi -+ ]) -+ m4_if([$4],[],[],[ -+ if test -n "$$1"; then -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ for dir in "$4"; do -+ if test "`dirname $$1`" = "$dir"; then -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ break -+ fi -+ done -+ IFS="$as_save_IFS" -+ fi -+ ]) -+ ]) -+ if test -z "$$1"; then -+ m4_if(internal_$2_cmd,[],[ -+ AC_MSG_ERROR([Please specify the location of $2 with the option '--with-$2']) -+ ],[ -+ AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override]) -+ COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2" -+ $1=$2 -+ INTERNAL_$1=1 -+ ]) -+ fi -+ AC_SUBST($1) -+]) -+ -+dnl Allow configure to specify a specific binary -+dnl This variant is for optional binaries. -+dnl 1: Environment variable -+dnl 2: binary name -+dnl 3: optional list of alternative binary names -+dnl 4: optional list of additional search directories -+AC_DEFUN([QUILT_COMPAT_PROG_PATH_OPT],[ -+ AC_ARG_WITH($2, AC_HELP_STRING( -+ [--with-$2], [name of the $2 executable to use]), -+ [ -+ if test x"$withval" != xno; then -+ AC_MSG_CHECKING(for $2) -+ $1="$withval" -+ if test -e "$$1"; then -+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then -+ AC_MSG_ERROR([$$1 is not an executable file]) -+ fi -+ fi -+ AC_MSG_RESULT([$$1]) -+ if test ! -e "$$1"; then -+ AC_MSG_WARN([$$1 does not exist]) -+ fi -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ fi -+ ],[ -+ m4_if([$3],[],[ -+ AC_PATH_PROG($1,$2,,$PATH:$4) -+ ],[ -+ AC_PATH_PROGS($1,$3,,$PATH:$4) -+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ fi -+ ]) -+ m4_if([$4],[],[],[ -+ if test -n "$$1"; then -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+ for dir in "$4"; do -+ if test "`dirname $$1`" = "$dir"; then -+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2" -+ break -+ fi -+ done -+ IFS="$as_save_IFS" -+ fi -+ ]) -+ if test -z "$$1"; then -+ AC_MSG_WARN([$2 not found, some optional functionalities will be missing]) -+ fi -+ ]) -+ if test -z "$$1"; then -+ $1=$2 -+ fi -+ AC_SUBST($1) -+]) diff --git a/meta/recipes-devtools/quilt/quilt_0.65.bb b/meta/recipes-devtools/quilt/quilt_0.65.bb index 12859f0bccc..5bf818d0bbc 100644 --- a/meta/recipes-devtools/quilt/quilt_0.65.bb +++ b/meta/recipes-devtools/quilt/quilt_0.65.bb @@ -1,6 +1,8 @@ require quilt.inc inherit gettext + +SRC_URI += "file://gnu_patch_test_fix_target.patch" + +EXTRA_AUTORECONF += "--exclude=aclocal" + RDEPENDS_${PN} += "patch diffstat bzip2 util-linux" -SRC_URI += "file://aclocal.patch \ - file://gnu_patch_test_fix_target.patch \ - "