diff mbox series

[3/3] wic: plugins source bootimage/isoimage rename to have valid indentifier

Message ID 20250611153319.54778-3-anibal@limonsoftware.com
State New
Headers show
Series [1/3] wic: pluginbase workaround on invalid module filenames | expand

Commit Message

Anibal Limon June 11, 2025, 3:33 p.m. UTC
Python has rules on valid identifiers and not support modules with '-'
on the filename, change to '_';

Signed-off-by: Anibal Limon <anibal@limonsoftware.com>
---
 .../source/{bootimg-biosplusefi.py => bootimg_biosplusefi.py}     | 0
 scripts/lib/wic/plugins/source/{bootimg-efi.py => bootimg_efi.py} | 0
 .../plugins/source/{bootimg-partition.py => bootimg_partition.py} | 0
 .../wic/plugins/source/{bootimg-pcbios.py => bootimg_pcbios.py}   | 0
 .../source/{isoimage-isohybrid.py => isoimage_isohybrid.py}       | 0
 5 files changed, 0 insertions(+), 0 deletions(-)
 rename scripts/lib/wic/plugins/source/{bootimg-biosplusefi.py => bootimg_biosplusefi.py} (100%)
 rename scripts/lib/wic/plugins/source/{bootimg-efi.py => bootimg_efi.py} (100%)
 rename scripts/lib/wic/plugins/source/{bootimg-partition.py => bootimg_partition.py} (100%)
 rename scripts/lib/wic/plugins/source/{bootimg-pcbios.py => bootimg_pcbios.py} (100%)
 rename scripts/lib/wic/plugins/source/{isoimage-isohybrid.py => isoimage_isohybrid.py} (100%)

Comments

Anibal Limon June 11, 2025, 11:36 p.m. UTC | #1
This patch is the previous one, only sent to note is part of the series and
can
be integrated later after layers fix plugin filenames.

Cheers!,
Anibal

On Wed, Jun 11, 2025 at 9:33 AM Anibal Limon <anibal@limonsoftware.com>
wrote:

> Python has rules on valid identifiers and not support modules with '-'
> on the filename, change to '_';
>
> Signed-off-by: Anibal Limon <anibal@limonsoftware.com>
> ---
>  .../source/{bootimg-biosplusefi.py => bootimg_biosplusefi.py}     | 0
>  scripts/lib/wic/plugins/source/{bootimg-efi.py => bootimg_efi.py} | 0
>  .../plugins/source/{bootimg-partition.py => bootimg_partition.py} | 0
>  .../wic/plugins/source/{bootimg-pcbios.py => bootimg_pcbios.py}   | 0
>  .../source/{isoimage-isohybrid.py => isoimage_isohybrid.py}       | 0
>  5 files changed, 0 insertions(+), 0 deletions(-)
>  rename scripts/lib/wic/plugins/source/{bootimg-biosplusefi.py =>
> bootimg_biosplusefi.py} (100%)
>  rename scripts/lib/wic/plugins/source/{bootimg-efi.py => bootimg_efi.py}
> (100%)
>  rename scripts/lib/wic/plugins/source/{bootimg-partition.py =>
> bootimg_partition.py} (100%)
>  rename scripts/lib/wic/plugins/source/{bootimg-pcbios.py =>
> bootimg_pcbios.py} (100%)
>  rename scripts/lib/wic/plugins/source/{isoimage-isohybrid.py =>
> isoimage_isohybrid.py} (100%)
>
> diff --git a/scripts/lib/wic/plugins/source/bootimg-biosplusefi.py
> b/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py
> similarity index 100%
> rename from scripts/lib/wic/plugins/source/bootimg-biosplusefi.py
> rename to scripts/lib/wic/plugins/source/bootimg_biosplusefi.py
> diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py
> b/scripts/lib/wic/plugins/source/bootimg_efi.py
> similarity index 100%
> rename from scripts/lib/wic/plugins/source/bootimg-efi.py
> rename to scripts/lib/wic/plugins/source/bootimg_efi.py
> diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py
> b/scripts/lib/wic/plugins/source/bootimg_partition.py
> similarity index 100%
> rename from scripts/lib/wic/plugins/source/bootimg-partition.py
> rename to scripts/lib/wic/plugins/source/bootimg_partition.py
> diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py
> b/scripts/lib/wic/plugins/source/bootimg_pcbios.py
> similarity index 100%
> rename from scripts/lib/wic/plugins/source/bootimg-pcbios.py
> rename to scripts/lib/wic/plugins/source/bootimg_pcbios.py
> diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
> b/scripts/lib/wic/plugins/source/isoimage_isohybrid.py
> similarity index 100%
> rename from scripts/lib/wic/plugins/source/isoimage-isohybrid.py
> rename to scripts/lib/wic/plugins/source/isoimage_isohybrid.py
> --
> 2.39.5
>
>
Ross Burton June 12, 2025, 3:01 p.m. UTC | #2
On 12 Jun 2025, at 00:36, Anibal Limon <anibal@limonsoftware.com> wrote:
> This patch is the previous one, only sent to note is part of the series and can
> be integrated later after layers fix plugin filenames.

