file: fix perl reported as awk
cover file: fix perl reported as awk
NOTE:
The "[PATCH 2/2] file: remove dump and filesystems" is 36K, so I removed the contents from the patch, you can get it from the repo.
// Robert
The following changes since commit 6acd4fc8d5e642b5c6c75fcc40dd8f37caf7ddcf:
lib/oe/image.py: check the rootfs size against IMAGE_ROOTFS_MAXSIZE (2014-07-10 17:37:41 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/file
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/file
Robert Yang (2):
file: fix perl reported as awk
file: remove dump and filesystems
.../recipes-devtools/file/file/debian-742262.patch | 16 + meta/recipes-devtools/file/file/dump | 81 -- meta/recipes-devtools/file/file/filesystems | 812 -------------------- meta/recipes-devtools/file/file_5.18.bb | 10 +- 4 files changed, 18 insertions(+), 901 deletions(-) create mode 100644 meta/recipes-devtools/file/file/debian-742262.patch delete mode 100644 meta/recipes-devtools/file/file/dump delete mode 100644 meta/recipes-devtools/file/file/filesystems
Signature · 1 line
1.7.9.5
PATCH 1/2 file: fix perl reported as awk
The awk pattern was checked *before* the Perl pattern, so the perl script with BEGIN{...} would be reported as awk, this patch fixes it.
--- .../recipes-devtools/file/file/debian-742262.patch | 16 ++++++++++++++++ meta/recipes-devtools/file/file_5.18.bb | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-devtools/file/file/debian-742262.patch
meta/recipes-devtools/file/file/debian-742262.patch new file +16 -0
@@ -0,0 +1,16 @@ +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] + +diff --git a/magic/Magdir/commands b/magic/Magdir/commands +--- a/magic/Magdir/commands ++++ b/magic/Magdir/commands +@@ -50,6 +50,7 @@ + 0 string/wt #!\ /usr/bin/awk awk script text executable + !:mime text/x-awk + 0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text ++!:strength - 12 + + # AT&T Bell Labs' Plan 9 shell + 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executable
meta/recipes-devtools/file/file_5.18.bb +3 -1
@@ -13,7 +13,9 @@ DEPENDS_class-native = "zlib-native" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://dump \ - file://filesystems" + file://filesystems \ + file://debian-742262.patch \ + " SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a" SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07"
Signature · 1 line
1.7.9.5
Quoted 16 lines · Robert Yang
The awk pattern was checked *before* the Perl pattern, so the perl script with BEGIN{...} would be reported as awk, this patch fixes it.
Signed-off-by Robert Yang <[email protected]>--- .../recipes-devtools/file/file/debian-742262.patch | 16 ++++++++++++++++ meta/recipes-devtools/file/file_5.18.bb | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-)create mode 100644
meta/recipes-devtools/file/file/debian-742262.patchmeta/recipes-devtools/file/file/debian-742262.patch new file +0
-0
meta/recipes-devtools/file/file/debian-742262.patch line 5
Quoted 5 lines
meta/recipes-devtools/file/file/debian-742262.patch new file +5
-0@@ -0,0 +1,16 @@ +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] +
Missing the Signed-off-by here also.
Sau!
Quoted 27 lines
meta/recipes-devtools/file/file/debian-742262.patch new file +11
-0+diff --git a/magic/Magdir/commands b/magic/Magdir/commands +--- a/magic/Magdir/commands ++++ b/magic/Magdir/commands +@@ -50,6 +50,7 @@ + 0 string/wt #!\ /usr/bin/awk awk script text executable + !:mime text/x-awk + 0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text ++!:strength - 12 + + # AT&T Bell Labs' Plan 9 shell + 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executablemeta/recipes-devtools/file/file_5.18.bb +3
-1@@ -13,7 +13,9 @@ DEPENDS_class-native = "zlib-native" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://dump \ - file://filesystems" + file://filesystems \ + file://debian-742262.patch \ + " SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a" SRC_URI[sha256sum] = "6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07"
Thanks, updated in the repo:
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]
=======
REPO:git://git.openembedded.org/openembedded-core-contrib rbt/file
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/file
Robert Yang (2):
file: fix perl reported as awk
file: remove dump and filesystems
// Robert
Quoted 59 lines · Saul Wold
Quoted 17 lines · Robert Yang
The awk pattern was checked *before* the Perl pattern, so the perl script with BEGIN{...} would be reported as awk, this patch fixes it.
Signed-off-by Robert Yang <[email protected]>--- .../recipes-devtools/file/file/debian-742262.patch | 16 ++++++++++++++++ meta/recipes-devtools/file/file_5.18.bb | 4 +++- 2 files changed, 19 insertions(+), 1 deletion(-)create mode 100644
meta/recipes-devtools/file/file/debian-742262.patchmeta/recipes-devtools/file/file/debian-742262.patch new file +0
-0meta/recipes-devtools/file/file/debian-742262.patch line 5
Quoted 5 lines
meta/recipes-devtools/file/file/debian-742262.patch new file +5
-0@@ -0,0 +1,16 @@ +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] +Missing the Signed-off-by here also.
Sau!
Quoted 29 lines
meta/recipes-devtools/file/file/debian-742262.patch new file +11
-0+diff --git a/magic/Magdir/commands b/magic/Magdir/commands +--- a/magic/Magdir/commands ++++ b/magic/Magdir/commands +@@ -50,6 +50,7 @@ + 0 string/wt #!\ /usr/bin/awk awk script text executable + !:mime text/x-awk + 0 regex =^\\s{0,100}BEGIN\\s{0,100}[{] awk script text ++!:strength - 12 + + # AT&T Bell Labs' Plan 9 shell + 0 string/wt #!\ /bin/rc Plan 9 rc shell script text executablemeta/recipes-devtools/file/file_5.18.bb +3
-1@@ -13,7 +13,9 @@ DEPENDS_class-native = "zlib-native" SRC_URI = "ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz \ file://dump \ - file://filesystems" + file://filesystems \ + file://debian-742262.patch \ + " SRC_URI[md5sum] = "d420d8f2990cd344673acfbf8d76ff5a" SRC_URI[sha256sum] ="
6519fb706d583231c2419592ebecdbb21d33c62eaf7a1a0b24ddfcb80c08bf07"
PATCH 2/2 file: remove dump and filesystems
In reply to Robert YangI can't find the reason from the log why we need them, and they are out of date, so remove them, then file would use the one from its package.
--- meta/recipes-devtools/file/file/dump | 81 --- meta/recipes-devtools/file/file/filesystems | 812 --------------------------- meta/recipes-devtools/file/file_5.18.bb | 8 - 3 files changed, 901 deletions(-) delete mode 100644 meta/recipes-devtools/file/file/dump delete mode 100644 meta/recipes-devtools/file/file/filesystems