Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

generate-git-snapshot: explicitly set git-export-dir when building with enabled overlay option #231

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion scripts/generate-git-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,14 @@ gbp_opts() {
if [ -n "${GBP_OPTS:-}" ] ; then
echo "Found environment variable GBP_OPTS, set to ${GBP_OPTS}"
else
GBP_OPTS=" -nc --git-force-create --git-ignore-new --git-ignore-branch -S -us -uc --git-verbose --git-builder=/bin/true --git-cleaner=/bin/true --git-export-dir= "
echo "Using git-buildpackage default options provided by jenkins-debian-glue"

if gbp config buildpackage.overlay | grep -q 'True' ; then
echo "Identified Debian package with overlay enabled, explicitly setting '--git-export-dir=../'"
GBP_OPTS=" -nc --git-force-create --git-ignore-new --git-ignore-branch -S -us -uc --git-verbose --git-builder=/bin/true --git-cleaner=/bin/true --git-export-dir=../ "
else
GBP_OPTS=" -nc --git-force-create --git-ignore-new --git-ignore-branch -S -us -uc --git-verbose --git-builder=/bin/true --git-cleaner=/bin/true --git-export-dir= "
fi
fi
}

Expand Down