summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/guilt
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-01-04 22:30:50 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-05 11:20:01 +0000
commitf58bb1692c5700091f960e0fb90e5c39ebf5ab96 (patch)
tree237512b90f3c7d600d407cba6c1c4818e5bdc615 /meta/recipes-devtools/guilt
parent54daad852fc3bf6fc03c3ef96046e77d3ca047f4 (diff)
downloadopenembedded-core-f58bb1692c5700091f960e0fb90e5c39ebf5ab96.tar.gz
openembedded-core-f58bb1692c5700091f960e0fb90e5c39ebf5ab96.tar.bz2
openembedded-core-f58bb1692c5700091f960e0fb90e5c39ebf5ab96.zip
Patch Upstream-Status Update
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')
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-bash.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-import-commit.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-init.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-pop.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-push-no-series.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-push.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/guilt-set-git_exec_path.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/guilt.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/improve_auto_header_gen.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/make_git_commands_conditional.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/optional_head_check.patch2
-rw-r--r--meta/recipes-devtools/guilt/files/uninstall_force.patch2
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
scripts to explicitly call for bash to ensure we don't have a similar
issue after deployment.
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
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.
If patches cannot be exported, fall back to importing
commits via a more custom method.
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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 @@
guilt: allow previously initialized branches to be re-initialized
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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
Add support for popping to a tag and the ability to delete
a tag while popping from the tree
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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
more than once, then the guilt-push will fail a horrible and
incomprehensible death. Make it fail in a sensible way.
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
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
It can be handy to push AND tag at the same time.
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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,
so we use the environment variable GIT_EXEC_PATH to
force the issue.
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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:
- enhances the header detection and creation of patches
as they are pushed onto the tree.
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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
a tree. This improves the detection of these patches and generates a sane
header so the eventual commit will be coherent
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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
unecesarility in this scenario. This adds a variable that will inhibit
those problematic calls
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by <bruce.ashfield@windriver.com>
---
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
the HEAD commit isn't tracked or expected, so they should remained
checked.
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
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 @@
guilt: force removal when uninstalling
+Upstream-Status: Inappropriate [oe-specific]
+
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
--- a/uninstall.orig