diff options
| author | Ondřej Surý <ondrej@sury.org> | 2021-02-11 20:44:09 +0100 |
|---|---|---|
| committer | Ondřej Surý <ondrej@sury.org> | 2021-07-03 17:02:37 +0200 |
| commit | 9ea548cf3c81452f46cd0f52ff678db242e8d971 (patch) | |
| tree | 6126eb016d1e2a81ee21d44e1a574fc810df5b33 /tools/build-debian-package.sh | |
| parent | 33ce95cad08d40aca84e254a26547aac5054e232 (diff) | |
debian: Fix the debian packaging script to build on non-default branch
The packaging script would fail to run on non-master branch, fix that
by pulling original branch name.
Signed-off-by: Ondřej Surý <ondrej@sury.org>
Diffstat (limited to 'tools/build-debian-package.sh')
| -rwxr-xr-x | tools/build-debian-package.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/build-debian-package.sh b/tools/build-debian-package.sh index b8ac7e1ffc..b7a80d5f91 100755 --- a/tools/build-debian-package.sh +++ b/tools/build-debian-package.sh @@ -54,6 +54,7 @@ cd "$CLONEDIR" UPSTREAM_VERSION=$(sed -ne 's/AC_INIT(\[frr\],\s\[\([^]]*\)\],.*/\1/p' configure.ac | sed -e 's/-\(\(dev\|alpha\|beta\)\d*\)/~\1/') LAST_TIMESTAMP=$(git log --format=format:%ad --date=format:%s -1 "HEAD") DEBIAN_VERSION="$UPSTREAM_VERSION-$LAST_TIMESTAMP-1" +DEBIAN_BRANCH=$(git branch --show-current) # # We add a Debian changelog entry, and use artifical "since commit" @@ -66,8 +67,8 @@ DEBIAN_VERSION="$UPSTREAM_VERSION-$LAST_TIMESTAMP-1" echo "Adding new snapshot debian/changelog entry for $DEBIAN_VERSION..." gbp dch \ - --ignore-branch \ - --new-version "$DEBIAN_VERSION" \ + --debian-branch="$DEBIAN_BRANCH" \ + --new-version="$DEBIAN_VERSION" \ --dch-opt="--force-bad-version" \ --since="HEAD~" \ --snapshot \ @@ -85,7 +86,7 @@ UPSTREAM_COMPRESSION=xz gbp buildpackage \ --git-export-dir="$WORKDIR" \ --git-builder="$BUILDER" \ - --git-ignore-branch \ + --git-debian-branch="$DEBIAN_BRANCH" \ --git-force-create \ --git-compression=$UPSTREAM_COMPRESSION \ --git-no-pristine-tar |