Boottool does require popt.h at build time. So, if this
include is not present, don't even bother trying to build
grubby.
Signed-off-by: Lucas Meneghel Rodrigues <l...@redhat.com>
---
client/tools/boottool | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/client/tools/boottool b/client/tools/boottool
index 7cfc935..1863db5 100755
--- a/client/tools/boottool
+++ b/client/tools/boottool
@@ -67,6 +67,17 @@ LOGGING_FORMAT = "%(levelname)s: %(name)s: %(message)s"
log = logging.getLogger('boottool')
+def find_header(hdr):
+ """
+ Find a given header in the system.
+ """
+ for dir in ['/usr/include', '/usr/local/include']:
+ file = os.path.join(dir, hdr)
+ if os.path.exists(file):
+ return file
+ raise ValueError('Missing header: %s' % hdr)
+
+
class EfiVar(object):
'''
Helper class to manipulate EFI firmware variables
@@ -1236,6 +1247,12 @@ class Grubby(object):
for line in lines:
self.log.debug(line.strip())
+ try:
+ find_header('popt.h')
+ except ValueError:
+ self.log.debug('No popt.h header present, skipping build')
+ return False
+
tarball_name = os.path.basename(tarball)
srcdir = os.path.join(topdir, 'src')
--
1.7.10.1
_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
