aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-07-10 03:31:22 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-07-16 10:15:33 +0100
commit99de944c9e9dd70e8319c3d27bb61d3c781a29f3 (patch)
tree9840ac7faca459250336ca17808a8d381ef48621
parent4a7df842a0e8754329b3f7b5b25483b0d403ea4d (diff)
downloadopenembedded-core-contrib-99de944c9e9dd70e8319c3d27bb61d3c781a29f3.tar.gz
openembedded-core-contrib-99de944c9e9dd70e8319c3d27bb61d3c781a29f3.tar.bz2
openembedded-core-contrib-99de944c9e9dd70e8319c3d27bb61d3c781a29f3.zip
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@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/file/file/debian-742262.patch19
-rw-r--r--meta/recipes-devtools/file/file_5.18.bb4
2 files changed, 22 insertions, 1 deletions
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 00000000000..d57258c56b6
--- /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@manchmal.in-ulm.de>
+Signed-off-by: Robert Yang <liezhi.yang@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 a7db410e929..ba61f223eb9 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"