[oe-commits] Robert Yang : file: fix perl reported as awk
git at git.openembedded.org
git at git.openembedded.org
Wed Jul 16 09:32:02 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 99de944c9e9dd70e8319c3d27bb61d3c781a29f3
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=99de944c9e9dd70e8319c3d27bb61d3c781a29f3
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Thu Jul 10 03:31:22 2014 -0700
file: fix perl reported as awk
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 <liezhi.yang at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-devtools/file/file/debian-742262.patch | 19 +++++++++++++++++++
meta/recipes-devtools/file/file_5.18.bb | 4 +++-
2 files changed, 22 insertions(+), 1 deletion(-)
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..d57258c
--- /dev/null
+++ b/meta/recipes-devtools/file/file/debian-742262.patch
@@ -0,0 +1,19 @@
+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]
+
+Signed-off-by: Christoph Biedl <debian.axhn at manchmal.in-ulm.de>
+Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
+---
+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"
More information about the Openembedded-commits
mailing list