diff options
author | Dave Cobbley <david.j.cobbley@linux.intel.com> | 2018-08-14 10:05:37 -0700 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-08-22 21:26:31 -0400 |
commit | eb8dc40360f0cfef56fb6947cc817a547d6d9bc6 (patch) | |
tree | de291a73dc37168da6370e2cf16c347d1eba9df8 /poky/meta/recipes-devtools/file/file/debian-742262.patch | |
parent | 9c3cf826d853102535ead04cebc2d6023eff3032 (diff) | |
download | talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.tar.gz talos-openbmc-eb8dc40360f0cfef56fb6947cc817a547d6d9bc6.zip |
[Subtree] Removing import-layers directory
As part of the move to subtrees, need to bring all the import layers
content to the top level.
Change-Id: I4a163d10898cbc6e11c27f776f60e1a470049d8f
Signed-off-by: Dave Cobbley <david.j.cobbley@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/file/file/debian-742262.patch')
-rw-r--r-- | poky/meta/recipes-devtools/file/file/debian-742262.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/file/file/debian-742262.patch b/poky/meta/recipes-devtools/file/file/debian-742262.patch new file mode 100644 index 000000000..319f9dbcf --- /dev/null +++ b/poky/meta/recipes-devtools/file/file/debian-742262.patch @@ -0,0 +1,27 @@ +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 |