summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/file
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-03-05 16:30:01 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-06 10:39:25 +0000
commit53c22e5a791244f3e5d830c981b5eafa33f6551f (patch)
tree0e663c1dc19b521dde8504d539c5c677e3203117 /meta/recipes-devtools/file
parent9fa4bf280df8c42056eba001490c54a6580328cd (diff)
downloadpoky-53c22e5a791244f3e5d830c981b5eafa33f6551f.tar.gz
file: upgrade to 5.36
Upgrade to 5.36. Drop debian-742262.patch, this appears to have been fixed properly upstream some releases ago. (From OE-Core rev: cf6a32debcde5bfde94126c3b4200800d672e605) 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.patch27
-rw-r--r--meta/recipes-devtools/file/file_5.36.bb (renamed from meta/recipes-devtools/file/file_5.35.bb)6
2 files changed, 2 insertions, 31 deletions
diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch
deleted file mode 100644
index 319f9dbcf9..0000000000
--- a/meta/recipes-devtools/file/file/debian-742262.patch
+++ /dev/null
@@ -1,27 +0,0 @@
1The awk pattern was checked *before* the Perl pattern, so the
2perl script with BEGIN{...} would be reported as awk, this patch fixes it.
3
4Upstream-Status: Backport [debian]
5
6Signed-off-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de>
7Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
8
9Rebase on 5.31
10
11Signed-off-by: Fan Xin <fan.xin@jp.fujitsu.com>
12---
13 magic/Magdir/commands | 1 +
14 1 file changed, 1 insertion(+)
15
16diff --git a/magic/Magdir/commands b/magic/Magdir/commands
17index f6ad1c8..f79e7dd 100644
18--- a/magic/Magdir/commands
19+++ b/magic/Magdir/commands
20@@ -57,6 +57,7 @@
21 0 string/wt #!\ /usr/bin/awk awk script text executable
22 !:mime text/x-awk
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
25
26 # AT&T Bell Labs' Plan 9 shell
27 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable
diff --git a/meta/recipes-devtools/file/file_5.35.bb b/meta/recipes-devtools/file/file_5.36.bb
index 2f0589de68..1a81fde259 100644
--- a/meta/recipes-devtools/file/file_5.35.bb
+++ b/meta/recipes-devtools/file/file_5.36.bb
@@ -14,11 +14,9 @@ DEPENDS_class-native = "zlib-native"
14# Blacklist a bogus tag in upstream check 14# Blacklist a bogus tag in upstream check
15UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)" 15UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
16 16
17SRC_URI = "git://github.com/file/file.git \ 17SRC_URI = "git://github.com/file/file.git"
18 file://debian-742262.patch \
19 "
20 18
21SRCREV = "d1ff3af7a2c6b38bdbdde7af26b59e3c50a48fff" 19SRCREV = "f3a4b9ada3ca99e62c62b9aa78eee4935a8094fe"
22S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"
23 21
24inherit autotools update-alternatives 22inherit autotools update-alternatives