[OE-core] [PATCH 04/10] file: 5.31 -> 5.32
Robert Yang
liezhi.yang at windriver.com
Mon Nov 13 17:58:44 UTC 2017
Rebase debian-742262.patch for new source.
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
---
meta/recipes-devtools/file/file/debian-742262.patch | 7 ++-----
meta/recipes-devtools/file/{file_5.31.bb => file_5.32.bb} | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
rename meta/recipes-devtools/file/{file_5.31.bb => file_5.32.bb} (96%)
diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch
index d31ac59..319f9db 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 at jp.fujitsu.com>
1 file changed, 1 insertion(+)
diff --git a/magic/Magdir/commands b/magic/Magdir/commands
-index 1a46efd..255c04b 100644
+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 =^[A-Za-z0-9_]{0,100}BEGIN[A-Za-z0-9_]{0,100}[{] awk or perl script text
+ 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
---
-1.9.1
-
diff --git a/meta/recipes-devtools/file/file_5.31.bb b/meta/recipes-devtools/file/file_5.32.bb
similarity index 96%
rename from meta/recipes-devtools/file/file_5.31.bb
rename to meta/recipes-devtools/file/file_5.32.bb
index 1b1f502..5e15925 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 \
file://0001-Add-P-prompt-into-Usage-info.patch \
"
-SRCREV = "70c5f15060c7ad81150177de83a3e64500a54c9f"
+SRCREV = "d474e35513940dbca039b510b4de705b44f5bd9c"
S = "${WORKDIR}/git"
inherit autotools
--
2.7.4
More information about the Openembedded-core
mailing list