mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
9fa4bf280d
commit
53c22e5a79
@@ -1,27 +0,0 @@
|
||||
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 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 =^[\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
|
||||
@@ -14,11 +14,9 @@ DEPENDS_class-native = "zlib-native"
|
||||
# Blacklist a bogus tag in upstream check
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "FILE(?P<pver>(?!6_23).+)"
|
||||
|
||||
SRC_URI = "git://github.com/file/file.git \
|
||||
file://debian-742262.patch \
|
||||
"
|
||||
SRC_URI = "git://github.com/file/file.git"
|
||||
|
||||
SRCREV = "d1ff3af7a2c6b38bdbdde7af26b59e3c50a48fff"
|
||||
SRCREV = "f3a4b9ada3ca99e62c62b9aa78eee4935a8094fe"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools update-alternatives
|
||||
Reference in New Issue
Block a user