diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 6 | ||||
| -rw-r--r-- | classes/distutils.bbclass | 3 | ||||
| -rw-r--r-- | classes/kernel.bbclass | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 7137876a93..b4e78f8118 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -215,8 +215,10 @@ autotools_stage_all() { # b) packaged staging will fix that anyways. :M: if [ "${AUTOTOOLS_STAGE_PKGCONFIG}" = "1" ] then - echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" - cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ + if [ -e ${STAGE_TEMP}/${libdir}/pkgconfig/ ] ; then + echo "cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/" + cp -f ${STAGE_TEMP}/${libdir}/pkgconfig/*.pc ${STAGING_LIBDIR}/pkgconfig/ + fi fi rm -rf ${STAGE_TEMP}/${mandir} || true rm -rf ${STAGE_TEMP}/${infodir} || true diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index fa34565eaf..a35ca27bd4 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -1,5 +1,6 @@ inherit distutils-base +DISTUTILS_BUILD_ARGS ?= "" DISTUTILS_STAGE_HEADERS_ARGS ?= "--install-dir=${STAGING_INCDIR}/${PYTHON_DIR}" DISTUTILS_STAGE_ALL_ARGS ?= "--prefix=${STAGING_DIR_HOST}${layout_prefix} \ --install-data=${STAGING_DATADIR}" @@ -8,7 +9,7 @@ DISTUTILS_INSTALL_ARGS ?= "--prefix=${D}/${prefix} \ distutils_do_compile() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR_NATIVE}/python setup.py build || \ + ${STAGING_BINDIR_NATIVE}/python setup.py build ${DISTUTILS_BUILD_ARGS} || \ oefatal "python setup.py build_ext execution failed." } diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 50fbbfb663..d0db4c70d2 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -233,6 +233,9 @@ ALLOW_EMPTY_kernel-image = "1" DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround" +# renamed modules +RPROVIDES_kernel-module-aes-generic = "kernel-module-aes" + pkg_postinst_kernel-image () { if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then mkdir -p $D/lib/modules/${KERNEL_VERSION} @@ -450,7 +453,7 @@ python populate_packages_prepend () { # Support checking the kernel size since some kernels need to reside in partitions # with a fixed length or there is a limit in transferring the kernel to memory do_sizecheck() { - if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}"]; then + if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'` if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then rm ${KERNEL_OUTPUT} |