diff options
author | Saul Wold <sgw@linux.intel.com> | 2012-01-04 22:30:50 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-05 11:24:48 +0000 |
commit | 7b15d99e6cbbe0addf9ab0d2072e9187b6d8d28e (patch) | |
tree | 86dfe07f18a5c3f37b8973c9cd825108e6bb439d /meta/recipes-devtools/guilt | |
parent | fc53fa79a846cfb5d9e67b7972bdc4203638c2c3 (diff) | |
download | poky-7b15d99e6cbbe0addf9ab0d2072e9187b6d8d28e.tar.gz |
Patch Upstream-Status Update
(From OE-Core rev: f58bb1692c5700091f960e0fb90e5c39ebf5ab96)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/guilt')
12 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-devtools/guilt/files/guilt-bash.patch b/meta/recipes-devtools/guilt/files/guilt-bash.patch index d2058e8cf3..70a439e816 100644 --- a/meta/recipes-devtools/guilt/files/guilt-bash.patch +++ b/meta/recipes-devtools/guilt/files/guilt-bash.patch | |||
@@ -9,6 +9,8 @@ in as /bin/sh makes the problem go away. So here we change the guilt | |||
9 | scripts to explicitly call for bash to ensure we don't have a similar | 9 | scripts to explicitly call for bash to ensure we don't have a similar |
10 | issue after deployment. | 10 | issue after deployment. |
11 | 11 | ||
12 | Upstream-Status: Inappropriate [oe-specific] | ||
13 | |||
12 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | 14 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
13 | 15 | ||
14 | --- | 16 | --- |
diff --git a/meta/recipes-devtools/guilt/files/guilt-import-commit.patch b/meta/recipes-devtools/guilt/files/guilt-import-commit.patch index 78cc93e5d2..bd746c5e83 100644 --- a/meta/recipes-devtools/guilt/files/guilt-import-commit.patch +++ b/meta/recipes-devtools/guilt/files/guilt-import-commit.patch | |||
@@ -8,6 +8,8 @@ are generated. | |||
8 | If patches cannot be exported, fall back to importing | 8 | If patches cannot be exported, fall back to importing |
9 | commits via a more custom method. | 9 | commits via a more custom method. |
10 | 10 | ||
11 | Upstream-Status: Inappropriate [oe-specific] | ||
12 | |||
11 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 13 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
12 | 14 | ||
13 | --- | 15 | --- |
diff --git a/meta/recipes-devtools/guilt/files/guilt-init.patch b/meta/recipes-devtools/guilt/files/guilt-init.patch index a06da5bf74..1583346ed6 100644 --- a/meta/recipes-devtools/guilt/files/guilt-init.patch +++ b/meta/recipes-devtools/guilt/files/guilt-init.patch | |||
@@ -1,5 +1,7 @@ | |||
1 | guilt: allow previously initialized branches to be re-initialized | 1 | guilt: allow previously initialized branches to be re-initialized |
2 | 2 | ||
3 | Upstream-Status: Inappropriate [oe-specific] | ||
4 | |||
3 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 5 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
4 | 6 | ||
5 | --- | 7 | --- |
diff --git a/meta/recipes-devtools/guilt/files/guilt-pop.patch b/meta/recipes-devtools/guilt/files/guilt-pop.patch index c26b324ccf..9c0542740f 100644 --- a/meta/recipes-devtools/guilt/files/guilt-pop.patch +++ b/meta/recipes-devtools/guilt/files/guilt-pop.patch | |||
@@ -3,6 +3,8 @@ guilt: pop and delete tags | |||
3 | Add support for popping to a tag and the ability to delete | 3 | Add support for popping to a tag and the ability to delete |
4 | a tag while popping from the tree | 4 | a tag while popping from the tree |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-specific] | ||
7 | |||
6 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 8 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
7 | 9 | ||
8 | --- | 10 | --- |
diff --git a/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch b/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch index d40119c712..3446f10422 100644 --- a/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch +++ b/meta/recipes-devtools/guilt/files/guilt-push-no-series.patch | |||
@@ -4,6 +4,8 @@ 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 | 4 | more than once, then the guilt-push will fail a horrible and |
5 | incomprehensible death. Make it fail in a sensible way. | 5 | incomprehensible death. Make it fail in a sensible way. |
6 | 6 | ||
7 | Upstream-Status: Inappropriate [oe-specific] | ||
8 | |||
7 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> | 9 | Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
8 | 10 | ||
9 | --- | 11 | --- |
diff --git a/meta/recipes-devtools/guilt/files/guilt-push.patch b/meta/recipes-devtools/guilt/files/guilt-push.patch index 2184329595..5ec290b5d9 100644 --- a/meta/recipes-devtools/guilt/files/guilt-push.patch +++ b/meta/recipes-devtools/guilt/files/guilt-push.patch | |||
@@ -2,6 +2,8 @@ guilt: add support for pushing and tagging | |||
2 | 2 | ||
3 | It can be handy to push AND tag at the same time. | 3 | It can be handy to push AND tag at the same time. |
4 | 4 | ||
5 | Upstream-Status: Inappropriate [oe-specific] | ||
6 | |||
5 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 7 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
6 | 8 | ||
7 | --- | 9 | --- |
diff --git a/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch b/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch index 92e75f29ef..a40ec6f21e 100644 --- a/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch +++ b/meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch | |||
@@ -8,6 +8,8 @@ guilt be in the same directory to ensure they are matched, | |||
8 | so we use the environment variable GIT_EXEC_PATH to | 8 | so we use the environment variable GIT_EXEC_PATH to |
9 | force the issue. | 9 | force the issue. |
10 | 10 | ||
11 | Upstream-Status: Inappropriate [oe-specific] | ||
12 | |||
11 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 13 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
12 | 14 | ||
13 | --- | 15 | --- |
diff --git a/meta/recipes-devtools/guilt/files/guilt.patch b/meta/recipes-devtools/guilt/files/guilt.patch index a3352cf810..8e5b61edc5 100644 --- a/meta/recipes-devtools/guilt/files/guilt.patch +++ b/meta/recipes-devtools/guilt/files/guilt.patch | |||
@@ -12,6 +12,8 @@ This change does three things: | |||
12 | - enhances the header detection and creation of patches | 12 | - enhances the header detection and creation of patches |
13 | as they are pushed onto the tree. | 13 | as they are pushed onto the tree. |
14 | 14 | ||
15 | Upstream-Status: Inappropriate [oe-specific] | ||
16 | |||
15 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 17 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
16 | 18 | ||
17 | --- | 19 | --- |
diff --git a/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch b/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch index b98ec5e9fe..fa7dd8ae00 100644 --- a/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch +++ b/meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch | |||
@@ -4,6 +4,8 @@ Patches that do not have a proper header are encountered when generating | |||
4 | a tree. This improves the detection of these patches and generates a sane | 4 | a tree. This improves the detection of these patches and generates a sane |
5 | header so the eventual commit will be coherent | 5 | header so the eventual commit will be coherent |
6 | 6 | ||
7 | Upstream-Status: Inappropriate [oe-specific] | ||
8 | |||
7 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 9 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
8 | 10 | ||
9 | --- | 11 | --- |
diff --git a/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch b/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch index b6d40dbc9f..c912397e5a 100644 --- a/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch +++ b/meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch | |||
@@ -5,6 +5,8 @@ Some of the git commands that are always called will report errors | |||
5 | unecesarility in this scenario. This adds a variable that will inhibit | 5 | unecesarility in this scenario. This adds a variable that will inhibit |
6 | those problematic calls | 6 | those problematic calls |
7 | 7 | ||
8 | Upstream-Status: Inappropriate [oe-specific] | ||
9 | |||
8 | Signed-off-by <bruce.ashfield@windriver.com> | 10 | Signed-off-by <bruce.ashfield@windriver.com> |
9 | 11 | ||
10 | --- | 12 | --- |
diff --git a/meta/recipes-devtools/guilt/files/optional_head_check.patch b/meta/recipes-devtools/guilt/files/optional_head_check.patch index 368d63b6ab..01e1d026f1 100644 --- a/meta/recipes-devtools/guilt/files/optional_head_check.patch +++ b/meta/recipes-devtools/guilt/files/optional_head_check.patch | |||
@@ -25,6 +25,8 @@ Other modes such as pop or refresh can run into problems when | |||
25 | the HEAD commit isn't tracked or expected, so they should remained | 25 | the HEAD commit isn't tracked or expected, so they should remained |
26 | checked. | 26 | checked. |
27 | 27 | ||
28 | Upstream-Status: Inappropriate [oe-specific] | ||
29 | |||
28 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 30 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
29 | 31 | ||
30 | --- | 32 | --- |
diff --git a/meta/recipes-devtools/guilt/files/uninstall_force.patch b/meta/recipes-devtools/guilt/files/uninstall_force.patch index 8c9067dd46..8f7cea1dec 100644 --- a/meta/recipes-devtools/guilt/files/uninstall_force.patch +++ b/meta/recipes-devtools/guilt/files/uninstall_force.patch | |||
@@ -1,5 +1,7 @@ | |||
1 | guilt: force removal when uninstalling | 1 | guilt: force removal when uninstalling |
2 | 2 | ||
3 | Upstream-Status: Inappropriate [oe-specific] | ||
4 | |||
3 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> | 5 | Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> |
4 | 6 | ||
5 | --- a/uninstall.orig | 7 | --- a/uninstall.orig |