From: Paul Eggleton Date: Tue, 23 Aug 2011 15:22:14 +0000 (+0100) Subject: image.bbclass, kernel.bbclass: remove non-standard -n option from cp command X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~44416 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13e14763f14b5b84051ecb158404dcef937cc4e0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git image.bbclass, kernel.bbclass: remove non-standard -n option from cp command -n is not a POSIX option and does not work on some systems (e.g. Debian Lenny); in any case it is not strictly necessary here, so remove it. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 286ae013f9c..bf8b73a75f1 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -138,7 +138,7 @@ fakeroot do_rootfs () { mkdir -p ${IMAGE_ROOTFS} mkdir -p ${DEPLOY_DIR_IMAGE} - cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt + cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt if [ "${USE_DEVFS}" != "1" ]; then for devtable in ${@get_devtable_list(d)}; do diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 894ffb39705..52aea973723 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -507,7 +507,7 @@ kernel_do_deploy() { rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin - cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt + cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt } do_deploy[dirs] = "${DEPLOYDIR} ${B}"