summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/file
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-12-21 21:28:23 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-23 10:18:19 +0000
commit7d8fe6df4dcba34883d27ff03b67f3f169148a4e (patch)
tree8a2451ce291ad7aee49df1cce1da271d6306a9a7 /meta/recipes-devtools/file
parente1858932f98c1ec192479b9a5dcad7b39cbd97ec (diff)
downloadpoky-7d8fe6df4dcba34883d27ff03b67f3f169148a4e.tar.gz
file: upgrade to 5.21
* Upgrade to 5.21. * The debian-742262.patch is still needed. (From OE-Core rev: 9f336e07df7e273c55f0c7a451604a3500b4c6ab) Signed-off-by: Robert Yang <liezhi.yang@windriver.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.patch4
-rw-r--r--meta/recipes-devtools/file/file_5.21.bb (renamed from meta/recipes-devtools/file/file_5.18.bb)4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch
index d57258c56b..1ef485e93c 100644
--- a/meta/recipes-devtools/file/file/debian-742262.patch
+++ b/meta/recipes-devtools/file/file/debian-742262.patch
@@ -9,10 +9,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
9diff --git a/magic/Magdir/commands b/magic/Magdir/commands 9diff --git a/magic/Magdir/commands b/magic/Magdir/commands
10--- a/magic/Magdir/commands 10--- a/magic/Magdir/commands
11+++ b/magic/Magdir/commands 11+++ b/magic/Magdir/commands
12@@ -50,6 +50,7 @@ 12@@ -57,6 +57,7 @@
13 0 string/wt #!\ /usr/bin/awk awk script text executable 13 0 string/wt #!\ /usr/bin/awk awk script text executable
14 !:mime text/x-awk 14 !:mime text/x-awk
15 0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text 15 0 regex/4096 =^\\s{0,100}BEGIN\\s{0,100}[{] awk or perl script text
16+!:strength - 12 16+!:strength - 12
17 17
18 # AT&T Bell Labs' Plan 9 shell 18 # AT&T Bell Labs' Plan 9 shell
diff --git a/meta/recipes-devtools/file/file_5.18.bb b/meta/recipes-devtools/file/file_5.21.bb
index 9068b9314a..702ea87343 100644
--- a/meta/recipes-devtools/file/file_5.18.bb
+++ b/meta/recipes-devtools/file/file_5.21.bb
@@ -15,8 +15,8 @@ SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \
15 file://debian-742262.patch \ 15 file://debian-742262.patch \
16 " 16 "
17 17
18SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a" 18SRC_URI[md5sum] = "549fe96e09041eabece9de2bb28ef923"
19SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07" 19SRC_URI[sha256sum] = "1a48741d3923c4cc73267109b8a396c0ce3aebe004181f3efb1b0a228d230bb6"
20 20
21inherit autotools 21inherit autotools
22 22