diff options
| author | Chris Larson <chris_larson@mentor.com> | 2010-03-09 16:54:57 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2010-03-19 10:41:54 -0700 |
| commit | a215c2f283476776567506c2e3f969c48f7e5e3d (patch) | |
| tree | d2fbc73e905e93959f0627097a72d52dff200815 /classes | |
| parent | e0503768af714c4e8c7fc75e462d4e58e34042a7 (diff) | |
Don't inherit siteinfo in base.bbclass
Acked-by: Richard Purdie <rpurdie@linux.intel.com>
Acked-by: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 6 | ||||
| -rw-r--r-- | classes/base.bbclass | 4 | ||||
| -rw-r--r-- | classes/siteinfo.bbclass | 10 |
3 files changed, 6 insertions, 14 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index c53583b8b6..31d357892a 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -28,6 +28,12 @@ DEPENDS_prepend = "${@autotools_dep_prepend(d)}" DEPENDS_virtclass-native_prepend = "${@autotools_dep_prepend(d)}" DEPENDS_virtclass-nativesdk_prepend = "${@autotools_dep_prepend(d)}" +inherit siteinfo + +# Space separated list of shell scripts with variables defined to supply test +# results for autoconf tests we cannot run at build time. +export CONFIG_SITE = "${@siteinfo_get_files(d)}" + acpaths = "default" EXTRA_AUTORECONF = "--exclude=autopoint" diff --git a/classes/base.bbclass b/classes/base.bbclass index 09eb70989a..76f97d865f 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1355,10 +1355,6 @@ def check_app_exists(app, d): # Patch handling inherit patch -# Configuration data from site files -# Move to autotools.bbclass? -inherit siteinfo - EXPORT_FUNCTIONS do_setscene do_clean do_mrproper do_distclean do_fetch do_unpack do_configure do_compile do_install do_package do_populate_pkgs do_rebuild do_fetchall MIRRORS[func] = "0" diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 93cee4f890..d7f27054b0 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -112,14 +112,6 @@ def siteinfo_get_files(d): bb.debug(1, "SITE files " + sitefiles); return sitefiles -# -# Export CONFIG_SITE to the enviroment. The autotools will make use -# of this to determine where to load in variables from. This is a -# space seperate list of shell scripts processed in the order listed. -# -export CONFIG_SITE = "${@siteinfo_get_files(d)}" - - def siteinfo_get_endianess(d): info = get_siteinfo_list(d) if 'endian-little' in info: @@ -141,5 +133,3 @@ def siteinfo_get_bits(d): # SITEINFO_ENDIANESS = "${@siteinfo_get_endianess(d)}" SITEINFO_BITS = "${@siteinfo_get_bits(d)}" - - |