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

login
register
mail settings
Submitter Paul Eggleton
Date Aug. 23, 2011, 10:11 a.m.
Message ID <3b2374ace44a610af75052498766f9840fb3d615.1314094152.git.paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/10445/
State New, archived
Headers show

Comments

Paul Eggleton - Aug. 23, 2011, 10:11 a.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 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Koen Kooi - Aug. 23, 2011, 3:07 p.m.
Op 23 aug. 2011, om 12:11 heeft Paul Eggleton het volgende geschreven:

> -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>

Tested-by: Koen Kooi <koen@dominion.thruhere.net>

> ---
> meta/classes/image.bbclass |    2 +-
> 1 files changed, 1 insertions(+), 1 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
> -- 
> 1.7.4.1
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Saul Wold - Aug. 23, 2011, 3:12 p.m.
On 08/23/2011 03:11 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>
> ---
>   meta/classes/image.bbclass |    2 +-
>   1 files changed, 1 insertions(+), 1 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
Paul,

Is this in addition to the previous image.bbclass patch you provided? 
If so, there are 2 usages of -n in original patch that is merged.

Sau!
Paul Eggleton - Aug. 23, 2011, 3:19 p.m.
On Tuesday 23 August 2011 16:12:24 Saul Wold wrote:
> Is this in addition to the previous image.bbclass patch you provided?
> If so, there are 2 usages of -n in original patch that is merged.

Oops, sorry about that. V2 is coming in a few minutes.

Cheers,
Paul

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