diff mbox series

[meta-arago,master/kirkstone] tisdk-bundle: Fix generate_sw_manifest_table

Message ID 20231004063945.703846-1-a-limaye@ti.com
State Rejected
Delegated to: Ryan Eatmon
Headers show
Series [meta-arago,master/kirkstone] tisdk-bundle: Fix generate_sw_manifest_table | expand

Commit Message

Limaye, Aniket Oct. 4, 2023, 6:39 a.m. UTC
The generated manifest file is expected to strictly have 7 columns,
delimited by '|' while the License section also sometimes has '|'
character. Replace this one by 'or' to fix manifest file

Signed-off-by: Aniket Limaye <a-limaye@ti.com>
---
 meta-arago-distro/classes/tisdk-bundle.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Ryan Eatmon Oct. 4, 2023, 1:33 p.m. UTC | #1
On 10/4/2023 1:39 AM, Aniket Limaye wrote:
> The generated manifest file is expected to strictly have 7 columns,
> delimited by '|' while the License section also sometimes has '|'
> character. Replace this one by 'or' to fix manifest file
> 
> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
> ---
>   meta-arago-distro/classes/tisdk-bundle.bbclass | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
> index 1ebdb6fb..d2d31381 100644
> --- a/meta-arago-distro/classes/tisdk-bundle.bbclass
> +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
> @@ -553,7 +553,7 @@ EOF
>           package="`cat $i | grep Package: | awk {'print $2'}`"
>           version="`cat $i | grep Version: | awk {'print $2'} | cut -f1-2 -d-`"
>           long_version="`cat $i | grep Version: | awk {'print $2'}`"
> -        license="`cat $i | grep License: | cut -d: -f2 `"
> +        license="`cat $i | grep License: | cut -d: -f2 | sed 's/|/or/g' `"
>           architecture="`cat $i | grep Architecture: | awk {'print $2'}`"
>           sources="`cat $i | grep Source: | cut -d ':' -f2-`"
>           location="$package""_""$long_version""_""$architecture"".ipk"

I'm in the middle of modifying all of this code to fix a build issue. 
This section of code is moving to a new file.  I will resubmit a new 
version of this patch with the change made in the new location.
Limaye, Aniket Oct. 4, 2023, 2:56 p.m. UTC | #2
Hi Ryan,

Yeah sure, thanks!
Sorry, I saw your patch only after I sent mine.  

Regards,
Aniket


-----Original Message-----
From: Eatmon, Ryan <reatmon@ti.com> 
Sent: Wednesday, October 4, 2023 7:04 PM
To: Limaye, Aniket <a-limaye@ti.com>; meta-arago@lists.yoctoproject.org
Subject: Re: [meta-arago][master/kirkstone][PATCH] tisdk-bundle: Fix generate_sw_manifest_table



On 10/4/2023 1:39 AM, Aniket Limaye wrote:
> The generated manifest file is expected to strictly have 7 columns, 
> delimited by '|' while the License section also sometimes has '|'
> character. Replace this one by 'or' to fix manifest file
> 
> Signed-off-by: Aniket Limaye <a-limaye@ti.com>
> ---
>   meta-arago-distro/classes/tisdk-bundle.bbclass | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass 
> b/meta-arago-distro/classes/tisdk-bundle.bbclass
> index 1ebdb6fb..d2d31381 100644
> --- a/meta-arago-distro/classes/tisdk-bundle.bbclass
> +++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
> @@ -553,7 +553,7 @@ EOF
>           package="`cat $i | grep Package: | awk {'print $2'}`"
>           version="`cat $i | grep Version: | awk {'print $2'} | cut -f1-2 -d-`"
>           long_version="`cat $i | grep Version: | awk {'print $2'}`"
> -        license="`cat $i | grep License: | cut -d: -f2 `"
> +        license="`cat $i | grep License: | cut -d: -f2 | sed 's/|/or/g' `"
>           architecture="`cat $i | grep Architecture: | awk {'print $2'}`"
>           sources="`cat $i | grep Source: | cut -d ':' -f2-`"
>           location="$package""_""$long_version""_""$architecture"".ipk"

I'm in the middle of modifying all of this code to fix a build issue. 
This section of code is moving to a new file.  I will resubmit a new version of this patch with the change made in the new location.

-- 
Ryan Eatmon                reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc.  -  LCPD  -  MGTS
diff mbox series

Patch

diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
index 1ebdb6fb..d2d31381 100644
--- a/meta-arago-distro/classes/tisdk-bundle.bbclass
+++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
@@ -553,7 +553,7 @@  EOF
         package="`cat $i | grep Package: | awk {'print $2'}`"
         version="`cat $i | grep Version: | awk {'print $2'} | cut -f1-2 -d-`"
         long_version="`cat $i | grep Version: | awk {'print $2'}`"
-        license="`cat $i | grep License: | cut -d: -f2 `"
+        license="`cat $i | grep License: | cut -d: -f2 | sed 's/|/or/g' `"
         architecture="`cat $i | grep Architecture: | awk {'print $2'}`"
         sources="`cat $i | grep Source: | cut -d ':' -f2-`"
         location="$package""_""$long_version""_""$architecture"".ipk"