]> code.ossystems Code Review - openembedded-core.git/commitdiff
file: 5.30 -> 5.31
authorFan Xin <fan.xin@jp.fujitsu.com>
Tue, 20 Jun 2017 04:53:06 +0000 (13:53 +0900)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 28 Jun 2017 14:51:59 +0000 (15:51 +0100)
1. Upgrade file from 5.30 to 5.31

2. Rebase the following patch file.
   debian-742262.patch

Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/recipes-devtools/file/file/debian-742262.patch
meta/recipes-devtools/file/file_5.31.bb [moved from meta/recipes-devtools/file/file_5.30.bb with 96% similarity]

index 1ef485e93c85847708d7c4b08abe0a96d7a886a4..d31ac5914cd1ec8519d23340c14d4e653238d056 100644 (file)
@@ -1,19 +1,30 @@
-The awk pattern was checked *before* the Perl pattern, so the perl
-script with BEGIN{...} would be reported as awk, this patch fixes it.
+The awk pattern was checked *before* the Perl pattern, so the
+perl script with BEGIN{...} would be reported as awk, this patch fixes it.
 
 Upstream-Status: Backport [debian]
 
 Signed-off-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+
+Rebase on 5.31
+
+Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
 ---
+ magic/Magdir/commands | 1 +
+ 1 file changed, 1 insertion(+)
+
 diff --git a/magic/Magdir/commands b/magic/Magdir/commands
+index 1a46efd..255c04b 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      =^\\s{0,100}BEGIN\\s{0,100}[{]  awk or perl script text
+ 0     regex/4096      =^[A-Za-z0-9_]{0,100}BEGIN[A-Za-z0-9_]{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
+
similarity index 96%
rename from meta/recipes-devtools/file/file_5.30.bb
rename to meta/recipes-devtools/file/file_5.31.bb
index 0998fcfa8990370cc70c85ccbb50e652f3960143..1b1f50284f90bde8bb65baa9165fcc33caaabe5e 100644 (file)
@@ -19,7 +19,7 @@ SRC_URI = "git://github.com/file/file.git \
         file://0001-Add-P-prompt-into-Usage-info.patch \
         "
 
-SRCREV = "79814950aafb81ecd6a910c2a8a3b8ec12f3e4a6"
+SRCREV = "70c5f15060c7ad81150177de83a3e64500a54c9f"
 S = "${WORKDIR}/git"
 
 inherit autotools