tie master libressl branch to openbsd master
Added OPENBSD_BRANCH to set what branch update.sh should checkout.
This commit is contained in:
parent
3e21619bcf
commit
c95574be92
1
OPENBSD_BRANCH
Normal file
1
OPENBSD_BRANCH
Normal file
@ -0,0 +1 @@
|
||||
master
|
15
update.sh
15
update.sh
@ -1,18 +1,19 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
|
||||
# resync this library with the upstream project, remove old submodule dirs
|
||||
if [ -d openbsd ]; then
|
||||
(cd openbsd
|
||||
git checkout master
|
||||
git pull)
|
||||
else
|
||||
openbsd_branch=`cat OPENBSD_BRANCH`
|
||||
libressl_version=`cat VERSION`
|
||||
|
||||
if [ ! -d openbsd ]; then
|
||||
if [ -z "$LIBRESSL_GIT" ]; then
|
||||
git clone https://github.com/libressl-portable/openbsd.git
|
||||
else
|
||||
git clone $LIBRESSL_GIT/openbsd
|
||||
fi
|
||||
fi
|
||||
(cd openbsd
|
||||
git checkout $openbsd_branch
|
||||
git pull)
|
||||
|
||||
dir=`pwd`
|
||||
libssl_src=$dir/openbsd/src/lib/libssl
|
||||
@ -23,8 +24,6 @@ libcrypto_src=$dir/openbsd/src/lib/libcrypto
|
||||
openssl_cmd_src=$dir/openbsd/src/usr.sbin/openssl
|
||||
libcrypto_regress=$dir/openbsd/src/regress/lib/libcrypto
|
||||
|
||||
libressl_version=`cat VERSION`
|
||||
|
||||
source $libssl_src/ssl/shlib_version
|
||||
libssl_version=$major:$minor:0
|
||||
echo libssl version $libssl_version
|
||||
|
Loading…
Reference in New Issue
Block a user