]> code.ossystems Code Review - openembedded-core.git/commitdiff
image.bbclass, kernel.bbclass: remove non-standard -n option from cp command
authorPaul Eggleton <paul.eggleton@linux.intel.com>
Tue, 23 Aug 2011 15:22:14 +0000 (16:22 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 24 Aug 2011 01:32:24 +0000 (18:32 -0700)
-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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/image.bbclass
meta/classes/kernel.bbclass

index 286ae013f9c67ef502c4ac2401371d7ffe3a8f90..bf8b73a75f10df873fe7c635787bb1f7a785803c 100644 (file)
@@ -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
index 894ffb39705bba241e44c393ec10ed5564c3d216..52aea973723524e3a517619afc26cd3a4aaa1d2e 100644 (file)
@@ -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}"