Hi,

On Sat, Aug 13, 2022 at 10:42:22PM +0200, Antonio Quartulli wrote:
> Signed-off-by: Lev Stipakov <l...@openvpn.net>
> Signed-off-by: Antonio Quartulli <a...@unstable.cc>
> ---
>  .github/workflows/build.yaml | 7 +------
>  1 file changed, 1 insertion(+), 6 deletions(-)

I do not understand this commit.  Not at all.

It seems to take an existing setup that builds an installer *with* DCO,
and remove the DCO bits?

> @@ -59,11 +59,6 @@ jobs:
>      steps:
>        - name: Install dependencies
>          run: sudo apt update && sudo apt install -y mingw-w64 libtool 
> automake autoconf man2html unzip
> -      - name: Checkout ovpn-dco-win
> -        uses: actions/checkout@v2
> -        with:
> -          repository: OpenVPN/ovpn-dco-win
> -          path: ovpn-dco-win

... so maybe we can have a better commit message that explains this?


> @@ -151,7 +146,7 @@ jobs:
>          run: cp ./tap-windows-${TAP_WINDOWS_VERSION}/include/tap-windows.h 
> ${HOME}/mingw/opt/include/
>  
>        - name: configure OpenVPN
> -        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig 
> DCO_SOURCEDIR=$(realpath ../ovpn-dco-win) LDFLAGS=-L$HOME/mingw/opt/lib 
> CFLAGS=-I$HOME/mingw/opt/include OPENSSL_LIBS="-L${HOME}/opt/lib -lssl 
> -lcrypto" OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt 
> LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib 
> -llzo2" ./configure  --host=${CHOST} --disable-lz4 --enable-dco
> +        run: PKG_CONFIG_PATH=${HOME}/mingw/opt/lib/pkgconfig 
> LDFLAGS=-L$HOME/mingw/opt/lib CFLAGS=-I$HOME/mingw/opt/include 
> OPENSSL_LIBS="-L${HOME}/opt/lib -lssl -lcrypto" 
> OPENSSL_CFLAGS=-I$HOME/mingw/opt/include PREFIX=$HOME/mingw/opt 
> LZO_CFLAGS=-I$HOME/mingw/opt/include LZO_LIBS="-L${HOME}/mingw/opt/lib 
> -llzo2" ./configure  --host=${CHOST} --disable-lz4
>          working-directory: openvpn

This, I think, is clear - "--enable-dco is default for windows builds",
and maybe also "no DCO_SOURCEDIR neccesary anymore, since ovpn_dco_win.h
is now part of our tree", right?

gert
-- 
"If was one thing all people took for granted, was conviction that if you 
 feed honest figures into a computer, honest figures come out. Never doubted 
 it myself till I met a computer with a sense of humor."
                             Robert A. Heinlein, The Moon is a Harsh Mistress

Gert Doering - Munich, Germany                             g...@greenie.muc.de

Attachment: signature.asc
Description: PGP signature

_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel

Reply via email to