Skip to content

Commit bbbc350

Browse files
committed
autogen.sh: make building from release tags work
This adapts Brent's commit libressl/portable@c95574b to rpki-client. OPENBSD_BRANCH can contain a branch, a tag, or a commit hash from the rpki-client-openbsd repo, and git will do the right thing. To make this actually work, we will need to create a release commit where OPENBSD_BRANCH contains 'rpki-client-9.7'. This commit could happen on master if we want to insist on a linear history or it could live on a dedicated branch. I don't have a particular preference here except that extra branches could be backported to earlier releases if we care to do so. Fixes rpki-client#120 (starting with release 9.7)
1 parent fd04df1 commit bbbc350

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

OPENBSD_BRANCH

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
master

update.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22
set -e
33

4-
openbsd_branch=master
4+
openbsd_branch=$(cat OPENBSD_BRANCH)
55
if [ -n "$1" ]; then
66
openbsd_branch="$1"
77
fi
@@ -19,7 +19,8 @@ if [ -d openbsd/.git ]; then
1919
(cd openbsd
2020
git fetch
2121
git checkout "${openbsd_branch}"
22-
git pull --rebase)
22+
# do not git pull on an rpki-client-X.Y release tag
23+
[ "${openbsd_branch%-*}" = rpki-client ] || git pull --rebase)
2324
fi
2425

2526
# setup source paths

0 commit comments

Comments
 (0)