diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools_stage.bbclass | 6 | ||||
| -rw-r--r-- | classes/insane.bbclass | 2 | ||||
| -rw-r--r-- | classes/module-base.bbclass | 2 | ||||
| -rw-r--r-- | classes/module_strip.bbclass | 6 | ||||
| -rw-r--r-- | classes/package.bbclass | 10 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 4 | ||||
| -rw-r--r-- | classes/sanity.bbclass | 6 |
7 files changed, 24 insertions, 12 deletions
diff --git a/classes/autotools_stage.bbclass b/classes/autotools_stage.bbclass new file mode 100644 index 0000000000..3007eef969 --- /dev/null +++ b/classes/autotools_stage.bbclass @@ -0,0 +1,6 @@ +inherit autotools + +do_stage () { + autotools_stage_all +} + diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 3a2cadcaff..5b31a0123d 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -359,6 +359,8 @@ def package_qa_hash_style(path, name, d, elf): elf = True if "GNU_HASH" in line: sane = True + if "[mips32]" in line or "[mips64]" in line: + sane = True if elf and not sane: error_msg = "No GNU_HASH in the elf binary: '%s'" % path 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')}" 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 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..89d5071c09 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: diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index e442bf1807..29624c3f78 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -112,6 +112,12 @@ def check_sanity(e): missing = missing.rstrip(',') messages = messages + "Please install following missing utilities: %s\n" % missing + 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: messages = messages + "Please use a umask which allows a+rx and u+rwx\n" |