diff options
author | Fan Xin <fan.xin@jp.fujitsu.com> | 2017-06-20 13:53:06 +0900 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-28 15:52:18 +0100 |
commit | 3674b6e8bde8703f357913f2336e5fad4c8fc276 (patch) | |
tree | 313c991cda4eb46685d4fd32f0083b506b696e34 /meta/recipes-devtools/file/file | |
parent | d620f8c243da38f46b1340839472a17faf843ac8 (diff) | |
download | poky-3674b6e8bde8703f357913f2336e5fad4c8fc276.tar.gz |
file: 5.30 -> 5.31
1. Upgrade file from 5.30 to 5.31
2. Rebase the following patch file.
debian-742262.patch
(From OE-Core rev: f38290ec2a727427a6481e4dafb02ecd8a60fad1)
Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
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 | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch index 1ef485e93c..d31ac5914c 100644 --- a/meta/recipes-devtools/file/file/debian-742262.patch +++ b/meta/recipes-devtools/file/file/debian-742262.patch | |||
@@ -1,19 +1,30 @@ | |||
1 | The awk pattern was checked *before* the Perl pattern, so the perl | 1 | The awk pattern was checked *before* the Perl pattern, so the |
2 | script with BEGIN{...} would be reported as awk, this patch fixes it. | 2 | perl script with BEGIN{...} would be reported as awk, this patch fixes it. |
3 | 3 | ||
4 | Upstream-Status: Backport [debian] | 4 | Upstream-Status: Backport [debian] |
5 | 5 | ||
6 | Signed-off-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> | 6 | Signed-off-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> |
7 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 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> | ||
8 | --- | 12 | --- |
13 | magic/Magdir/commands | 1 + | ||
14 | 1 file changed, 1 insertion(+) | ||
15 | |||
9 | diff --git a/magic/Magdir/commands b/magic/Magdir/commands | 16 | diff --git a/magic/Magdir/commands b/magic/Magdir/commands |
17 | index 1a46efd..255c04b 100644 | ||
10 | --- a/magic/Magdir/commands | 18 | --- a/magic/Magdir/commands |
11 | +++ b/magic/Magdir/commands | 19 | +++ b/magic/Magdir/commands |
12 | @@ -57,6 +57,7 @@ | 20 | @@ -57,6 +57,7 @@ |
13 | 0 string/wt #!\ /usr/bin/awk awk script text executable | 21 | 0 string/wt #!\ /usr/bin/awk awk script text executable |
14 | !:mime text/x-awk | 22 | !:mime text/x-awk |
15 | 0 regex/4096 =^\\s{0,100}BEGIN\\s{0,100}[{] awk or perl script text | 23 | 0 regex/4096 =^[A-Za-z0-9_]{0,100}BEGIN[A-Za-z0-9_]{0,100}[{] awk or perl script text |
16 | +!:strength - 12 | 24 | +!:strength - 12 |
17 | 25 | ||
18 | # AT&T Bell Labs' Plan 9 shell | 26 | # AT&T Bell Labs' Plan 9 shell |
19 | 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable | 27 | 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable |
28 | -- | ||
29 | 1.9.1 | ||
30 | |||