The patches fail to apply so i drop them, I didn't check if the patches where merged into<br>upstream :(<br><br><div class="gmail_quote">On Fri, Aug 19, 2011 at 9:15 AM, Richard Purdie <span dir="ltr"><<a href="mailto:richard.purdie@linuxfoundation.org">richard.purdie@linuxfoundation.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;"><div class="im">On Wed, 2011-08-17 at 21:57 -0500, Adrian Alonso wrote:<br>
> * file version 5.07 also prevents magic file mistmatch<br>
> in Fedora 15<br>
> * related to bug 1358.<br>
> <a href="http://bugzilla.pokylinux.org/show_bug.cgi?id=1358" target="_blank">http://bugzilla.pokylinux.org/show_bug.cgi?id=1358</a><br>
> * v2 remove previous file version 5.04<br>
> remove unused patchs<br>
<br>
</div>When you say these are unused patches, were the fixes merged into<br>
upstream or did these patches simply fail to apply so you dropped them?<br>
<br>
Cheers,<br>
<br>
Richard<br>
<div><div></div><div class="h5"><br>
><br>
> Signed-off-by: Adrian Alonso <<a href="mailto:aalonso00@gmail.com">aalonso00@gmail.com</a>><br>
> ---<br>
> meta/recipes-devtools/file/file/ge-le.patch | 72 --------------------<br>
> .../file/file/stringb-compat.patch | 31 ---------<br>
> meta/recipes-devtools/file/<a href="http://file_5.04.bb" target="_blank">file_5.04.bb</a> | 39 -----------<br>
> meta/recipes-devtools/file/<a href="http://file_5.07.bb" target="_blank">file_5.07.bb</a> | 36 ++++++++++<br>
> 4 files changed, 36 insertions(+), 142 deletions(-)<br>
> delete mode 100644 meta/recipes-devtools/file/file/ge-le.patch<br>
> delete mode 100644 meta/recipes-devtools/file/file/stringb-compat.patch<br>
> delete mode 100644 meta/recipes-devtools/file/<a href="http://file_5.04.bb" target="_blank">file_5.04.bb</a><br>
> create mode 100644 meta/recipes-devtools/file/<a href="http://file_5.07.bb" target="_blank">file_5.07.bb</a><br>
><br>
> diff --git a/meta/recipes-devtools/file/file/ge-le.patch b/meta/recipes-devtools/file/file/ge-le.patch<br>
> deleted file mode 100644<br>
> index fb7d671..0000000<br>
> --- a/meta/recipes-devtools/file/file/ge-le.patch<br>
> +++ /dev/null<br>
> @@ -1,72 +0,0 @@<br>
> -Upstream-Status: Pending<br>
> -<br>
> -`>=' and `<=' was silently ignored in previous version,<br>
> -but causes an warning in file 5.04. Add support for these<br>
> -two operators as a feature extension, however, users should<br>
> -not rely on them.<br>
> -<br>
> -8/17/2010 - created by Qing He <<a href="mailto:qing.he@intel.com">qing.he@intel.com</a>><br>
> -<br>
> -diff --git a/src/apprentice.c b/src/apprentice.c<br>
> -index 3d4c3cf..a2b86ed 100644<br>
> ---- a/src/apprentice.c<br>
> -+++ b/src/apprentice.c<br>
> -@@ -1396,11 +1396,10 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,<br>
> - m->reln = *l;<br>
> - ++l;<br>
> - if (*l == '=') {<br>
> -- if (ms->flags & MAGIC_CHECK) {<br>
> -- file_magwarn(ms, "%c= not supported",<br>
> -- m->reln);<br>
> -- return -1;<br>
> -- }<br>
> -+ if (m->reln == '>')<br>
> -+ m->reln = 'g';<br>
> -+ else if (m->reln == '<')<br>
> -+ m->reln = 'l';<br>
> - ++l;<br>
> - }<br>
> - break;<br>
> -diff --git a/src/softmagic.c b/src/softmagic.c<br>
> -index d8a5675..1648e43 100644<br>
> ---- a/src/softmagic.c<br>
> -+++ b/src/softmagic.c<br>
> -@@ -1955,6 +1955,38 @@ magiccheck(struct magic_set *ms, struct magic *m)<br>
> - }<br>
> - break;<br>
> -<br>
> -+ case 'g':<br>
> -+ if (m->flag & UNSIGNED) {<br>
> -+ matched = v >= l;<br>
> -+ if ((ms->flags & MAGIC_DEBUG) != 0)<br>
> -+ (void) fprintf(stderr, "%llu >= %llu = %d\n",<br>
> -+ (unsigned long long)v,<br>
> -+ (unsigned long long)l, matched);<br>
> -+ }<br>
> -+ else {<br>
> -+ matched = (int64_t) v >= (int64_t) l;<br>
> -+ if ((ms->flags & MAGIC_DEBUG) != 0)<br>
> -+ (void) fprintf(stderr, "%lld >= %lld = %d\n",<br>
> -+ (long long)v, (long long)l, matched);<br>
> -+ }<br>
> -+ break;<br>
> -+<br>
> -+ case 'l':<br>
> -+ if (m->flag & UNSIGNED) {<br>
> -+ matched = v <= l;<br>
> -+ if ((ms->flags & MAGIC_DEBUG) != 0)<br>
> -+ (void) fprintf(stderr, "%llu <= %llu = %d\n",<br>
> -+ (unsigned long long)v,<br>
> -+ (unsigned long long)l, matched);<br>
> -+ }<br>
> -+ else {<br>
> -+ matched = (int64_t) v <= (int64_t) l;<br>
> -+ if ((ms->flags & MAGIC_DEBUG) != 0)<br>
> -+ (void) fprintf(stderr, "%lld <= %lld = %d\n",<br>
> -+ (long long)v, (long long)l, matched);<br>
> -+ }<br>
> -+ break;<br>
> -+<br>
> - case '&':<br>
> - matched = (v & l) == l;<br>
> - if ((ms->flags & MAGIC_DEBUG) != 0)<br>
> diff --git a/meta/recipes-devtools/file/file/stringb-compat.patch b/meta/recipes-devtools/file/file/stringb-compat.patch<br>
> deleted file mode 100644<br>
> index 8aba31e..0000000<br>
> --- a/meta/recipes-devtools/file/file/stringb-compat.patch<br>
> +++ /dev/null<br>
> @@ -1,31 +0,0 @@<br>
> -Upstream-Status: Pending<br>
> -<br>
> -`B' in file 4.x has the same meaning with `W' in file 5,<br>
> -let `B' be an alias of `W'.<br>
> -<br>
> -8/17/2010 - created by Qing He <<a href="mailto:qing.he@intel.com">qing.he@intel.com</a>><br>
> -<br>
> -diff --git a/src/apprentice.c b/src/apprentice.c<br>
> -index 58826c3..3d4c3cf 100644<br>
> ---- a/src/apprentice.c<br>
> -+++ b/src/apprentice.c<br>
> -@@ -1340,6 +1340,7 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp,<br>
> - "zero range");<br>
> - l = t - 1;<br>
> - break;<br>
> -+ case CHAR_COMPACT_BLANK:<br>
> - case CHAR_COMPACT_WHITESPACE:<br>
> - m->str_flags |= STRING_COMPACT_WHITESPACE;<br>
> - break;<br>
> -diff --git a/src/file.h b/src/file.h<br>
> -index c07f2d4..42cf416 100644<br>
> ---- a/src/file.h<br>
> -+++ b/src/file.h<br>
> -@@ -282,6 +282,7 @@ struct magic {<br>
> - #define STRING_TEXTTEST BIT(5)<br>
> - #define STRING_BINTEST BIT(6)<br>
> - #define CHAR_COMPACT_WHITESPACE 'W'<br>
> -+#define CHAR_COMPACT_BLANK 'B'<br>
> - #define CHAR_COMPACT_OPTIONAL_WHITESPACE 'w'<br>
> - #define CHAR_IGNORE_LOWERCASE 'c'<br>
> - #define CHAR_IGNORE_UPPERCASE 'C'<br>
> diff --git a/meta/recipes-devtools/file/<a href="http://file_5.04.bb" target="_blank">file_5.04.bb</a> b/meta/recipes-devtools/file/<a href="http://file_5.04.bb" target="_blank">file_5.04.bb</a><br>
> deleted file mode 100644<br>
> index 1f9c78e..0000000<br>
> --- a/meta/recipes-devtools/file/<a href="http://file_5.04.bb" target="_blank">file_5.04.bb</a><br>
> +++ /dev/null<br>
> @@ -1,39 +0,0 @@<br>
> -SUMMARY = "File classification tool"<br>
> -DESCRIPTION = "File attempts to classify files depending \<br>
> -on their contents and prints a description if a match is found."<br>
> -HOMEPAGE = "<a href="http://www.darwinsys.com/file/" target="_blank">http://www.darwinsys.com/file/</a>"<br>
> -SECTION = "console/utils"<br>
> -<br>
> -# two clause BSD<br>
> -LICENSE = "BSD"<br>
> -LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"<br>
> -<br>
> -DEPENDS = "zlib file-native"<br>
> -DEPENDS_virtclass-native = "zlib-native"<br>
> -PR = "r2"<br>
> -<br>
> -SRC_URI = "<a href="ftp://ftp.astron.com/pub/file/file-$%7BPV%7D.tar.gz" target="_blank">ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz</a> \<br>
> - file://stringb-compat.patch \<br>
> - file://ge-le.patch \<br>
> - file://dump \<br>
> - file://filesystems"<br>
> -<br>
> -SRC_URI[md5sum] = "accade81ff1cc774904b47c72c8aeea0"<br>
> -SRC_URI[sha256sum] = "4c9e6e7994e74cb3386374ae91b055d26ac96b9d3e82fd157ae2d62e87a4260c"<br>
> -<br>
> -inherit autotools<br>
> -<br>
> -do_configure_prepend() {<br>
> - cp ${WORKDIR}/dump ${S}/magic/Magdir/<br>
> - cp ${WORKDIR}/filesystems ${S}/magic/Magdir/<br>
> -}<br>
> -<br>
> -FILES_${PN} += "${datadir}/misc/*.mgc"<br>
> -<br>
> -do_install_append_virtclass-native() {<br>
> - create_cmdline_wrapper ${D}/${bindir}/file \<br>
> - --magic-file ${datadir}/misc/magic.mgc<br>
> -}<br>
> -<br>
> -<br>
> -BBCLASSEXTEND = "native"<br>
> diff --git a/meta/recipes-devtools/file/<a href="http://file_5.07.bb" target="_blank">file_5.07.bb</a> b/meta/recipes-devtools/file/<a href="http://file_5.07.bb" target="_blank">file_5.07.bb</a><br>
> new file mode 100644<br>
> index 0000000..9b5b51f<br>
> --- /dev/null<br>
> +++ b/meta/recipes-devtools/file/<a href="http://file_5.07.bb" target="_blank">file_5.07.bb</a><br>
> @@ -0,0 +1,36 @@<br>
> +SUMMARY = "File classification tool"<br>
> +DESCRIPTION = "File attempts to classify files depending \<br>
> +on their contents and prints a description if a match is found."<br>
> +HOMEPAGE = "<a href="http://www.darwinsys.com/file/" target="_blank">http://www.darwinsys.com/file/</a>"<br>
> +SECTION = "console/utils"<br>
> +<br>
> +# two clause BSD<br>
> +LICENSE = "BSD"<br>
> +LIC_FILES_CHKSUM = "file://COPYING;beginline=2;md5=6a7382872edb68d33e1a9398b6e03188"<br>
> +<br>
> +DEPENDS = "zlib file-native"<br>
> +DEPENDS_virtclass-native = "zlib-native"<br>
> +PR = "r0"<br>
> +<br>
> +SRC_URI = "<a href="ftp://ftp.astron.com/pub/file/file-$%7BPV%7D.tar.gz" target="_blank">ftp://ftp.astron.com/pub/file/file-${PV}.tar.gz</a> \<br>
> + file://dump \<br>
> + file://filesystems"<br>
> +<br>
> +SRC_URI[md5sum] = "b8d1f9a8a644067bd0a703cebf3f4858"<br>
> +SRC_URI[sha256sum] = "c968bfe97d87f9f564728a894d57be2c6bba9a2006763fffff85c5f72a9a3c2f"<br>
> +<br>
> +inherit autotools<br>
> +<br>
> +do_configure_prepend() {<br>
> + cp ${WORKDIR}/dump ${S}/magic/Magdir/<br>
> + cp ${WORKDIR}/filesystems ${S}/magic/Magdir/<br>
> +}<br>
> +<br>
> +FILES_${PN} += "${datadir}/misc/*.mgc"<br>
> +<br>
> +do_install_append_virtclass-native() {<br>
> + create_cmdline_wrapper ${D}/${bindir}/file \<br>
> + --magic-file ${datadir}/misc/magic.mgc<br>
> +}<br>
> +<br>
> +BBCLASSEXTEND = "native"<br>
<br>
<br>
<br>
</div></div>_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core" target="_blank">http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core</a><br>
</blockquote></div><br><br clear="all"><br>-- <br>Saludos<br>Adrian Alonso<br><a href="http://aalonso.wordpress.com">http://aalonso.wordpress.com</a><br><br>