We don’t need to make everyone change their wic files though:

1) change wic to warn if the plugins have invalid filenames
2) rename plugins to be valid
3) when parsing wic files, transform the plugin name  with s/-/_.  This means we don’t need to alter any existing wic files.

You have 1 and 2 already. 3 is a quick .replace() call.  

Cheers,
Ross
Anibal Limon June 12, 2025, 3:21 p.m. UTC | #3
On Thu, Jun 12, 2025 at 9:02 AM Ross Burton <Ross.Burton@arm.com> wrote:

> On 12 Jun 2025, at 00:36, Anibal Limon <anibal@limonsoftware.com> wrote:
> > This patch is the previous one, only sent to note is part of the series
> and can
> > be integrated later after layers fix plugin filenames.
>
> We don’t need to make everyone change their wic files though:
>
> 1) change wic to warn if the plugins have invalid filenames
> 2) rename plugins to be valid
> 3) when parsing wic files, transform the plugin name  with s/-/_.  This
> means we don’t need to alter any existing wic files.
>
> You have 1 and 2 already. 3 is a quick .replace() call.


Yeah ack, we do not need 3 at this stage only give time to fix later.

Cheers,
Anibal

>
>
> Cheers,
> Ross
Trevor Woerner June 12, 2025, 8:52 p.m. UTC | #4
On Thu 2025-06-12 @ 09:21:12 AM, Anibal Limon via lists.openembedded.org wrote:
> On Thu, Jun 12, 2025 at 9:02 AM Ross Burton <Ross.Burton@arm.com> wrote:
> 
> > On 12 Jun 2025, at 00:36, Anibal Limon <anibal@limonsoftware.com> wrote:
> > > This patch is the previous one, only sent to note is part of the series
> > and can
> > > be integrated later after layers fix plugin filenames.
> >
> > We don’t need to make everyone change their wic files though:
> >
> > 1) change wic to warn if the plugins have invalid filenames
> > 2) rename plugins to be valid
> > 3) when parsing wic files, transform the plugin name  with s/-/_.  This
> > means we don’t need to alter any existing wic files.
> >
> > You have 1 and 2 already. 3 is a quick .replace() call.
> 
> 
> Yeah ack, we do not need 3 at this stage only give time to fix later.

I assume this patch is referring to (roughly):
https://packaging.python.org/en/latest/discussions/distribution-package-vs-import-package/#how-do-distribution-package-names-and-import-package-names-compare
?

The name normalization section provides an example:
https://packaging.python.org/en/latest/specifications/name-normalization/#name-normalization
diff mbox series

Patch

diff --git a/scripts/lib/wic/plugins/source/bootimg-biosplusefi.py b/scripts/lib/wic/plugins/source/bootimg_biosplusefi.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/bootimg-biosplusefi.py
rename to scripts/lib/wic/plugins/source/bootimg_biosplusefi.py
diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg_efi.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/bootimg-efi.py
rename to scripts/lib/wic/plugins/source/bootimg_efi.py
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg_partition.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/bootimg-partition.py
rename to scripts/lib/wic/plugins/source/bootimg_partition.py
diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg_pcbios.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/bootimg-pcbios.py
rename to scripts/lib/wic/plugins/source/bootimg_pcbios.py
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage_isohybrid.py
similarity index 100%
rename from scripts/lib/wic/plugins/source/isoimage-isohybrid.py
rename to scripts/lib/wic/plugins/source/isoimage_isohybrid.py