From d246a3eb6312125e9e83f9000425108a31eba02d Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 12 Oct 2006 09:25:33 +0000 Subject: sanity.bbclass: loop over required utilities --- classes/sanity.bbclass | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 23a8f656b2..d81def55a6 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -82,23 +82,11 @@ def check_sanity(e): if not check_app_exists('${BUILD_PREFIX}g++', e.data): raise_sanity_error('C++ Host-Compiler is missing, please install one' ) - if not check_app_exists('patch', e.data): - raise_sanity_error('Please install the patch utility, preferable GNU patch.') + required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip" - if not check_app_exists('diffstat', e.data): - raise_sanity_error('Please install the diffstat utility') - - if not check_app_exists('texi2html', e.data): - raise_sanity_error('Please install the texi2html binary') - - if not check_app_exists('cvs', e.data): - raise_sanity_error('Please install the cvs utility') - - if not check_app_exists('svn', e.data): - raise_sanity_error('Please install the svn utility') - - if not check_app_exists('bzip2', e.data): - raise_sanity_error('Please install the bzip2 utility') + for util in required_utilities.split(): + if not check_app_exists( util, e.data ): + raise_sanity_error( "Please install the %s utility." ) oes_bb_conf = data.getVar( 'OES_BITBAKE_CONF', e.data, True ) if not oes_bb_conf: -- cgit v1.2.3 From 94df33eaad7e5b8ea972b019e63a915d564c5ed7 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 12 Oct 2006 09:31:39 +0000 Subject: rename linux_modules to linux-kernel-base, add common kernel_get*version functions to this class --- classes/kernel.bbclass | 33 +----------------------------- classes/linux-kernel-base.bbclass | 42 +++++++++++++++++++++++++++++++++++++++ classes/linux_modules.bbclass | 19 ------------------ 3 files changed, 43 insertions(+), 51 deletions(-) create mode 100644 classes/linux-kernel-base.bbclass delete mode 100644 classes/linux_modules.bbclass (limited to 'classes') diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 94e02925d7..3a7fd5b499 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -1,4 +1,4 @@ -inherit module_strip +inherit linux-kernel-base module_strip PROVIDES += "virtual/kernel" DEPENDS += "virtual/${TARGET_PREFIX}depmod-${@get_kernelmajorversion('${PV}')} virtual/${TARGET_PREFIX}gcc${KERNEL_CCSUFFIX} update-modules" @@ -43,37 +43,6 @@ KERNEL_IMAGEDEST = "boot" # export CMDLINE_CONSOLE = "console=${@bb.data.getVar("KERNEL_CONSOLE",d,1) or "ttyS0"}" -# parse kernel ABI version out of -def get_kernelversion(p): - import re, os - - fn = p + '/include/linux/utsrelease.h' - if not os.path.isfile(fn): - fn = p + '/include/linux/version.h' - - import re - try: - f = open(fn, 'r') - except IOError: - return None - - l = f.readlines() - f.close() - r = re.compile("#define UTS_RELEASE \"(.*)\"") - for s in l: - m = r.match(s) - if m: - return m.group(1) - return None - -def get_kernelmajorversion(p): - import re - r = re.compile("([0-9]+\.[0-9]+).*") - m = r.match(p); - if m: - return m.group(1) - return None - KERNEL_VERSION = "${@get_kernelversion('${S}')}" KERNEL_MAJOR_VERSION = "${@get_kernelmajorversion('${KERNEL_VERSION}')}" diff --git a/classes/linux-kernel-base.bbclass b/classes/linux-kernel-base.bbclass new file mode 100644 index 0000000000..e58c228080 --- /dev/null +++ b/classes/linux-kernel-base.bbclass @@ -0,0 +1,42 @@ +# parse kernel ABI version out of +def get_kernelversion(p): + import re, os + + fn = p + '/include/linux/utsrelease.h' + if not os.path.isfile(fn): + fn = p + '/include/linux/version.h' + + import re + try: + f = open(fn, 'r') + except IOError: + return None + + l = f.readlines() + f.close() + r = re.compile("#define UTS_RELEASE \"(.*)\"") + for s in l: + m = r.match(s) + if m: + return m.group(1) + return None + +def get_kernelmajorversion(p): + import re + r = re.compile("([0-9]+\.[0-9]+).*") + m = r.match(p); + if m: + return m.group(1) + return None + +def linux_module_packages(s, d): + import bb, os.path + suffix = "" + if (bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) == "1"): + file = bb.data.expand('${STAGING_KERNEL_DIR}/kernel-abiversion', d) + if (os.path.exists(file)): + suffix = "-%s" % (get_kernelmajorversion(base_read_file(file))) + return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) + +# that's all + diff --git a/classes/linux_modules.bbclass b/classes/linux_modules.bbclass deleted file mode 100644 index d5c4e74ca1..0000000000 --- a/classes/linux_modules.bbclass +++ /dev/null @@ -1,19 +0,0 @@ -def get_kernelmajorversion(p): - import re - r = re.compile("([0-9]+\.[0-9]+).*") - m = r.match(p); - if m: - return m.group(1) - return None - -def linux_module_packages(s, d): - import bb, os.path - suffix = "" - if (bb.data.getVar("PARALLEL_INSTALL_MODULES", d, 1) == "1"): - file = bb.data.expand('${STAGING_KERNEL_DIR}/kernel-abiversion', d) - if (os.path.exists(file)): - suffix = "-%s" % (get_kernelmajorversion(base_read_file(file))) - return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) - -# that's all - -- cgit v1.2.3 From 86123c1f8c95b10a1aee30b96b3ed86dfe7a6b88 Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Thu, 12 Oct 2006 10:53:31 +0000 Subject: base.bbclass: make showing display revision work with the mtn 0.30 workspace format --- classes/base.bbclass | 3 +++ 1 file changed, 3 insertions(+) (limited to 'classes') diff --git a/classes/base.bbclass b/classes/base.bbclass index 0c62568107..a9b61d26b1 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -505,6 +505,9 @@ python base_eventhandler() { monotone_revision = "" try: monotone_revision = file( "%s/_MTN/revision" % path_to_packages ).read().strip() + if monotone_revision.startswith( "format_version" ): + monotone_revision_words = monotone_revision.split() + monotone_revision = monotone_revision_words[ monotone_revision_words.index( "old_revision" )+1][1:-1] except IOError: pass bb.data.setVar( 'OE_REVISION', monotone_revision, e.data ) -- cgit v1.2.3