|
@ -1,6 +1,7 @@ |
|
|
#!/bin/sh |
|
|
#!/bin/sh |
|
|
set -e |
|
|
set -e |
|
|
|
|
|
|
|
|
|
|
|
openbsd_branch=`cat OPENBSD_BRANCH` |
|
|
openntpd_version=`cat VERSION` |
|
|
openntpd_version=`cat VERSION` |
|
|
|
|
|
|
|
|
# pull in latest upstream code |
|
|
# pull in latest upstream code |
|
@ -13,7 +14,7 @@ if [ ! -d openbsd ]; then |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
fi |
|
|
(cd openbsd |
|
|
(cd openbsd |
|
|
git checkout master |
|
|
|
|
|
|
|
|
git checkout $openbsd_branch |
|
|
git pull --rebase) |
|
|
git pull --rebase) |
|
|
|
|
|
|
|
|
# setup source paths |
|
|
# setup source paths |
|
|