| Message ID | 20220813204224.22576-5-a@unstable.cc |
|---|---|
| State | Superseded |
| Delegated to: | Antonio Quartulli |
| Headers | show |
| Series | [Openvpn-devel,v101,1/7] dco-win: introduce low-level code for handling ovpn-dco-win in Windows | expand |
Hi, On Sat, Aug 13, 2022 at 10:42:22PM +0200, Antonio Quartulli wrote: > Signed-off-by: Lev Stipakov <lev@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
Hi, I remember someone was explaining to me the necessity of verbose commit messages. Chi può essere? > It seems to take an existing setup that builds an installer *with* DCO, > and remove the DCO bits? > ... so maybe we can have a better commit message that explains this? We decided to move the uapi header to the openvpn repo, so no need anymore to clone driver repo to get that header. Hence this change. > > - 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? Yep. -Lev
Hi, On Sat, Aug 13, 2022 at 10:42:22PM +0200, Antonio Quartulli wrote: > Signed-off-by: Lev Stipakov <lev@openvpn.net> > Signed-off-by: Antonio Quartulli <a@unstable.cc> > --- > .github/workflows/build.yaml | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml > index c89d3c8c..6bd108b9 100644 > --- a/.github/workflows/build.yaml > +++ b/.github/workflows/build.yaml This does no longer apply (Arne has sneaked in other updates to build.yaml). When you send a rebase, please include something resembling a commit message :-) - otherwise the "empty commit message whitespace dragon" will eat the patch. gert
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c89d3c8c..6bd108b9 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 - name: Checkout OpenVPN uses: actions/checkout@v2 with: @@ -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 - name: build OpenVPN