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

login
register
mail settings
Submitter Paul Eggleton
Date Aug. 23, 2011, 3:22 p.m.
Message ID <d61dc1988ac39cc249f94588d5453e9b90298f75.1314112712.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/10453/
State New, archived
Headers show

Comments

Paul Eggleton - Aug. 23, 2011, 3:22 p.m.
-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>
---
 meta/classes/image.bbclass  |    2 +-
 meta/classes/kernel.bbclass |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Darren Hart - Aug. 23, 2011, 6:26 p.m.
On 08/23/2011 08:22 AM, Paul Eggleton wrote:
> -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>

Acked-by: Darren Hart <dvhart@linux.intel.com>

> ---
>  meta/classes/image.bbclass  |    2 +-
>  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 286ae01..bf8b73a 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 a2b10f2..c855268 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -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}"
>
Richard Purdie - Aug. 24, 2011, 1:28 a.m.
On Tue, 2011-08-23 at 16:22 +0100, Paul Eggleton wrote:
> -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>
> ---
>  meta/classes/image.bbclass  |    2 +-
>  meta/classes/kernel.bbclass |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 286ae01..bf8b73a 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 a2b10f2..c855268 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -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}"