From: Matthew Newton Date: Wed, 1 May 2024 23:46:07 +0000 (+0100) Subject: crossbuild: need oathtool now for tests X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16b2bd82f7903ce43a5e55c44865699023c1dc31;p=thirdparty%2Ffreeradius-server.git crossbuild: need oathtool now for tests --- diff --git a/scripts/docker/build/debian11/Dockerfile.cb b/scripts/docker/build/debian11/Dockerfile.cb index 88a1d0ad6e..0894139590 100644 --- a/scripts/docker/build/debian11/Dockerfile.cb +++ b/scripts/docker/build/debian11/Dockerfile.cb @@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \ # -# Install eapol_test dependencies +# Install some extra packages # RUN apt-get install $APT_OPTS \ libnl-3-dev \ - libnl-genl-3-dev - - -# -# Install debugging utilities -# -RUN apt-get install $APT_OPTS \ + libnl-genl-3-dev \ gdb \ less \ lldb \ - vim + vim \ + oathtool # @@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git RUN git clone --depth 1 --no-single-branch ${source} # -# Install build dependencies for all branches from v3 onwards +# Install build dependencies for all branches from v4 onwards # WORKDIR freeradius-server -RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ +RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ do \ git checkout $i; \ if [ -e ./debian/control.in ] ; then \ diff --git a/scripts/docker/build/debian12/Dockerfile.cb b/scripts/docker/build/debian12/Dockerfile.cb index 526630adba..172eda2824 100644 --- a/scripts/docker/build/debian12/Dockerfile.cb +++ b/scripts/docker/build/debian12/Dockerfile.cb @@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \ # -# Install eapol_test dependencies +# Install some extra packages # RUN apt-get install $APT_OPTS \ libnl-3-dev \ - libnl-genl-3-dev - - -# -# Install debugging utilities -# -RUN apt-get install $APT_OPTS \ + libnl-genl-3-dev \ gdb \ less \ lldb \ - vim + vim \ + oathtool # @@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git RUN git clone --depth 1 --no-single-branch ${source} # -# Install build dependencies for all branches from v3 onwards +# Install build dependencies for all branches from v4 onwards # WORKDIR freeradius-server -RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ +RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ do \ git checkout $i; \ if [ -e ./debian/control.in ] ; then \ diff --git a/scripts/docker/build/debiansid/Dockerfile.cb b/scripts/docker/build/debiansid/Dockerfile.cb index 39cd376380..d67d730b74 100644 --- a/scripts/docker/build/debiansid/Dockerfile.cb +++ b/scripts/docker/build/debiansid/Dockerfile.cb @@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \ # -# Install eapol_test dependencies +# Install some extra packages # RUN apt-get install $APT_OPTS \ libnl-3-dev \ - libnl-genl-3-dev - - -# -# Install debugging utilities -# -RUN apt-get install $APT_OPTS \ + libnl-genl-3-dev \ gdb \ less \ lldb \ - vim + vim \ + oathtool # @@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git RUN git clone --depth 1 --no-single-branch ${source} # -# Install build dependencies for all branches from v3 onwards +# Install build dependencies for all branches from v4 onwards # WORKDIR freeradius-server -RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ +RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ do \ git checkout $i; \ if [ -e ./debian/control.in ] ; then \ diff --git a/scripts/docker/build/rocky8/Dockerfile.cb b/scripts/docker/build/rocky8/Dockerfile.cb index 0cf07cb36e..6a6b03e977 100644 --- a/scripts/docker/build/rocky8/Dockerfile.cb +++ b/scripts/docker/build/rocky8/Dockerfile.cb @@ -89,19 +89,13 @@ RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin done # -# Tests require extra Yubikey libraries +# A few extra packages needed for tests # -RUN yum install -y libyubikey-devel - -# -# Which is required by fixture setup utilities -# -RUN yum install -y which - -# -# Explicitly install libnl3-devel which is required for the EAP tests -# -RUN yum install -y libnl3-devel +RUN yum install -y \ + libnl3-devel \ + libyubikey-devel \ + oathtool \ + which # # We test with TLS1.1, but that is disabled by default on some diff --git a/scripts/docker/build/rocky9/Dockerfile.cb b/scripts/docker/build/rocky9/Dockerfile.cb index 7c3c6ff44a..1bb069cf26 100644 --- a/scripts/docker/build/rocky9/Dockerfile.cb +++ b/scripts/docker/build/rocky9/Dockerfile.cb @@ -72,19 +72,13 @@ RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin done # -# Tests require extra Yubikey libraries +# A few extra packages needed for tests # -RUN yum install -y libyubikey-devel - -# -# Which is required by fixture setup utilities -# -RUN yum install -y which - -# -# Explicitly install libnl3-devel which is required for the EAP tests -# -RUN yum install -y libnl3-devel +RUN yum install -y \ + libnl3-devel \ + libyubikey-devel \ + oathtool \ + which # # We test with TLS1.1, but that is disabled by default on some diff --git a/scripts/docker/build/ubuntu20/Dockerfile.cb b/scripts/docker/build/ubuntu20/Dockerfile.cb index a13d9769b0..4de16a747e 100644 --- a/scripts/docker/build/ubuntu20/Dockerfile.cb +++ b/scripts/docker/build/ubuntu20/Dockerfile.cb @@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \ # -# Install eapol_test dependencies +# Install some extra packages # RUN apt-get install $APT_OPTS \ libnl-3-dev \ - libnl-genl-3-dev - - -# -# Install debugging utilities -# -RUN apt-get install $APT_OPTS \ + libnl-genl-3-dev \ gdb \ less \ lldb \ - vim + vim \ + oathtool # @@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git RUN git clone --depth 1 --no-single-branch ${source} # -# Install build dependencies for all branches from v3 onwards +# Install build dependencies for all branches from v4 onwards # WORKDIR freeradius-server -RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ +RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ do \ git checkout $i; \ if [ -e ./debian/control.in ] ; then \ diff --git a/scripts/docker/build/ubuntu22/Dockerfile.cb b/scripts/docker/build/ubuntu22/Dockerfile.cb index 15c674d26e..173e1227e9 100644 --- a/scripts/docker/build/ubuntu22/Dockerfile.cb +++ b/scripts/docker/build/ubuntu22/Dockerfile.cb @@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \ # -# Install eapol_test dependencies +# Install some extra packages # RUN apt-get install $APT_OPTS \ libnl-3-dev \ - libnl-genl-3-dev - - -# -# Install debugging utilities -# -RUN apt-get install $APT_OPTS \ + libnl-genl-3-dev \ gdb \ less \ lldb \ - vim + vim \ + oathtool # @@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git RUN git clone --depth 1 --no-single-branch ${source} # -# Install build dependencies for all branches from v3 onwards +# Install build dependencies for all branches from v4 onwards # WORKDIR freeradius-server -RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ +RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ do \ git checkout $i; \ if [ -e ./debian/control.in ] ; then \ diff --git a/scripts/docker/build/ubuntu24/Dockerfile.cb b/scripts/docker/build/ubuntu24/Dockerfile.cb index f6b2feb6b4..7907bbf626 100644 --- a/scripts/docker/build/ubuntu24/Dockerfile.cb +++ b/scripts/docker/build/ubuntu24/Dockerfile.cb @@ -53,21 +53,16 @@ RUN apt-get install $APT_OPTS \ # -# Install eapol_test dependencies +# Install some extra packages # RUN apt-get install $APT_OPTS \ libnl-3-dev \ - libnl-genl-3-dev - - -# -# Install debugging utilities -# -RUN apt-get install $APT_OPTS \ + libnl-genl-3-dev \ gdb \ less \ lldb \ - vim + vim \ + oathtool # @@ -114,10 +109,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git RUN git clone --depth 1 --no-single-branch ${source} # -# Install build dependencies for all branches from v3 onwards +# Install build dependencies for all branches from v4 onwards # WORKDIR freeradius-server -RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ +RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ do \ git checkout $i; \ if [ -e ./debian/control.in ] ; then \ diff --git a/scripts/docker/m4/crossbuild.deb.m4 b/scripts/docker/m4/crossbuild.deb.m4 index ccb93aeb04..267480ae8f 100644 --- a/scripts/docker/m4/crossbuild.deb.m4 +++ b/scripts/docker/m4/crossbuild.deb.m4 @@ -71,21 +71,22 @@ RUN update-alternatives --install /usr/bin/lldb lldb /usr/bin/lldb-CLANG_VER 60 # -# Install eapol_test dependencies +# Install some extra packages # RUN apt-get install $APT_OPTS \ +dnl +dnl for eapol_test: libnl-3-dev \ - libnl-genl-3-dev - - -# -# Install debugging utilities -# -RUN apt-get install $APT_OPTS \ + libnl-genl-3-dev \ +dnl +dnl for debugging: gdb \ less \ lldb \ - vim + vim \ +dnl +dnl for tests: + oathtool # @@ -134,10 +135,10 @@ ARG source=https://github.com/FreeRADIUS/freeradius-server.git RUN git clone --depth 1 --no-single-branch ${source} # -# Install build dependencies for all branches from v3 onwards +# Install build dependencies for all branches from v4 onwards # WORKDIR freeradius-server -RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[3-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ +RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin 2>/dev/null | sed -e 's#origin/##' | egrep "^(v[4-9]*\.[0-9x]*\.x|master|${branch})$" | sort -u); \ do \ git checkout $i; \ if [ -e ./debian/control.in ] ; then \ diff --git a/scripts/docker/m4/crossbuild.rpm.m4 b/scripts/docker/m4/crossbuild.rpm.m4 index 1783fbfe67..1c7465fb52 100644 --- a/scripts/docker/m4/crossbuild.rpm.m4 +++ b/scripts/docker/m4/crossbuild.rpm.m4 @@ -111,27 +111,19 @@ RUN for i in $(git for-each-ref --format='%(refname:short)' refs/remotes/origin done # -# Tests require extra Yubikey libraries +# A few extra packages needed for tests # -RUN yum install -y libyubikey-devel +RUN yum install -y \ + libnl3-devel \ + libyubikey-devel \ + oathtool \ + which -# -# Which is required by fixture setup utilities -# -RUN yum install -y which - -# -# Explicitly install libnl3-devel which is required for the EAP tests -# -RUN yum install -y libnl3-devel - -ifelse(OS_VER, 7,, `dnl # # We test with TLS1.1, but that is disabled by default on some # newer systems. # RUN update-crypto-policies --set LEGACY -')dnl # # Create the RPM build tree