[oe-commits] Robert Yang : file: upgrade to 5.21

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 9f336e07df7e273c55f0c7a451604a3500b4c6ab
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=9f336e07df7e273c55f0c7a451604a3500b4c6ab

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Sun Dec 21 21:28:23 2014 -0800

file: upgrade to 5.21

* Upgrade to 5.21.
* The debian-742262.patch is still needed.

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-devtools/file/file/debian-742262.patch       | 4 ++--
 meta/recipes-devtools/file/{file_5.18.bb => file_5.21.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 d57258c..1ef485e 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 at windriver.com>
 diff --git a/magic/Magdir/commands b/magic/Magdir/commands
 --- a/magic/Magdir/commands
 +++ b/magic/Magdir/commands
-@@ -50,6 +50,7 @@
+@@ -57,6 +57,7 @@
  0	string/wt	#!\ /usr/bin/awk	awk script text executable
  !:mime	text/x-awk
- 0	regex		=^\\s{0,100}BEGIN\\s{0,100}[{]	awk script text
+ 0	regex/4096	=^\\s{0,100}BEGIN\\s{0,100}[{]	awk or perl script text
 +!:strength - 12
  
  # 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
similarity index 86%
rename from meta/recipes-devtools/file/file_5.18.bb
rename to meta/recipes-devtools/file/file_5.21.bb
index 9068b93..702ea87 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 \
            file://debian-742262.patch \
           "
 
-SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a"
-SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07"
+SRC_URI[md5sum] = "549fe96e09041eabece9de2bb28ef923"
+SRC_URI[sha256sum] = "1a48741d3923c4cc73267109b8a396c0ce3aebe004181f3efb1b0a228d230bb6"
 
 inherit autotools