diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/autotools.bbclass | 3 | ||||
| -rw-r--r-- | classes/base.bbclass | 2 | ||||
| -rw-r--r-- | classes/cpan.bbclass | 4 | ||||
| -rw-r--r-- | classes/kernel.bbclass | 12 |
4 files changed, 10 insertions, 11 deletions
diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index 53480e5a15..9d741408f4 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -211,8 +211,7 @@ autotools_stage_all() { else # Otherwise libtool wasn't used, and lib/ can be copied # directly. - echo "cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}" - cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR} + autotools_stage_dir ${STAGE_TEMP}/${libdir} ${STAGING_LIBDIR} fi fi diff --git a/classes/base.bbclass b/classes/base.bbclass index c2ce508538..1213ef07fa 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -571,7 +571,7 @@ def oe_unpack_file(file, data, url = None): elif file.endswith('.bz2'): cmd = 'bzip2 -dc %s > %s' % (file, efile) elif file.endswith('.zip'): - cmd = 'unzip -q' + cmd = 'unzip -q -o' (type, host, path, user, pswd, parm) = bb.decodeurl(url) if 'dos' in parm: cmd = '%s -a' % cmd diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 506d4c4c81..ca5303d97f 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -50,13 +50,13 @@ cpan_do_compile () { } cpan_do_install () { - if [ ${@is_target(d)} == "yes" ]; then + if [ ${@is_target(d)} = "yes" ]; then oe_runmake install_vendor fi } cpan_do_stage () { - if [ ${@is_target(d)} == "no" ]; then + if [ ${@is_target(d)} = "no" ]; then oe_runmake install_vendor fi } diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index a733c7963c..35b0374f77 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -463,8 +463,8 @@ do_sizecheck() { addtask sizecheck before do_install after do_compile -KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}" -KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}" +KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}" +KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" do_deploy() { install -d ${DEPLOY_DIR_IMAGE} @@ -475,22 +475,22 @@ do_deploy() { if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then if test -e arch/${ARCH}/boot/compressed/vmlinux ; then ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin rm -f linux.bin else ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin rm -f linux.bin.gz gzip -9 linux.bin - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin rm -f linux.bin.gz fi - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin fi cd ${DEPLOY_DIR_IMAGE} rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin - package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin + package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin } do_deploy[dirs] = "${S}" |