proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-07 11:25:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

debian: Fix the debian packaging script to build on non-default branch

Browse Source 
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>
This commit is contained in:
Ondřej Surý 2021-02-11 20:44:09 +01:00
parent 33ce95cad0
commit 9ea548cf3c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/build-debian-package.sh
View File

@ -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/') 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") LAST_TIMESTAMP=$(git log --format=format:%ad --date=format:%s -1 "HEAD")
DEBIAN_VERSION="$UPSTREAM_VERSION-$LAST_TIMESTAMP-1" DEBIAN_VERSION="$UPSTREAM_VERSION-$LAST_TIMESTAMP-1"
DEBIAN_BRANCH=$(git branch --show-current)
# #
# We add a Debian changelog entry, and use artifical "since commit" # 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..." echo "Adding new snapshot debian/changelog entry for $DEBIAN_VERSION..."
gbp dch \ gbp dch \
--ignore-branch \ --debian-branch="$DEBIAN_BRANCH" \
--new-version "$DEBIAN_VERSION" \ --new-version="$DEBIAN_VERSION" \
--dch-opt="--force-bad-version" \ --dch-opt="--force-bad-version" \
--since="HEAD~" \ --since="HEAD~" \
--snapshot \ --snapshot \
@ -85,7 +86,7 @@ UPSTREAM_COMPRESSION=xz
gbp buildpackage \ gbp buildpackage \
--git-export-dir="$WORKDIR" \ --git-export-dir="$WORKDIR" \
--git-builder="$BUILDER" \ --git-builder="$BUILDER" \
--git-ignore-branch \ --git-debian-branch="$DEBIAN_BRANCH" \
--git-force-create \ --git-force-create \
--git-compression=$UPSTREAM_COMPRESSION \ --git-compression=$UPSTREAM_COMPRESSION \
--git-no-pristine-tar --git-no-pristine-tar