discover/device-handler: Mention booting device in timeout status

[petitboot] / configure.ac

diff --git a/configure.ac b/configure.ac
index 00a61135cfe340d8938f7b131f18585b96561181..bba964cd93fb2688402afef6e3f4d723d44c053b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -64,7 +64,7 @@ fi
 
 AC_CHECK_LIB([devmapper], [dm_task_create],
        [DEVMAPPER_LIBS=-ldevmapper],
-       [AC_MSG_FAILURE([The libdevmapper development library is required by petitboot.  Try installing the package libdevmapper-dev or libdevmapper-devel.])]
+       [AC_MSG_FAILURE([The libdevmapper development library is required by petitboot.  Try installing the package libdevmapper-dev or device-mapper-devel.])]
 )
 
 AC_ARG_WITH([fdt],
@@ -170,6 +170,69 @@ AS_IF(
        ]
 )
 
+AC_ARG_WITH(
+       [signed-boot],
+       [AS_HELP_STRING([--with-signed-boot],
+               [build kernel signature checking support [default=no]]
+       )],
+       [],
+       [with_signed_boot=no]
+)
+
+AM_CONDITIONAL(
+       [WITH_SIGNED_BOOT],
+       [test "x$with_signed_boot" = "xyes"])
+
+AS_IF(
+       [test "x$with_signed_boot" = "xyes"],
+       [PKG_CHECK_MODULES(
+               [GPGME],
+               [gpgme >= 1.0.0],
+               [SAVE_LIBS="$LIBS" LIBS="$LIBS $gpgme_LIBS"
+                       AC_CHECK_LIB(
+                               [gpgme],
+                               [gpgme_op_verify],
+                               [],
+                               [AC_MSG_FAILURE([--with-signed-boot was given but the test for gpgme failed.])]
+                       )
+                       LIBS="$SAVE_LIBS"
+               ],
+               [AM_PATH_GPGME([1.0.0], [SAVE_LIBS="$LIBS" LIBS="$LIBS $gpgme_LIBS"
+                       AC_CHECK_LIB(
+                               [gpgme],
+                               [gpgme_op_verify],
+                               [],
+                               [AC_MSG_FAILURE([--with-signed-boot was given but the test for gpgme failed.])]
+                       )
+                       LIBS="$SAVE_LIBS"],
+                       [AC_MSG_RESULT([$gpgme_PKG_ERRORS])
+                               AC_MSG_FAILURE([ Consider adjusting PKG_CONFIG_PATH environment variable])
+                       ])
+               ]
+       )]
+)
+
+AS_IF(
+       [test "x$with_signed_boot" = "xyes"],
+       [SAVE_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $gpgme_CFLAGS"
+               AC_CHECK_HEADERS(
+                       [gpgme.h],
+                       [],
+                       [AC_MSG_FAILURE([ --with-signed-boot given but gpgme.h not found])]
+               )
+               CPPFLAGS="$SAVE_CPPFLAGS"
+       ]
+)
+
+AM_CONDITIONAL([WITH_GPGME], [test "x$with_signed_boot" = "xyes"])
+
+AC_ARG_VAR(
+       [lockdown_file],
+       [Location of authorized signature file [default = "/etc/pb-lockdown"]]
+)
+AS_IF([test "x$lockdown_file" = x], [lockdown_file="/etc/pb-lockdown"])
+AC_DEFINE_UNQUOTED(LOCKDOWN_FILE, "$lockdown_file", [Lockdown file location])
+
 AC_ARG_ENABLE(
        [busybox],
        [AS_HELP_STRING(
@@ -179,7 +242,11 @@ AC_ARG_ENABLE(
        [],
        [enable_busybox=no]
 )
-#AM_CONDITIONAL([ENABLE_BUSYBOX], [test "x$enable_busybox" = "xyes"])
+AM_CONDITIONAL([ENABLE_BUSYBOX], [test "x$enable_busybox" = "xyes"])
+AS_IF([test "x$enable_busybox" = "xyes"],
+      [AC_DEFINE(WITH_BUSYBOX, 1, [Busybox environment enabled])],
+      []
+)
 
 AC_ARG_ENABLE(
        [mtd],
@@ -265,6 +332,8 @@ DEFINE_HOST_PROG(UMOUNT, umount, [/bin/umount])
 DEFINE_HOST_PROG(WGET, wget, [/usr/bin/wget])
 DEFINE_HOST_PROG(IP, ip, [/sbin/ip])
 DEFINE_HOST_PROG(UDHCPC, udhcpc, [/sbin/udhcpc])
+DEFINE_HOST_PROG(VGSCAN, vgscan, [/usr/sbin/vgscan])
+DEFINE_HOST_PROG(VGCHANGE, vgchange, [/usr/sbin/vgchange])
 
 AC_ARG_WITH(
     [tftp],