diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 2 | ||||
| -rw-r--r-- | classes/base.bbclass | 4 | ||||
| -rw-r--r-- | classes/cpan.bbclass | 3 | ||||
| -rw-r--r-- | classes/kernel.bbclass | 7 | ||||
| -rw-r--r-- | classes/package.bbclass | 6 | ||||
| -rw-r--r-- | classes/src_distribute.bbclass | 4 |
6 files changed, 18 insertions, 8 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 82b5311ef5..adb57f6cc9 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -134,7 +134,7 @@ autotools_do_configure() { ;; esac if [ -e ${S}/configure ]; then - oe_runconf + oe_runconf $@ else oenote "nothing to configure" fi diff --git a/classes/base.bbclass b/classes/base.bbclass index 93a76aa30f..10648e9885 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -758,7 +758,7 @@ def base_get_metadata_svn_revision(d): def base_get_metadata_git_branch(d): import os - branch = os.popen('cd %s; git-branch | grep "^* " | tr -d "* "' % base_get_scmbasepath(d)).read() + branch = os.popen('cd %s; git branch | grep "^* " | tr -d "* "' % base_get_scmbasepath(d)).read() if len(branch) != 0: return branch @@ -766,7 +766,7 @@ def base_get_metadata_git_branch(d): def base_get_metadata_git_revision(d): import os - rev = os.popen("cd %s; git-log -n 1 --pretty=oneline --" % base_get_scmbasepath(d)).read().split(" ")[0] + rev = os.popen("cd %s; git log -n 1 --pretty=oneline --" % base_get_scmbasepath(d)).read().split(" ")[0] if len(rev) != 0: return rev return "<unknown>" diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 3ff3f3093d..7b3faa2561 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -10,7 +10,8 @@ export PERLCONFIGTARGET = "${@is_target(d)}" # Env var which tells perl where the perl include files are export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" -export PERL_ARCHLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}" +export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}" +export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}" cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 266a89dd9a..a6db6815ce 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -91,12 +91,17 @@ kernel_do_compile() { } kernel_do_compile[depends] = "${INITRAMFS_TASK}" - kernel_do_stage() { ASMDIR=`readlink include/asm` mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + # Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm + if [ -e arch/${ARCH}/include/asm/ ] ; then + cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include + cp -fR arch/${ARCH}/include/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/include/ + fi rm -f $ASMDIR ${STAGING_KERNEL_DIR}/include/asm ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm diff --git a/classes/package.bbclass b/classes/package.bbclass index 4dfd5f0444..8b7d6494ea 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -459,7 +459,7 @@ python populate_packages () { for pkg in package_list: rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "") - remstr = "${PN} (= ${DEBPV})" + remstr = "${PN} (= ${EXTENDPV})" if main_is_empty and remstr in rdepends: rdepends.remove(remstr) for l in dangling_links[pkg]: @@ -551,7 +551,9 @@ emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime" ldconfig_postinst_fragment() { if [ x"$D" = "x" ]; then - [ -x /sbin/ldconfig ] && [ -e /etc/ld.so.conf ] && /sbin/ldconfig + if [ -e /etc/ld.so.conf ] ; then + [ -x /sbin/ldconfig ] && /sbin/ldconfig + fi fi } diff --git a/classes/src_distribute.bbclass b/classes/src_distribute.bbclass index f20410d0bb..a12473950a 100644 --- a/classes/src_distribute.bbclass +++ b/classes/src_distribute.bbclass @@ -8,7 +8,9 @@ python do_distribute_sources () { import re for license in licenses: for entry in license.split("|"): - for s in (bb.data.getVar('A', d, 1) or "").split(): + for url in ((bb.data.getVar('SRC_URI', d, 1) or '').split()): + bb.fetch.init([url], d) + s = bb.fetch.localpath(url, d) s = re.sub(';.*$', '', s) cmd = bb.data.getVar('SRC_DISTRIBUTECOMMAND', d, 1) if not cmd: |