diff mbox series

[ovs-dev,v2,1/7] ci: Fix overriding OPTS provided from the yml.

Message ID 20221219122020.3778161-2-i.maximets@ovn.org
State Superseded
Headers show
Series AF_XDP build fixes and enhancements. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot-_Build_and_Test success github build: passed
ovsrobot/intel-ovs-compilation success test: success

Commit Message

Ilya Maximets Dec. 19, 2022, 12:20 p.m. UTC
For GCC builds we're overriding --disable-ssl or --enable-shared
options set up in the GHA yml file.

Fix that by adding to EXTRA_OPTS instead.

Fixes: 2581b0ad1159 ("travis: Combine kernel builds.")
Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
---
 .ci/linux-build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Eelco Chaudron Dec. 20, 2022, 12:33 p.m. UTC | #1
On 19 Dec 2022, at 13:20, Ilya Maximets wrote:

> For GCC builds we're overriding --disable-ssl or --enable-shared
> options set up in the GHA yml file.
>
> Fix that by adding to EXTRA_OPTS instead.
>
> Fixes: 2581b0ad1159 ("travis: Combine kernel builds.")
> Signed-off-by: Ilya Maximets <i.maximets@ovn.org>

Changes look good to me.

Acked-by: Eelco Chaudron <echaudro@redhat.com>
diff mbox series

Patch

diff --git a/.ci/linux-build.sh b/.ci/linux-build.sh
index 485109672..1f8896423 100755
--- a/.ci/linux-build.sh
+++ b/.ci/linux-build.sh
@@ -246,7 +246,7 @@  elif [ "$M32" ]; then
     # difference on 'configure' and 'make' stages.
     export CC="$CC -m32"
 elif [ "$TRAVIS_ARCH" != "aarch64" ]; then
-    OPTS="--enable-sparse"
+    EXTRA_OPTS="$EXTRA_OPTS --enable-sparse"
     if [ "$AFXDP" ]; then
         # netdev-afxdp uses memset for 64M for umem initialization.
         SPARSE_FLAGS="${SPARSE_FLAGS} -Wno-memcpy-max-count"