mirror of
https://git.yoctoproject.org/poky
synced 2026-02-24 18:39:40 +01:00
29d6678fd5
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>
47 lines
1.1 KiB
Diff
47 lines
1.1 KiB
Diff
guilt: allow operation outside of git repos
|
|
|
|
Sometimes guilt is sourced when there isn't a containing git repository.
|
|
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
|
|
|
|
Signed-off-by <bruce.ashfield@windriver.com>
|
|
|
|
---
|
|
|
|
guilt | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
|
|
--- a/guilt
|
|
+++ b/guilt
|
|
@@ -23,7 +23,9 @@ esac
|
|
# we change directories ourselves
|
|
SUBDIRECTORY_OK=1
|
|
|
|
-. "$(git --exec-path)/git-sh-setup"
|
|
+if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then
|
|
+ . "$(git --exec-path)/git-sh-setup"
|
|
+fi
|
|
|
|
#
|
|
# Git version check
|
|
@@ -921,14 +923,15 @@ diffstat=`git config --bool guilt.diffst
|
|
# The following gets run every time this file is source'd
|
|
#
|
|
|
|
-
|
|
# GUILT_DIR="$GIT_DIR/patches"
|
|
if [ -z "$GUILT_BASE" ]; then
|
|
GUILT_BASE=wrs
|
|
fi
|
|
GUILT_DIR="$GUILT_BASE/patches"
|
|
|
|
-branch=`get_branch`
|
|
+if [ -z "$DO_NOT_USE_GITREPO_COMMANDS" ]; then
|
|
+ branch=`get_branch`
|
|
+fi
|
|
|
|
# most of the time we want to verify that the repo's branch has been
|
|
# initialized, but every once in a blue moon (e.g., we want to run guilt-init),
|