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/packages/guilt/files/guilt-push-no-series.patch | |
parent | da49de6885ee1bc424e70bc02f21f6ab920efb55 (diff) | |
download | poky-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/packages/guilt/files/guilt-push-no-series.patch')
-rw-r--r-- | meta/packages/guilt/files/guilt-push-no-series.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/meta/packages/guilt/files/guilt-push-no-series.patch b/meta/packages/guilt/files/guilt-push-no-series.patch deleted file mode 100644 index d40119c712..0000000000 --- a/meta/packages/guilt/files/guilt-push-no-series.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | guilt-push: Avoid duplicate hits in a series | ||
2 | |||
3 | If a series file becomes mangled and a patch name appears in there | ||
4 | more than once, then the guilt-push will fail a horrible and | ||
5 | incomprehensible death. Make it fail in a sensible way. | ||
6 | |||
7 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | ||
8 | |||
9 | --- | ||
10 | |||
11 | guilt-push | 5 +++++ | ||
12 | 1 file changed, 5 insertions(+) | ||
13 | |||
14 | --- a/guilt-push | ||
15 | +++ b/guilt-push | ||
16 | @@ -90,6 +90,11 @@ else | ||
17 | if [ -z "$eidx" ]; then | ||
18 | die "Patch $patch is not in the series or is guarded." | ||
19 | fi | ||
20 | + | ||
21 | + matches=`echo $eidx | wc -w` | ||
22 | + if [ $matches -gt 1 ]; then | ||
23 | + die "Patch $patch is in the series multiple times" | ||
24 | + fi | ||
25 | fi | ||
26 | |||
27 | # make sure that there are no unapplied changes | ||