mirror of
https://git.yoctoproject.org/poky
synced 2026-09-14 21:49:33 +02:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
fc53fa79a8
commit
7b15d99e6c
@@ -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
|
scripts to explicitly call for bash to ensure we don't have a similar
|
||||||
issue after deployment.
|
issue after deployment.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ are generated.
|
|||||||
If patches cannot be exported, fall back to importing
|
If patches cannot be exported, fall back to importing
|
||||||
commits via a more custom method.
|
commits via a more custom method.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
guilt: allow previously initialized branches to be re-initialized
|
guilt: allow previously initialized branches to be re-initialized
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ guilt: pop and delete tags
|
|||||||
Add support for popping to a tag and the ability to delete
|
Add support for popping to a tag and the ability to delete
|
||||||
a tag while popping from the tree
|
a tag while popping from the tree
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -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
|
more than once, then the guilt-push will fail a horrible and
|
||||||
incomprehensible death. Make it fail in a sensible way.
|
incomprehensible death. Make it fail in a sensible way.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ guilt: add support for pushing and tagging
|
|||||||
|
|
||||||
It can be handy to push AND tag at the same time.
|
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>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -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
|
so we use the environment variable GIT_EXEC_PATH to
|
||||||
force the issue.
|
force the issue.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -12,6 +12,8 @@ This change does three things:
|
|||||||
- enhances the header detection and creation of patches
|
- enhances the header detection and creation of patches
|
||||||
as they are pushed onto the tree.
|
as they are pushed onto the tree.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -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
|
a tree. This improves the detection of these patches and generates a sane
|
||||||
header so the eventual commit will be coherent
|
header so the eventual commit will be coherent
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -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
|
unecesarility in this scenario. This adds a variable that will inhibit
|
||||||
those problematic calls
|
those problematic calls
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by <bruce.ashfield@windriver.com>
|
Signed-off-by <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -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
|
the HEAD commit isn't tracked or expected, so they should remained
|
||||||
checked.
|
checked.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
guilt: force removal when uninstalling
|
guilt: force removal when uninstalling
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [oe-specific]
|
||||||
|
|
||||||
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
|
||||||
|
|
||||||
--- a/uninstall.orig
|
--- a/uninstall.orig
|
||||||
|
|||||||
Reference in New Issue
Block a user