* [PATCH 0/2] file: fix perl reported as awk @ 2014-07-11 1:51 Robert Yang 2014-07-11 1:51 ` [PATCH 1/2] " Robert Yang 2014-07-11 1:51 ` [PATCH 2/2] file: remove dump and filesystems Robert Yang 0 siblings, 2 replies; 5+ messages in thread From: Robert Yang @ 2014-07-11 1:51 UTC (permalink / raw) To: openembedded-core 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 -- 1.7.9.5 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/2] file: fix perl reported as awk 2014-07-11 1:51 [PATCH 0/2] file: fix perl reported as awk Robert Yang @ 2014-07-11 1:51 ` Robert Yang 2014-07-14 18:05 ` Saul Wold 2014-07-11 1:51 ` [PATCH 2/2] file: remove dump and filesystems Robert Yang 1 sibling, 1 reply; 5+ messages in thread From: Robert Yang @ 2014-07-11 1:51 UTC (permalink / raw) To: openembedded-core 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 <liezhi.yang@windriver.com> --- .../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 diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch new file mode 100644 index 0000000..5cfe380 --- /dev/null +++ b/meta/recipes-devtools/file/file/debian-742262.patch @@ -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 diff --git a/meta/recipes-devtools/file/file_5.18.bb b/meta/recipes-devtools/file/file_5.18.bb index a7db410..ba61f22 100644 --- a/meta/recipes-devtools/file/file_5.18.bb +++ b/meta/recipes-devtools/file/file_5.18.bb @@ -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" -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] file: fix perl reported as awk 2014-07-11 1:51 ` [PATCH 1/2] " Robert Yang @ 2014-07-14 18:05 ` Saul Wold 2014-07-15 2:21 ` Robert Yang 0 siblings, 1 reply; 5+ messages in thread From: Saul Wold @ 2014-07-14 18:05 UTC (permalink / raw) To: Robert Yang, openembedded-core On 07/10/2014 06:51 PM, Robert Yang wrote: > 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 <liezhi.yang@windriver.com> > --- > .../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 > > diff --git a/meta/recipes-devtools/file/file/debian-742262.patch b/meta/recipes-devtools/file/file/debian-742262.patch > new file mode 100644 > index 0000000..5cfe380 > --- /dev/null > +++ b/meta/recipes-devtools/file/file/debian-742262.patch > @@ -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! > +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 > diff --git a/meta/recipes-devtools/file/file_5.18.bb b/meta/recipes-devtools/file/file_5.18.bb > index a7db410..ba61f22 100644 > --- a/meta/recipes-devtools/file/file_5.18.bb > +++ b/meta/recipes-devtools/file/file_5.18.bb > @@ -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" > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] file: fix perl reported as awk 2014-07-14 18:05 ` Saul Wold @ 2014-07-15 2:21 ` Robert Yang 0 siblings, 0 replies; 5+ messages in thread From: Robert Yang @ 2014-07-15 2:21 UTC (permalink / raw) To: Saul Wold, openembedded-core 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] Signed-off-by: Christoph Biedl <debian.axhn@manchmal.in-ulm.de> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ======= 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 On 07/15/2014 02:05 AM, Saul Wold wrote: > On 07/10/2014 06:51 PM, Robert Yang wrote: >> 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 <liezhi.yang@windriver.com> >> --- >> .../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 >> >> diff --git a/meta/recipes-devtools/file/file/debian-742262.patch >> b/meta/recipes-devtools/file/file/debian-742262.patch >> new file mode 100644 >> index 0000000..5cfe380 >> --- /dev/null >> +++ b/meta/recipes-devtools/file/file/debian-742262.patch >> @@ -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! > >> +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 >> diff --git a/meta/recipes-devtools/file/file_5.18.bb >> b/meta/recipes-devtools/file/file_5.18.bb >> index a7db410..ba61f22 100644 >> --- a/meta/recipes-devtools/file/file_5.18.bb >> +++ b/meta/recipes-devtools/file/file_5.18.bb >> @@ -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" >> > > ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/2] file: remove dump and filesystems 2014-07-11 1:51 [PATCH 0/2] file: fix perl reported as awk Robert Yang 2014-07-11 1:51 ` [PATCH 1/2] " Robert Yang @ 2014-07-11 1:51 ` Robert Yang 1 sibling, 0 replies; 5+ messages in thread From: Robert Yang @ 2014-07-11 1:51 UTC (permalink / raw) To: openembedded-core I 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. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> --- 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 ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-07-15 2:21 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-07-11 1:51 [PATCH 0/2] file: fix perl reported as awk Robert Yang 2014-07-11 1:51 ` [PATCH 1/2] " Robert Yang 2014-07-14 18:05 ` Saul Wold 2014-07-15 2:21 ` Robert Yang 2014-07-11 1:51 ` [PATCH 2/2] file: remove dump and filesystems Robert Yang
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.