From mboxrd@z Thu Jan  1 00:00:00 1970
X-GM-THRID: 6756899790246641664
Date: Mon, 2 Dec 2019 21:33:11 -0800 (PST)
From: vijai kumar <vijaikumar.kanagarajan@gmail.com>
To: isar-users <isar-users@googlegroups.com>
Message-Id: <2f0e4ece-4ab7-4d5e-8db8-65d2fdb0ddc4@googlegroups.com>
In-Reply-To: <20191108174735.9998-1-Vijaikumar_Kangarajan@mentor.com>
References: <20191108174148.GA9643@oxygen>
 <20191108174735.9998-1-Vijaikumar_Kangarajan@mentor.com>
Subject: Re: [PATCH v2] meta/classes: Make sure the files exists before
 copying
MIME-Version: 1.0
Content-Type: multipart/mixed; 
	boundary="----=_Part_831_113223274.1575351191957"
X-Google-Token: EJfnl-8F7WcxA5_cOm80
X-Google-IP: 139.181.36.34
X-TUID: /xxCBFE/lcQM

------=_Part_831_113223274.1575351191957
Content-Type: multipart/alternative; 
	boundary="----=_Part_832_212150086.1575351191957"

------=_Part_832_212150086.1575351191957
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Can this be merged to next??

Thanks,
Vijai Kumar K

On Friday, November 8, 2019 at 11:17:45 PM UTC+5:30, vijai kumar wrote:
>
> From: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> 
>
> By default realpath doesnot check if the file exists and hence 
> might return an invalid path. 
>
> Check if file exists before copying. 
>
> Signed-off-by: Vijai Kumar K <Vijaikumar_Kanagarajan@mentor.com> 
> --- 
> Changes in v2: 
>   - Use -f in if condition instead of realpath -e to make code 
> more readable. 
>
>  meta/classes/image.bbclass | 4 ++-- 
>  1 file changed, 2 insertions(+), 2 deletions(-) 
>
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass 
> index 8384b71..c845eab 100644 
> --- a/meta/classes/image.bbclass 
> +++ b/meta/classes/image.bbclass 
> @@ -129,12 +129,12 @@ EOF 
>  do_copy_boot_files[dirs] = "${DEPLOY_DIR_IMAGE}" 
>  do_copy_boot_files() { 
>      kernel="$(realpath -q '${IMAGE_ROOTFS}/${KERNEL_FILE}')" 
> -    if [ -n "$kernel" ]; then 
> +    if [ -f "$kernel" ]; then 
>          cp -f "$kernel" '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE}' 
>      fi 
>   
>      initrd="$(realpath -q '${IMAGE_ROOTFS}/initrd.img')" 
> -    if [ -n "$initrd" ]; then 
> +    if [ -f "$initrd" ]; then 
>          cp -f "$initrd" '${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}' 
>      fi 
>   
> -- 
> 2.17.1 
>
>
------=_Part_832_212150086.1575351191957
Content-Type: text/html; charset=utf-8
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div>Can this be merged to next??</div><div><br></div><div=
>Thanks,</div><div>Vijai Kumar K<br></div><br>On Friday, November 8, 2019 a=
t 11:17:45 PM UTC+5:30, vijai kumar wrote:<blockquote class=3D"gmail_quote"=
 style=3D"margin: 0;margin-left: 0.8ex;border-left: 1px #ccc solid;padding-=
left: 1ex;">From: Vijai Kumar K &lt;<a href=3D"mailto:Vijaikumar_Kanagaraja=
n@mentor.com" target=3D"_blank" rel=3D"nofollow" onmousedown=3D"this.href=
=3D&#39;mailto:Vijaikumar_Kanagarajan@mentor.com&#39;;return true;" onclick=
=3D"this.href=3D&#39;mailto:Vijaikumar_Kanagarajan@mentor.com&#39;;return t=
rue;">Vijaikumar_Kanagarajan@<wbr>mentor.com</a>&gt;
<br>
<br>By default realpath doesnot check if the file exists and hence
<br>might return an invalid path.
<br>
<br>Check if file exists before copying.
<br>
<br>Signed-off-by: Vijai Kumar K &lt;<a href=3D"mailto:Vijaikumar_Kanagaraj=
an@mentor.com" target=3D"_blank" rel=3D"nofollow" onmousedown=3D"this.href=
=3D&#39;mailto:Vijaikumar_Kanagarajan@mentor.com&#39;;return true;" onclick=
=3D"this.href=3D&#39;mailto:Vijaikumar_Kanagarajan@mentor.com&#39;;return t=
rue;">Vijaikumar_Kanagarajan@<wbr>mentor.com</a>&gt;
<br>---
<br>Changes in v2:
<br>=C2=A0 - Use -f in if condition instead of realpath -e to make code=20
<br>more readable.
<br>
<br>=C2=A0meta/classes/image.bbclass | 4 ++--
<br>=C2=A01 file changed, 2 insertions(+), 2 deletions(-)
<br>
<br>diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
<br>index 8384b71..c845eab 100644
<br>--- a/meta/classes/image.bbclass
<br>+++ b/meta/classes/image.bbclass
<br>@@ -129,12 +129,12 @@ EOF
<br>=C2=A0do_copy_boot_files[dirs] =3D &quot;${DEPLOY_DIR_IMAGE}&quot;
<br>=C2=A0do_copy_boot_files() {
<br>=C2=A0 =C2=A0 =C2=A0kernel=3D&quot;$(realpath -q &#39;${IMAGE_ROOTFS}/$=
{KERNEL_<wbr>FILE}&#39;)&quot;
<br>- =C2=A0 =C2=A0if [ -n &quot;$kernel&quot; ]; then
<br>+ =C2=A0 =C2=A0if [ -f &quot;$kernel&quot; ]; then
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cp -f &quot;$kernel&quot; &#39;${DEPL=
OY_DIR_IMAGE}/${KERNEL_<wbr>IMAGE}&#39;
<br>=C2=A0 =C2=A0 =C2=A0fi
<br>=C2=A0
<br>=C2=A0 =C2=A0 =C2=A0initrd=3D&quot;$(realpath -q &#39;${IMAGE_ROOTFS}/i=
nitrd.img&#39;)&quot;
<br>- =C2=A0 =C2=A0if [ -n &quot;$initrd&quot; ]; then
<br>+ =C2=A0 =C2=A0if [ -f &quot;$initrd&quot; ]; then
<br>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0cp -f &quot;$initrd&quot; &#39;${DEPL=
OY_DIR_IMAGE}/${INITRD_<wbr>IMAGE}&#39;
<br>=C2=A0 =C2=A0 =C2=A0fi
<br>=C2=A0
<br>--=20
<br>2.17.1
<br>
<br></blockquote></div>
------=_Part_832_212150086.1575351191957--

------=_Part_831_113223274.1575351191957--