diff options
author | Ross Burton <ross.burton@intel.com> | 2019-03-05 16:30:01 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-06 10:39:25 +0000 |
commit | 53c22e5a791244f3e5d830c981b5eafa33f6551f (patch) | |
tree | 0e663c1dc19b521dde8504d539c5c677e3203117 /meta/recipes-devtools/file/file | |
parent | 9fa4bf280df8c42056eba001490c54a6580328cd (diff) | |
download | poky-53c22e5a791244f3e5d830c981b5eafa33f6551f.tar.gz |
file: upgrade to 5.36
Upgrade to 5.36.
Drop debian-742262.patch, this appears to have been fixed properly upstream some
releases ago.
(From OE-Core rev: cf6a32debcde5bfde94126c3b4200800d672e605)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/file/file')
-rw-r--r-- | meta/recipes-devtools/file/file/debian-742262.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch deleted file mode 100644 index 319f9dbcf9..0000000000 --- a/meta/recipes-devtools/file/file/debian-742262.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | The awk pattern was checked *before* the Perl pattern, so the | ||
2 | perl script with BEGIN{...} would be reported as awk, this patch fixes it. | ||
3 | |||
4 | Upstream-Status: Backport [debian] | ||
5 | |||
6 | Signed-off-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> | ||
7 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
8 | |||
9 | Rebase on 5.31 | ||
10 | |||
11 | Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> | ||
12 | --- | ||
13 | magic/Magdir/commands | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
16 | diff --git a/magic/Magdir/commands b/magic/Magdir/commands | ||
17 | index f6ad1c8..f79e7dd 100644 | ||
18 | --- a/magic/Magdir/commands | ||
19 | +++ b/magic/Magdir/commands | ||
20 | @@ -57,6 +57,7 @@ | ||
21 | 0 string/wt #!\ /usr/bin/awk awk script text executable | ||
22 | !:mime text/x-awk | ||
23 | 0 regex/4096 =^[\040\t\f\r\n]{0,100}BEGIN[\040\t\f\r\n]{0,100}[{] awk or perl script text | ||
24 | +!:strength - 12 | ||
25 | |||
26 | # AT&T Bell Labs' Plan 9 shell | ||
27 | 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable | ||