diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:14:24 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-08-27 15:29:45 +0100 |
commit | 29d6678fd546377459ef75cf54abeef5b969b5cf (patch) | |
tree | 8edd65790e37a00d01c3f203f773fe4b5012db18 /meta/recipes-devtools/file/file/ge-le.patch | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | openembedded-core-contrib-29d6678fd546377459ef75cf54abeef5b969b5cf.tar.gz |
Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.
The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.
Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-devtools/file/file/ge-le.patch')
-rw-r--r-- | meta/recipes-devtools/file/file/ge-le.patch | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/meta/recipes-devtools/file/file/ge-le.patch b/meta/recipes-devtools/file/file/ge-le.patch new file mode 100644 index 0000000000..7b7d8b60a4 --- /dev/null +++ b/meta/recipes-devtools/file/file/ge-le.patch @@ -0,0 +1,70 @@ +`>=' and `<=' was silently ignored in previous version, +but causes an warning in file 5.04. Add support for these +two operators as a feature extension, however, users should +not rely on them. + +8/17/2010 - created by Qing He <qing.he@intel.com> + +diff --git a/src/apprentice.c b/src/apprentice.c +index 3d4c3cf..a2b86ed 100644 +--- a/src/apprentice.c ++++ b/src/apprentice.c +@@ -1396,11 +1396,10 @@ parse(struct magic_set *ms, struct magic_entry **mentryp, uint32_t *nmentryp, + m->reln = *l; + ++l; + if (*l == '=') { +- if (ms->flags & MAGIC_CHECK) { +- file_magwarn(ms, "%c= not supported", +- m->reln); +- return -1; +- } ++ if (m->reln == '>') ++ m->reln = 'g'; ++ else if (m->reln == '<') ++ m->reln = 'l'; + ++l; + } + break; +diff --git a/src/softmagic.c b/src/softmagic.c +index d8a5675..1648e43 100644 +--- a/src/softmagic.c ++++ b/src/softmagic.c +@@ -1955,6 +1955,38 @@ magiccheck(struct magic_set *ms, struct magic *m) + } + break; + ++ case 'g': ++ if (m->flag & UNSIGNED) { ++ matched = v >= l; ++ if ((ms->flags & MAGIC_DEBUG) != 0) ++ (void) fprintf(stderr, "%llu >= %llu = %d\n", ++ (unsigned long long)v, ++ (unsigned long long)l, matched); ++ } ++ else { ++ matched = (int64_t) v >= (int64_t) l; ++ if ((ms->flags & MAGIC_DEBUG) != 0) ++ (void) fprintf(stderr, "%lld >= %lld = %d\n", ++ (long long)v, (long long)l, matched); ++ } ++ break; ++ ++ case 'l': ++ if (m->flag & UNSIGNED) { ++ matched = v <= l; ++ if ((ms->flags & MAGIC_DEBUG) != 0) ++ (void) fprintf(stderr, "%llu <= %llu = %d\n", ++ (unsigned long long)v, ++ (unsigned long long)l, matched); ++ } ++ else { ++ matched = (int64_t) v <= (int64_t) l; ++ if ((ms->flags & MAGIC_DEBUG) != 0) ++ (void) fprintf(stderr, "%lld <= %lld = %d\n", ++ (long long)v, (long long)l, matched); ++ } ++ break; ++ + case '&': + matched = (v & l) == l; + if ((ms->flags & MAGIC_DEBUG) != 0) |