summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
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:20:50 +0100
commit4c78b0ae3a11dbb5c153b362be5c3b5f8b586feb (patch)
tree5ca4a3fe81d9bce797a9b959d1558b876a819a84 /meta/recipes-devtools
parent2e822bf1193332ed0ce8c7a0fdbf0aa9cac3ea40 (diff)
downloadpoky-4c78b0ae3a11dbb5c153b362be5c3b5f8b586feb.tar.gz
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. (From OE-Core rev: 99de944c9e9dd70e8319c3d27bb61d3c781a29f3) 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>
Diffstat (limited to 'meta/recipes-devtools')
-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 0000000000..d57258c56b
--- /dev/null
+++ b/meta/recipes-devtools/file/file/debian-742262.patch
@@ -0,0 +1,19 @@
1The awk pattern was checked *before* the Perl pattern, so the perl
2script with BEGIN{...} would be reported as awk, this patch fixes it.
3
4Upstream-Status: Backport [debian]
5
6Signed-off-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
7Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
8---
9diff --git a/magic/Magdir/commands b/magic/Magdir/commands
10--- a/magic/Magdir/commands
11+++ b/magic/Magdir/commands
12@@ -50,6 +50,7 @@
13 0 string/wt #!\ /usr/bin/awk awk script text executable
14 !:mime text/x-awk
15 0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text
16+!:strength - 12
17
18 # AT&T Bell Labs' Plan 9 shell
19 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 a7db410e92..ba61f223eb 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"
13 13
14SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ 14SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
15 file://dump \ 15 file://dump \
16 file://filesystems" 16 file://filesystems \
17 file://debian-742262.patch \
18 "
17 19
18SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a" 20SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a"
19SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07" 21SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07"