From: Garrett C. <su...@li...> - 2010-11-02 02:58:13
|
The branch, master, has been updated via 96edd18fb24339ad45f09a7006a55ca293066fbd (commit) via 1b04e49929e0625799b44648f470d344f9264242 (commit) from e5c39e35a356c14f04a622e8f4cb71f73876a934 (commit) - Log ----------------------------------------------------------------- commit 96edd18fb24339ad45f09a7006a55ca293066fbd Author: Garrett Cooper <yan...@gm...> Date: Mon Nov 1 19:56:48 2010 -0700 Include features.mk in the build. Signed-off-by: Garrett Cooper <yan...@gm...> commit 1b04e49929e0625799b44648f470d344f9264242 Author: Garrett Cooper <yan...@gm...> Date: Mon Nov 1 19:54:02 2010 -0700 Try to fix security feature autoconf bits. The variables used after setting up the autoconf tests weren't being properly exported, resulting in compile time errors on systems without libcap or securebits. Properly export these variables via include/mk/features.mk Noticed-by: Cyril Hrubis <ch...@su...> Signed-off-by: Garrett Cooper <yan...@gm...> ----------------------------------------------------------------------- Summary of changes: include/mk/env_pre.mk | 1 + .../ade/Makefile => include/mk/features.mk.default | 11 ++++++----- .../eject/Makefile => include/mk/features.mk.in | 13 ++++++------- 3 files changed, 13 insertions(+), 12 deletions(-) copy testcases/commands/ade/Makefile => include/mk/features.mk.default (76%) copy testcases/commands/eject/Makefile => include/mk/features.mk.in (75%) diff --git a/include/mk/env_pre.mk b/include/mk/env_pre.mk index 6351f9a..2453d4c 100644 --- a/include/mk/env_pre.mk +++ b/include/mk/env_pre.mk @@ -98,6 +98,7 @@ endif ifeq ($(filter autotools %clean help,$(MAKECMDGOALS)),) include $(abs_top_builddir)/include/mk/config.mk +include $(abs_top_builddir)/include/mk/features.mk # START out-of-build-tree check. ifneq ($(abs_builddir),$(abs_srcdir)) diff --git a/testcases/commands/ade/Makefile b/include/mk/features.mk.default similarity index 76% copy from testcases/commands/ade/Makefile copy to include/mk/features.mk.default index 115a93a..da30c28 100644 --- a/testcases/commands/ade/Makefile +++ b/include/mk/features.mk.default @@ -1,7 +1,7 @@ # -# commands/ade test suite Makefile. +# features.mk.default - feature tuning include Makefile. # -# Copyright (C) 2009, Cisco Systems Inc. +# Copyright (C) 2009, Linux Test Project. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,7 +20,8 @@ # Garrett Cooper, July 2009 # -top_srcdir ?= ../../.. +# Does the program -- capset -- exist? +HAVE_CAPSET := no -include $(top_srcdir)/include/mk/env_pre.mk -include $(top_srcdir)/include/mk/generic_trunk_target.mk +# Is securebits[.h], et all support available? +HAVE_SECUREBITS := no diff --git a/testcases/commands/eject/Makefile b/include/mk/features.mk.in similarity index 75% copy from testcases/commands/eject/Makefile copy to include/mk/features.mk.in index d22173d..b145e60 100644 --- a/testcases/commands/eject/Makefile +++ b/include/mk/features.mk.in @@ -1,7 +1,7 @@ # -# commands/eject testcases Makefile. +# features.mk.in - feature tuning include Makefile. # -# Copyright (C) 2009, Cisco Systems Inc. +# Copyright (C) 2009, Linux Test Project. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,10 +20,9 @@ # Garrett Cooper, July 2009 # -top_srcdir ?= ../../.. +# Does the program -- capset -- exist? +HAVE_CAPSET := @HAVE_CAPSET@ -include $(top_srcdir)/include/mk/testcases.mk +# Is securebits[.h], et all support available? +HAVE_SECUREBITS := @HAVE_SECUREBITS@ -INSTALL_TARGETS := eject-tests.sh - -include $(top_srcdir)/include/mk/generic_leaf_target.mk hooks/post-receive -- ltp |