summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/file
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-11-14 01:58:44 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-21 13:06:12 +0000
commit1b6f9d370b5eb17b1ee633077041bb9cba1254f1 (patch)
treefabc1769bc551986e3eea218bbd198148ee75f2a /meta/recipes-devtools/file
parent6dfc03cf472069215e8bad0274a9048e0a183d1d (diff)
downloadpoky-1b6f9d370b5eb17b1ee633077041bb9cba1254f1.tar.gz
file: 5.31 -> 5.32
Rebase debian-742262.patch for new source. (From OE-Core rev: 4231e238d9fe6b2178b900cde49ca17ce5aa1f47) Signed-off-by: Robert Yang <liezhi.yang@windriver.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')
-rw-r--r--meta/recipes-devtools/file/file/debian-742262.patch7
-rw-r--r--meta/recipes-devtools/file/file_5.32.bb (renamed from meta/recipes-devtools/file/file_5.31.bb)2
2 files changed, 3 insertions, 6 deletions
diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch
index d31ac5914c..319f9dbcf9 100644
--- a/meta/recipes-devtools/file/file/debian-742262.patch
+++ b/meta/recipes-devtools/file/file/debian-742262.patch
@@ -14,17 +14,14 @@ Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
14 1 file changed, 1 insertion(+) 14 1 file changed, 1 insertion(+)
15 15
16diff --git a/magic/Magdir/commands b/magic/Magdir/commands 16diff --git a/magic/Magdir/commands b/magic/Magdir/commands
17index 1a46efd..255c04b 100644 17index f6ad1c8..f79e7dd 100644
18--- a/magic/Magdir/commands 18--- a/magic/Magdir/commands
19+++ b/magic/Magdir/commands 19+++ b/magic/Magdir/commands
20@@ -57,6 +57,7 @@ 20@@ -57,6 +57,7 @@
21 0 string/wt #!\ /usr/bin/awk awk script text executable 21 0 string/wt #!\ /usr/bin/awk awk script text executable
22 !:mime text/x-awk 22 !:mime text/x-awk
23 0 regex/4096 =^[A-Za-z0-9_]{0,100}BEGIN[A-Za-z0-9_]{0,100}[{] awk or perl script text 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 24+!:strength - 12
25 25
26 # AT&T Bell Labs' Plan 9 shell 26 # AT&T Bell Labs' Plan 9 shell
27 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--
291.9.1
30
diff --git a/meta/recipes-devtools/file/file_5.31.bb b/meta/recipes-devtools/file/file_5.32.bb
index 1b1f50284f..5e15925126 100644
--- a/meta/recipes-devtools/file/file_5.31.bb
+++ b/meta/recipes-devtools/file/file_5.32.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://github.com/file/file.git \
19 file://0001-Add-P-prompt-into-Usage-info.patch \ 19 file://0001-Add-P-prompt-into-Usage-info.patch \
20 " 20 "
21 21
22SRCREV = "70c5f15060c7ad81150177de83a3e64500a54c9f" 22SRCREV = "d474e35513940dbca039b510b4de705b44f5bd9c"
23S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
24 24
25inherit autotools 25inherit autotools