commit b90cacdd0c1ab8ea7576d4ca9f20aa5828a84e42
author Patrick Venture <venture@google.com> Mon Jul 01 11:53:57 2019 -0700
committer Patrick Venture <venture@google.com> Wed Jul 03 11:29:48 2019 -0700
tree 1019f59e5371b97f05aa4bec418ee73c01b4d103
parent 33740b9bfbb627b2bbb2e8ab8b98c8702be96752

build: prevent enabling both static and ubi tarball

Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: Ic11caface04ec15820ba7b1c74910d09f3eaea1f

configure.ac

diff --git a/configure.ac b/configure.ac
index fb2a9b9..2334814 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,6 +128,14 @@
     AX_APPEND_COMPILE_FLAGS([-DENABLE_TARBALL_UBI], [CXXFLAGS])
 ])
 
+AS_IF([test "x$enable_tarball_ubi" = "xyes"], [
+    AS_IF([test "x$enable_static_layout" = "xyes"], [
+        AS_IF([test "x$enable_tests" != "xyes"], [
+            AC_MSG_ERROR([Invalid configuration enabling both static and ubi tarball bmc image types.])
+        ])
+    ])
+])
+
 # The address used for mapping P2A or LPC into the BMC's memory-space:
 # e.g. https://github.com/openbmc/linux/blob/1da2ce51886a3b2f5db2087f26c661e13ee13b84/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts#L26
 # or https://github.com/openbmc/linux/blob/1da2ce51886a3b2f5db2087f26c661e13ee13b84/arch/arm/boot/dts/aspeed-bmc-opp-zaius.dts#L166