| Message ID | 20200925071428.6734-1-christian.storm@siemens.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | travis: Use libwebsockets and libgpiod packages | expand |
Hi Christian, > diff --git a/.travis.yml b/.travis.yml > index c78fd05..a730ff3 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -47,6 +47,10 @@ before_install: > - sudo apt-get install -y libmbedtls-dev > - sudo apt-get install -y libcmocka-dev > - sudo apt-get install -y libfdisk-dev > + - sudo apt-get install -y libwebsockets15 > + - sudo apt-get install -y libwebsockets-dev > + - sudo apt-get install -y libgpiod-dev > + - sudo apt-get install -y libgpiod2 > - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo Aren't the explicit installations of libwebsockets15 and libgpiod2 superfluous because libwebsockets-dev and libgpiod-dev respectively have them as dependencies? https://packages.ubuntu.com/focal/libwebsockets-dev https://packages.ubuntu.com/focal/libgpiod-dev I think this is also how it is already handled when installing the other *-dev packages. I gave it a try in my SWUpdate build container and it is working nicely. https://gitlab.com/toertel/docker-image-swupdate-contribute/-/tree/feature/build-with-focal Greetings, Mark
Hi Mark, > > diff --git a/.travis.yml b/.travis.yml > > index c78fd05..a730ff3 100644 > > --- a/.travis.yml > > +++ b/.travis.yml > > @@ -47,6 +47,10 @@ before_install: > > - sudo apt-get install -y libmbedtls-dev > > - sudo apt-get install -y libcmocka-dev > > - sudo apt-get install -y libfdisk-dev > > + - sudo apt-get install -y libwebsockets15 > > + - sudo apt-get install -y libwebsockets-dev > > + - sudo apt-get install -y libgpiod-dev > > + - sudo apt-get install -y libgpiod2 > > - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo > > Aren't the explicit installations of libwebsockets15 and libgpiod2 > superfluous because libwebsockets-dev and libgpiod-dev respectively > have them as dependencies? > > https://packages.ubuntu.com/focal/libwebsockets-dev > https://packages.ubuntu.com/focal/libgpiod-dev > > I think this is also how it is already handled when installing the > other *-dev packages. > > I gave it a try in my SWUpdate build container and it is working nicely. > > https://gitlab.com/toertel/docker-image-swupdate-contribute/-/tree/feature/build-with-focal True, just wanted to be explicit here, but I don't mind sending a V2 without the explicit installation, any thoughts? Besten Gruß, Christian
diff --git a/.travis.yml b/.travis.yml index c78fd05..a730ff3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,6 +47,10 @@ before_install: - sudo apt-get install -y libmbedtls-dev - sudo apt-get install -y libcmocka-dev - sudo apt-get install -y libfdisk-dev + - sudo apt-get install -y libwebsockets15 + - sudo apt-get install -y libwebsockets-dev + - sudo apt-get install -y libgpiod-dev + - sudo apt-get install -y libgpiod2 - echo -n | openssl s_client -connect https://scan.coverity.com:443 | sed -ne '/-BEGIN CERTIFICATE-/,/-END CERTIFICATE-/p' | sudo tee -a /etc/ssl/certs/ca- - sudo ln -sf /usr/lib/x86_64-linux-gnu/pkgconfig/lua5.2.pc /usr/lib/x86_64-linux-gnu/pkgconfig/lua.pc - sudo mkdir -p /usr/local/lib @@ -69,12 +73,6 @@ before_install: - make - sudo make install - cd .. - - git clone -b v3.0-stable https://github.com/warmcat/libwebsockets.git - - cd libwebsockets - - cmake . - - make - - sudo make install - - cd .. - git clone https://github.com/siemens/efibootguard.git - cd efibootguard - autoreconf -fi @@ -84,14 +82,6 @@ before_install: - sudo install -m 755 -d /usr/include/efibootguard - sudo install -m 644 include/ebgenv.h /usr/include/efibootguard/ebgenv.h - cd .. - - git clone -b v1.4.1 https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git - - cd libgpiod - - mkdir -p include/linux - - cp /usr/src/linux-headers-$(uname -r)/include/linux/compiler_types.h include/linux/. - - ./autogen.sh --prefix=/usr/local CFLAGS="-I/usr/src/linux-headers-$(uname -r)/include/uapi -Iinclude" - - make - - sudo make install - - cd .. - sudo ldconfig script:
Replace the self-compiled libwebsockets and libgpiod with Ubuntu's packages. Signed-off-by: Christian Storm <christian.storm@siemens.com> --- .travis.yml | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)