diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-08-23 16:22:14 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-08-23 18:32:39 -0700 |
commit | 472f05007735eefdf832d9a3335c41cc09fe3477 (patch) | |
tree | cc75a98aaf6237925f56fc7436752b9a004b34db /meta | |
parent | 9471db5ff421c0c64f582b1432d0e5f993f4b591 (diff) | |
download | poky-472f05007735eefdf832d9a3335c41cc09fe3477.tar.gz |
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.
(From OE-Core rev: 13e14763f14b5b84051ecb158404dcef937cc4e0)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/kernel.bbclass | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 286ae013f9..bf8b73a75f 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
@@ -138,7 +138,7 @@ fakeroot do_rootfs () { | |||
138 | mkdir -p ${IMAGE_ROOTFS} | 138 | mkdir -p ${IMAGE_ROOTFS} |
139 | mkdir -p ${DEPLOY_DIR_IMAGE} | 139 | mkdir -p ${DEPLOY_DIR_IMAGE} |
140 | 140 | ||
141 | cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt | 141 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOY_DIR_IMAGE}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt |
142 | 142 | ||
143 | if [ "${USE_DEVFS}" != "1" ]; then | 143 | if [ "${USE_DEVFS}" != "1" ]; then |
144 | for devtable in ${@get_devtable_list(d)}; do | 144 | for devtable in ${@get_devtable_list(d)}; do |
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 894ffb3970..52aea97372 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass | |||
@@ -507,7 +507,7 @@ kernel_do_deploy() { | |||
507 | rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin | 507 | rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin |
508 | ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin | 508 | ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin |
509 | 509 | ||
510 | cp -n ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt | 510 | cp ${COREBASE}/meta/files/deploydir_readme.txt ${DEPLOYDIR}/README_-_DO_NOT_DELETE_FILES_IN_THIS_DIRECTORY.txt |
511 | } | 511 | } |
512 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" | 512 | do_deploy[dirs] = "${DEPLOYDIR} ${B}" |
513 | 513 | ||