Remove cp -n option as discussed v2

PATCH Applied Paul Eggleton 3 participants 4 messages Aug 23, 2011 – Aug 24, 2011

lore

Share & tools

lore

Paul Eggleton

author

2011-08-23 15:27 UTC #0 lore raw

cover Remove cp -n option as discussed v2

Since v1, add a fix for kernel.bbclass as well.

The following changes since commit 9134800548a03bfe3a7e351a15f2129bcb3cc680:

xcb/libpthreads: Add BBCLASSEXTEND to resolve missing providers in world builds (2011-08-19 16:27:29 -0700)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib paule/sanity3a
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/sanity3a

Paul Eggleton (1):
image.bbclass, kernel.bbclass: remove non-standard -n option from cp
command

 meta/classes/image.bbclass  |    2 +-
 meta/classes/kernel.bbclass |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Signature · 1 line

1.7.4.1

Paul Eggleton

author

2011-08-23 15:27 UTC #1 lore raw

PATCH 1/1 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 <[email protected]>

---
 meta/classes/image.bbclass  |    2 +-
 meta/classes/kernel.bbclass |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/classes/image.bbclass +1 -1

index 286ae01..bf8b73a 100644
@@ -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

meta/classes/kernel.bbclass +1 -1

index a2b10f2..c855268 100644
@@ -501,7 +501,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}"

Signature · 1 line

1.7.4.1

Darren Hart

Acked-by on v1 1/1

2011-08-23 18:30 UTC #2 lore raw

Re: [PATCH 1/1] image.bbclass, kernel.bbclass: remove non-standard -n option from cp command

Quoted 4 lines · Paul Eggleton

-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 <[email protected]>

Acked-by Darren Hart <[email protected]>

Quoted 31 lines

---
 meta/classes/image.bbclass  |    2 +-
 meta/classes/kernel.bbclass |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/classes/image.bbclass +1 -1

index 286ae01..bf8b73a 100644
@@ -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

meta/classes/kernel.bbclass +1 -1

index a2b10f2..c855268 100644
@@ -501,7 +501,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}"

Signature · 3 lines

Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Richard Purdie

Applied

2011-08-24 01:33 UTC #3 lore raw

Re: [PATCH 1/1] image.bbclass, kernel.bbclass: remove non-standard -n option from cp command

In reply to Paul Eggleton

Quoted 8 lines · Paul Eggleton

-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 <[email protected]>
---
 meta/classes/image.bbclass  |    2 +-
 meta/classes/kernel.bbclass |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard