[PATCH 1/2] wic: engine.py: use raw string for escape sequence

[PATCH 1/2] wic: engine.py: use raw string for escape sequence

[Enrico Jörns]

Fixes:

| poky/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape sequence '\/'

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 scripts/lib/wic/engine.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
index 674ccfc244..ce7e6c5d75 100644
--- a/scripts/lib/wic/engine.py
+++ b/scripts/lib/wic/engine.py
@@ -359,7 +359,7 @@ class Disk:
         Remove files/dirs and their contents from the partition.
         This only applies to ext* partition.
         """
-        abs_path = re.sub('\/\/+', '/', path)
+        abs_path = re.sub(r'\/\/+', '/', path)
         cmd = "{} {} -wR 'rm \"{}\"'".format(self.debugfs,
                                             self._get_part_image(pnum),
                                             abs_path)
-- 
2.39.2

[PATCH 2/2] wic: bootimg-efi: fix error handling

[Enrico Jörns]

If we check for empty variables, it does not make sense to print their
content in case they are empty.

Additionally, the error message in the 'kernel' check attempted to print
the wrong variable ('target') which was not even defined, yet.

Also, raising WicError doesn't require an extra newline.

Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
---
 scripts/lib/wic/plugins/source/bootimg-efi.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py
index 13a9cddf4e..7cc5131541 100644
--- a/scripts/lib/wic/plugins/source/bootimg-efi.py
+++ b/scripts/lib/wic/plugins/source/bootimg-efi.py
@@ -428,10 +428,10 @@ class BootimgEFIPlugin(SourcePlugin):
             elif source_params['loader'] == 'uefi-kernel':
                 kernel = get_bitbake_var("KERNEL_IMAGETYPE")
                 if not kernel:
-                    raise WicError("Empty KERNEL_IMAGETYPE %s\n" % target)
+                    raise WicError("Empty KERNEL_IMAGETYPE")
                 target = get_bitbake_var("TARGET_SYS")
                 if not target:
-                    raise WicError("Unknown arch (TARGET_SYS) %s\n" % target)
+                    raise WicError("Empty TARGET_SYS")
 
                 if re.match("x86_64", target):
                     kernel_efi_image = "bootx64.efi"
-- 
2.39.2

Re: [OE-core] [PATCH 1/2] wic: engine.py: use raw string for escape sequence

[Gundlupet Raju, Sandeep]

Hi RP,

We do see this issue in scarthgap, Can you get this patch backported to 
scarthgap branch?

Thanks,

Sandeep

On 6/4/2024 2:06 AM, Enrico Jörns via lists.openembedded.org wrote:
> Fixes:
>
> | poky/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape sequence '\/'
>
> Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
> ---
>   scripts/lib/wic/engine.py | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/lib/wic/engine.py b/scripts/lib/wic/engine.py
> index 674ccfc244..ce7e6c5d75 100644
> --- a/scripts/lib/wic/engine.py
> +++ b/scripts/lib/wic/engine.py
> @@ -359,7 +359,7 @@ class Disk:
>           Remove files/dirs and their contents from the partition.
>           This only applies to ext* partition.
>           """
> -        abs_path = re.sub('\/\/+', '/', path)
> +        abs_path = re.sub(r'\/\/+', '/', path)
>           cmd = "{} {} -wR 'rm \"{}\"'".format(self.debugfs,
>                                               self._get_part_image(pnum),
>                                               abs_path)
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#200302): https://lists.openembedded.org/g/openembedded-core/message/200302
> Mute This Topic: https://lists.openembedded.org/mt/106478736/3619217
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [sandeep.gundlupet-raju@amd.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>

Re: [OE-core] [PATCH 1/2] wic: engine.py: use raw string for escape sequence

[Richard Purdie]

On Mon, 2024-07-08 at 11:56 -0600, Gundlupet Raju, Sandeep wrote:
> Hi RP,
> 
> We do see this issue in scarthgap, Can you get this patch backported
> to 
> scarthgap branch?
> 
> Thanks,
> 
> Sandeep
> 
> On 6/4/2024 2:06 AM, Enrico Jörns via lists.openembedded.org wrote:
> > Fixes:
> > 
> > > poky/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape
> > > sequence '\/'
> > 
> > Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
> > ---


You need to talk to the stable maintainer for scarthgap, Steve Sakoman
(copied on this reply) about that rather than me.

Cheers,

Richard

Re: [OE-core] [PATCH 1/2] wic: engine.py: use raw string for escape sequence

[Steve Sakoman]

On Mon, Jul 8, 2024 at 2:32 PM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>
> On Mon, 2024-07-08 at 11:56 -0600, Gundlupet Raju, Sandeep wrote:
> > Hi RP,
> >
> > We do see this issue in scarthgap, Can you get this patch backported
> > to
> > scarthgap branch?
> >
> > Thanks,
> >
> > Sandeep
> >
> > On 6/4/2024 2:06 AM, Enrico Jörns via lists.openembedded.org wrote:
> > > Fixes:
> > >
> > > > poky/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape
> > > > sequence '\/'
> > >
> > > Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
> > > ---
>
>
> You need to talk to the stable maintainer for scarthgap, Steve Sakoman
> (copied on this reply) about that rather than me.

I've got it, thanks!

Steve

Re: [OE-core] [PATCH 1/2] wic: engine.py: use raw string for escape sequence

[Gundlupet Raju, Sandeep]

On 7/9/2024 7:12 AM, Steve Sakoman wrote:
> On Mon, Jul 8, 2024 at 2:32 PM Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> On Mon, 2024-07-08 at 11:56 -0600, Gundlupet Raju, Sandeep wrote:
>>> Hi RP,
>>>
>>> We do see this issue in scarthgap, Can you get this patch backported
>>> to
>>> scarthgap branch?
>>>
>>> Thanks,
>>>
>>> Sandeep
>>>
>>> On 6/4/2024 2:06 AM, Enrico Jörns via lists.openembedded.org wrote:
>>>> Fixes:
>>>>
>>>>> poky/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape
>>>>> sequence '\/'
>>>> Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
>>>> ---
>>
>> You need to talk to the stable maintainer for scarthgap, Steve Sakoman
>> (copied on this reply) about that rather than me.
> I've got it, thanks!
Thanks RP and Steve. Steve when this will be available in scarthgap branch?
>
> Steve

Re: [OE-core] [PATCH 1/2] wic: engine.py: use raw string for escape sequence

[Steve Sakoman]

On Tue, Jul 9, 2024 at 8:22 AM Gundlupet Raju, Sandeep
<sandeep.gundlupet-raju@amd.com> wrote:
>
>
> On 7/9/2024 7:12 AM, Steve Sakoman wrote:
> > On Mon, Jul 8, 2024 at 2:32 PM Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> >> On Mon, 2024-07-08 at 11:56 -0600, Gundlupet Raju, Sandeep wrote:
> >>> Hi RP,
> >>>
> >>> We do see this issue in scarthgap, Can you get this patch backported
> >>> to
> >>> scarthgap branch?
> >>>
> >>> Thanks,
> >>>
> >>> Sandeep
> >>>
> >>> On 6/4/2024 2:06 AM, Enrico Jörns via lists.openembedded.org wrote:
> >>>> Fixes:
> >>>>
> >>>>> poky/scripts/lib/wic/engine.py:362: SyntaxWarning: invalid escape
> >>>>> sequence '\/'
> >>>> Signed-off-by: Enrico Jörns <ejo@pengutronix.de>
> >>>> ---
> >>
> >> You need to talk to the stable maintainer for scarthgap, Steve Sakoman
> >> (copied on this reply) about that rather than me.
> > I've got it, thanks!
> Thanks RP and Steve. Steve when this will be available in scarthgap branch?

It is in my current test queue (stable/scarthgap-nut), if it passes
autobuilder testing then it will be posted to the list along with the
other patches for review.  If no comments during the two business day
review period then they will be merged to scarthgap.

Steve