From 25b281668e62d90c027978b13b53075534b81d0c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 10 Feb 2009 21:05:37 -0500 Subject: module-base: Fix the test on KERNEL_OBJECT_SUFFIX We were saying if we're newer than 2.6.0, use ".o" and otherwise use ".ko", which is backwards. --- classes/module-base.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/module-base.bbclass b/classes/module-base.bbclass index c98baceeab..185803ebba 100644 --- a/classes/module-base.bbclass +++ b/classes/module-base.bbclass @@ -7,7 +7,7 @@ export CROSS_COMPILE = "${TARGET_PREFIX}" export KERNEL_VERSION = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion')}" export KERNEL_SOURCE = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-source')}" -KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') > "2.6.0"]}" +KERNEL_OBJECT_SUFFIX = "${@[".o", ".ko"][base_read_file('${STAGING_KERNEL_DIR}/kernel-abiversion') < "2.6.0"]}" KERNEL_CCSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ccsuffix')}" KERNEL_LDSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-ldsuffix')}" KERNEL_ARSUFFIX = "${@base_read_file('${STAGING_KERNEL_DIR}/kernel-arsuffix')}" -- cgit v1.2.3 From f9167aed6eedb9ce4ba347dc36c2d2b16a1e435c Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Tue, 10 Feb 2009 22:24:26 -0500 Subject: module_strip: When picking module suffix, use KERNEL_MAJOR_VERSION. With the previously broken and unused KERNEL_OBJECT_SUFFIX, this actually evaluted to "" so we always did a find path -name *, which is why we need the -d test later on. Switch to testing for KERNEL_OBJECT_SUFFIX==2.6 and else'ing for 2.4 and doing .ko or .o. Leave KERNEL_OBJECT_SUFFIX in-tact for non-mainline users. This was easier than getting kernel.bbclass to evaluate KERNEL_OBJECT_SUFFIX either on its own or re-jigging module-base and module_strip, again for non-mainline users. --- classes/module_strip.bbclass | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/module_strip.bbclass b/classes/module_strip.bbclass index 63e6569799..3316e20c80 100644 --- a/classes/module_strip.bbclass +++ b/classes/module_strip.bbclass @@ -3,7 +3,11 @@ do_strip_modules () { for p in ${PACKAGES}; do if test -e ${WORKDIR}/install/$p/lib/modules; then - modules="`find ${WORKDIR}/install/$p/lib/modules -name \*${KERNEL_OBJECT_SUFFIX}`" + if [ "${KERNEL_MAJOR_VERSION}" == "2.6" ]; then + modules="`find ${WORKDIR}/install/$p/lib/modules -name \*.ko`" + else + modules="`find ${WORKDIR}/install/$p/lib/modules -name \*.o`" + fi if [ -n "$modules" ]; then for module in $modules ; do if ! [ -d "$module" ] ; then -- cgit v1.2.3 From 625acc75389ad2c94499e6cc168f4d008de6d4cc Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Wed, 11 Feb 2009 12:06:45 +0100 Subject: sanity.bbclass: do not fail if /bin/sh is not symlink --- classes/sanity.bbclass | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'classes') diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index da3e630445..29624c3f78 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -112,8 +112,11 @@ def check_sanity(e): missing = missing.rstrip(',') messages = messages + "Please install following missing utilities: %s\n" % missing - if os.path.basename(os.readlink('/bin/sh')) == 'dash': - messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead.\n" + try: + if os.path.basename(os.readlink('/bin/sh')) == 'dash': + messages = messages + "Using dash as /bin/sh causes various subtle build problems, please use bash instead.\n" + except: + pass omask = os.umask(022) if omask & 0755: -- cgit v1.2.3 From a045dfacf6f2541e0f410d9d109581f181303756 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 18 Nov 2008 12:24:48 -0200 Subject: package.bbclass, package_ipk.bbclass: add dynamic depends on locale packages (ipk specific) --- classes/package.bbclass | 10 ---------- classes/package_ipk.bbclass | 4 ++++ 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'classes') diff --git a/classes/package.bbclass b/classes/package.bbclass index a7cdb5f2d5..55595928c6 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -293,16 +293,6 @@ python package_do_split_locales() { bb.data.setVar('DESCRIPTION_' + pkg, '%s translation for %s' % (l, pn), d) bb.data.setVar('PACKAGES', ' '.join(packages), d) - - # Disabled by RP 18/06/07 - # Wildcards aren't supported in debian - # They break with ipkg since glibc-locale* will mean that - # glibc-localedata-translit* won't install as a dependency - # for some other package which breaks meta-toolchain - # Probably breaks since virtual-locale- isn't provided anywhere - #rdep = (bb.data.getVar('RDEPENDS_%s' % mainpkg, d, 1) or bb.data.getVar('RDEPENDS', d, 1) or "").split() - #rdep.append('%s-locale*' % pn) - #bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d) } python populate_packages () { diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 3a977291ff..99f3793447 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -244,6 +244,10 @@ python do_package_ipk () { rprovides = (bb.data.getVar("RPROVIDES", localdata, 1) or "").split() rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() + + if not '-locale-' and not '-dbg' and not '-dev' in pkgname + rdepends.append('%s-locale*' % pkgname) + if rdepends: ctrlfile.write("Depends: %s\n" % ", ".join(rdepends)) if rsuggests: -- cgit v1.2.3 From fec216f25e71c0f2c82670f633b0f161d01cec0d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 13 Feb 2009 12:12:47 -0500 Subject: package_ipk.bbclass: Add missing : from a045dfacf6f2541e0f410d9d109581f181303756 --- classes/package_ipk.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 99f3793447..89d5071c09 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -245,7 +245,7 @@ python do_package_ipk () { rreplaces = (bb.data.getVar("RREPLACES", localdata, 1) or "").split() rconflicts = (bb.data.getVar("RCONFLICTS", localdata, 1) or "").split() - if not '-locale-' and not '-dbg' and not '-dev' in pkgname + if not '-locale-' and not '-dbg' and not '-dev' in pkgname: rdepends.append('%s-locale*' % pkgname) if rdepends: -- cgit v1.2.3 From 3599618c8063ae7a294c51de9b3039ecbfb89544 Mon Sep 17 00:00:00 2001 From: Roman I Khimov Date: Sat, 14 Feb 2009 10:36:38 +0100 Subject: icecc.bbclass: base fix for cross and native builds, patch/9 --- classes/icecc.bbclass | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'classes') diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 7222f6b349..dce29fbbeb 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -83,13 +83,15 @@ def create_cross_env(bb,d): #check if user has specified a specific icecc-create-env script #if not use the OE provided one - cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" + cr_env_script = bb.data.expand('${ICECC_ENV_EXEC}', d) + if cr_env_script == "${ICECC_ENV_EXEC}": + cr_env_script = bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" #call the modified create-env script result=os.popen("%s %s %s %s %s %s" %(cr_env_script, "--silent", - os.path.join(ice_dir,target_sys,'bin','gcc'), - os.path.join(ice_dir,target_sys,'bin','g++'), - os.path.join(ice_dir,target_sys,'bin','as'), + os.path.join(ice_dir, 'bin', "%s-gcc" % target_sys), + os.path.join(ice_dir, 'bin', "%s-g++" % target_sys), + os.path.join(ice_dir, 'bin', "%s-as" % target_sys), os.path.join(ice_dir,"ice",cross_name) ) ) return tar_file @@ -121,7 +123,9 @@ def create_native_env(bb,d): #check if user has specified a specific icecc-create-env script #if not use the OE provided one - cr_env_script = bb.data.getVar('ICECC_ENV_EXEC', d) or bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" + cr_env_script = bb.data.expand('${ICECC_ENV_EXEC}', d) + if cr_env_script == "${ICECC_ENV_EXEC}": + cr_env_script = bb.data.expand('${STAGING_DIR}', d)+"/ice/icecc-create-env" result=os.popen("%s %s %s %s %s %s" %(cr_env_script, "--silent", os.popen("%s gcc" % "which").read()[:-1], @@ -290,9 +294,9 @@ def check_for_kernel(bb,d): set_icecc_env() { - ICECC_PATH=${@icc_path(bb,d)} - if test x${ICECC_PATH} != x; then - export PATH=${ICECC_PATH}$PATH + ICE_PATH=${@icc_path(bb,d)} + if test x${ICE_PATH} != x; then + export PATH=${ICE_PATH}$PATH export CCACHE_PATH=$PATH #check if we are building a kernel and select gcc-cross-kernel if [ "${@check_for_kernel(bb,d)}" = "yes" ]; then -- cgit v1.2.3