From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mail.openembedded.org (Postfix) with ESMTP id 8E9216ACD4 for ; Mon, 14 Jul 2014 18:05:28 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 14 Jul 2014 11:05:29 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,659,1400050800"; d="scan'208";a="572974509" Received: from unknown (HELO [10.255.13.46]) ([10.255.13.46]) by orsmga002.jf.intel.com with ESMTP; 14 Jul 2014 11:05:29 -0700 Message-ID: <53C41BE8.2080508@linux.intel.com> Date: Mon, 14 Jul 2014 11:05:28 -0700 From: Saul Wold User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Robert Yang , openembedded-core@lists.openembedded.org References: <5912151dc1b33e4b1c156e50d02e3a426fb880ad.1405043280.git.liezhi.yang@windriver.com> In-Reply-To: <5912151dc1b33e4b1c156e50d02e3a426fb880ad.1405043280.git.liezhi.yang@windriver.com> Subject: Re: [PATCH 1/2] file: fix perl reported as awk 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: , X-List-Received-Date: Mon, 14 Jul 2014 18:05:38 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 07/10/2014 06:51 PM, Robert Yang wrote: > The awk pattern was checked *before* the Perl pattern, so the perl > script with BEGIN{...} would be reported as awk, this patch fixes it. > > Signed-off-by: Robert Yang > --- > .../recipes-devtools/file/file/debian-742262.patch | 16 ++++++++++++++++ > meta/recipes-devtools/file/file_5.18.bb | 4 +++- > 2 files changed, 19 insertions(+), 1 deletion(-) > create mode 100644 meta/recipes-devtools/file/file/debian-742262.patch > > diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch > new file mode 100644 > index 0000000..5cfe380 > --- /dev/null > +++ b/meta/recipes-devtools/file/file/debian-742262.patch > @@ -0,0 +1,16 @@ > +The awk pattern was checked *before* the Perl pattern, so the perl > +script with BEGIN{...} would be reported as awk, this patch fixes it. > + > +Upstream-Status: Backport [debian] > + Missing the Signed-off-by here also. Sau! > +diff --git a/magic/Magdir/commands b/magic/Magdir/commands > +--- a/magic/Magdir/commands > ++++ b/magic/Magdir/commands > +@@ -50,6 +50,7 @@ > + 0 string/wt #!\ /usr/bin/awk awk script text executable > + !:mime text/x-awk > + 0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text > ++!:strength - 12 > + > + # AT&T Bell Labs' Plan 9 shell > + 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable > diff --git a/meta/recipes-devtools/file/file_5.18.bb b/meta/recipes-devtools/file/file_5.18.bb > index a7db410..ba61f22 100644 > --- a/meta/recipes-devtools/file/file_5.18.bb > +++ b/meta/recipes-devtools/file/file_5.18.bb > @@ -13,7 +13,9 @@ DEPENDS_class-native = "zlib-native" > > SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ > file://dump \ > - file://filesystems" > + file://filesystems \ > + file://debian-742262.patch \ > + " > > SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a" > SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07" >