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-05 22:42:58 +0000 |
| commit | cf6a32debcde5bfde94126c3b4200800d672e605 (patch) | |
| tree | a130298df7c1bd9d8e1920e9215c240a86454885 /meta/recipes-devtools/file/file/debian-742262.patch | |
| parent | 0b3f5e3cb90612c24f30ae8a50ed926492ce2e35 (diff) | |
| download | openembedded-core-contrib-cf6a32debcde5bfde94126c3b4200800d672e605.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.
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/debian-742262.patch')
| -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 @@ -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> - -Rebase on 5.31 - -Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com> ---- - magic/Magdir/commands | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/magic/Magdir/commands b/magic/Magdir/commands -index f6ad1c8..f79e7dd 100644 ---- a/magic/Magdir/commands -+++ b/magic/Magdir/commands -@@ -57,6 +57,7 @@ - 0 string/wt #!\ /usr/bin/awk awk script text executable - !:mime text/x-awk - 0 regex/4096 =^[\040\t\f\r\n]{0,100}BEGIN[\040\t\f\r\n]{0,100}[{] awk or perl script text -+!:strength - 12 - - # AT&T Bell Labs' Plan 9 shell - 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable |