Re: [OE-core] [PATCH] bmaptool: now part of Yocto Project

2024-03-05 Thread Khem Raj
This also needs to reflect in docs.

On Tue, Mar 5, 2024 at 4:52 AM Trevor Woerner  wrote:
>
> On Tue 2024-03-05 @ 11:59:17 AM, Richard Purdie wrote:
> > On Mon, 2024-03-04 at 14:25 -0500, Trevor Woerner wrote:
> > > The bmaptool (previously: bmap-tools, bmap-tool, bmaptool) has been moved
> > > to be under the Yocto Project umbrella and is now hosted at:
> > >
> > > github.com/yoctoproject/bmaptool
> > >
> > > Signed-off-by: Trevor Woerner 
> > > ---
> > >  meta/classes-recipe/image_types.bbclass   | 2 +-
> > >  meta/classes-recipe/image_types_wic.bbclass   | 2 +-
> > >  meta/conf/distro/include/maintainers.inc  | 2 +-
> > >  .../bmap-tools_git.bb => bmaptool/bmaptool_git.bb}| 8 
> > >  .../files/0001-BmapCopy.py-fix-error-message.patch| 0
> > >  ...0002-CLI.py-fix-block-device-udev-race-condition.patch | 0
> > >  .../0003-BmapCopy.py-tweak-suggested-udev-rule.patch  | 0
> > >  7 files changed, 7 insertions(+), 7 deletions(-)
> > >  rename meta/recipes-support/{bmap-tools/bmap-tools_git.bb => 
> > > bmaptool/bmaptool_git.bb} (78%)
> > >  rename meta/recipes-support/{bmap-tools => 
> > > bmaptool}/files/0001-BmapCopy.py-fix-error-message.patch (100%)
> > >  rename meta/recipes-support/{bmap-tools => 
> > > bmaptool}/files/0002-CLI.py-fix-block-device-udev-race-condition.patch 
> > > (100%)
> > >  rename meta/recipes-support/{bmap-tools => 
> > > bmaptool}/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch (100%)
> >
> > Thanks. Unfortunately this wasn't quite enough and caused a ton of
> > build failures, it also needs:
>
> Oops! Sorry about that.
>
> > diff --git a/meta/recipes-core/meta/wic-tools.bb 
> > b/meta/recipes-core/meta/wic-tools.bb
> > index 9282d36a4dc..76494e7fca4 100644
> > --- a/meta/recipes-core/meta/wic-tools.bb
> > +++ b/meta/recipes-core/meta/wic-tools.bb
> > @@ -4,7 +4,7 @@ LICENSE = "MIT"
> >
> >  DEPENDS = "\
> > parted-native gptfdisk-native dosfstools-native \
> > -   mtools-native bmap-tools-native grub-native cdrtools-native \
> > +   mtools-native bmaptool-native grub-native cdrtools-native \
> > btrfs-tools-native squashfs-tools-native pseudo-native \
> > e2fsprogs-native util-linux-native tar-native 
> > erofs-utils-native \
> > virtual/${TARGET_PREFIX}binutils \
> > diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
> > index 2b90821b305..1a7c140fa6c 100644
> > --- a/scripts/lib/wic/misc.py
> > +++ b/scripts/lib/wic/misc.py
> > @@ -25,7 +25,7 @@ from wic import WicError
> >  logger = logging.getLogger('wic')
> >
> >  # executable -> recipe pairs for exec_native_cmd
> > -NATIVE_RECIPES = {"bmaptool": "bmap-tools",
> > +NATIVE_RECIPES = {"bmaptool": "bmaptool",
> >"dumpe2fs": "e2fsprogs",
> >"grub-mkimage": "grub-efi",
> >"isohybrid": "syslinux",
> >
> > but I'll squash that into the patch.
>
> Great, thanks!
>
> 
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196644): 
https://lists.openembedded.org/g/openembedded-core/message/196644
Mute This Topic: https://lists.openembedded.org/mt/104729497/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [OE-core] [PATCH] bmaptool: now part of Yocto Project

2024-03-05 Thread Trevor Woerner
On Tue 2024-03-05 @ 11:59:17 AM, Richard Purdie wrote:
> On Mon, 2024-03-04 at 14:25 -0500, Trevor Woerner wrote:
> > The bmaptool (previously: bmap-tools, bmap-tool, bmaptool) has been moved
> > to be under the Yocto Project umbrella and is now hosted at:
> > 
> > github.com/yoctoproject/bmaptool
> > 
> > Signed-off-by: Trevor Woerner 
> > ---
> >  meta/classes-recipe/image_types.bbclass   | 2 +-
> >  meta/classes-recipe/image_types_wic.bbclass   | 2 +-
> >  meta/conf/distro/include/maintainers.inc  | 2 +-
> >  .../bmap-tools_git.bb => bmaptool/bmaptool_git.bb}    | 8 
> >  .../files/0001-BmapCopy.py-fix-error-message.patch    | 0
> >  ...0002-CLI.py-fix-block-device-udev-race-condition.patch | 0
> >  .../0003-BmapCopy.py-tweak-suggested-udev-rule.patch  | 0
> >  7 files changed, 7 insertions(+), 7 deletions(-)
> >  rename meta/recipes-support/{bmap-tools/bmap-tools_git.bb => 
> > bmaptool/bmaptool_git.bb} (78%)
> >  rename meta/recipes-support/{bmap-tools => 
> > bmaptool}/files/0001-BmapCopy.py-fix-error-message.patch (100%)
> >  rename meta/recipes-support/{bmap-tools => 
> > bmaptool}/files/0002-CLI.py-fix-block-device-udev-race-condition.patch 
> > (100%)
> >  rename meta/recipes-support/{bmap-tools => 
> > bmaptool}/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch (100%)
> 
> Thanks. Unfortunately this wasn't quite enough and caused a ton of
> build failures, it also needs:

Oops! Sorry about that.

> diff --git a/meta/recipes-core/meta/wic-tools.bb 
> b/meta/recipes-core/meta/wic-tools.bb
> index 9282d36a4dc..76494e7fca4 100644
> --- a/meta/recipes-core/meta/wic-tools.bb
> +++ b/meta/recipes-core/meta/wic-tools.bb
> @@ -4,7 +4,7 @@ LICENSE = "MIT"
>  
>  DEPENDS = "\
> parted-native gptfdisk-native dosfstools-native \
> -   mtools-native bmap-tools-native grub-native cdrtools-native \
> +   mtools-native bmaptool-native grub-native cdrtools-native \
> btrfs-tools-native squashfs-tools-native pseudo-native \
> e2fsprogs-native util-linux-native tar-native erofs-utils-native \
> virtual/${TARGET_PREFIX}binutils \
> diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
> index 2b90821b305..1a7c140fa6c 100644
> --- a/scripts/lib/wic/misc.py
> +++ b/scripts/lib/wic/misc.py
> @@ -25,7 +25,7 @@ from wic import WicError
>  logger = logging.getLogger('wic')
>  
>  # executable -> recipe pairs for exec_native_cmd
> -NATIVE_RECIPES = {"bmaptool": "bmap-tools",
> +NATIVE_RECIPES = {"bmaptool": "bmaptool",
>"dumpe2fs": "e2fsprogs",
>"grub-mkimage": "grub-efi",
>"isohybrid": "syslinux",
> 
> but I'll squash that into the patch.

Great, thanks!

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196631): 
https://lists.openembedded.org/g/openembedded-core/message/196631
Mute This Topic: https://lists.openembedded.org/mt/104729497/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-



Re: [OE-core] [PATCH] bmaptool: now part of Yocto Project

2024-03-05 Thread Richard Purdie
On Mon, 2024-03-04 at 14:25 -0500, Trevor Woerner wrote:
> The bmaptool (previously: bmap-tools, bmap-tool, bmaptool) has been moved
> to be under the Yocto Project umbrella and is now hosted at:
> 
>   github.com/yoctoproject/bmaptool
> 
> Signed-off-by: Trevor Woerner 
> ---
>  meta/classes-recipe/image_types.bbclass   | 2 +-
>  meta/classes-recipe/image_types_wic.bbclass   | 2 +-
>  meta/conf/distro/include/maintainers.inc  | 2 +-
>  .../bmap-tools_git.bb => bmaptool/bmaptool_git.bb}    | 8 
>  .../files/0001-BmapCopy.py-fix-error-message.patch    | 0
>  ...0002-CLI.py-fix-block-device-udev-race-condition.patch | 0
>  .../0003-BmapCopy.py-tweak-suggested-udev-rule.patch  | 0
>  7 files changed, 7 insertions(+), 7 deletions(-)
>  rename meta/recipes-support/{bmap-tools/bmap-tools_git.bb => 
> bmaptool/bmaptool_git.bb} (78%)
>  rename meta/recipes-support/{bmap-tools => 
> bmaptool}/files/0001-BmapCopy.py-fix-error-message.patch (100%)
>  rename meta/recipes-support/{bmap-tools => 
> bmaptool}/files/0002-CLI.py-fix-block-device-udev-race-condition.patch (100%)
>  rename meta/recipes-support/{bmap-tools => 
> bmaptool}/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch (100%)

Thanks. Unfortunately this wasn't quite enough and caused a ton of
build failures, it also needs:

diff --git a/meta/recipes-core/meta/wic-tools.bb 
b/meta/recipes-core/meta/wic-tools.bb
index 9282d36a4dc..76494e7fca4 100644
--- a/meta/recipes-core/meta/wic-tools.bb
+++ b/meta/recipes-core/meta/wic-tools.bb
@@ -4,7 +4,7 @@ LICENSE = "MIT"
 
 DEPENDS = "\
parted-native gptfdisk-native dosfstools-native \
-   mtools-native bmap-tools-native grub-native cdrtools-native \
+   mtools-native bmaptool-native grub-native cdrtools-native \
btrfs-tools-native squashfs-tools-native pseudo-native \
e2fsprogs-native util-linux-native tar-native erofs-utils-native \
virtual/${TARGET_PREFIX}binutils \
diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py
index 2b90821b305..1a7c140fa6c 100644
--- a/scripts/lib/wic/misc.py
+++ b/scripts/lib/wic/misc.py
@@ -25,7 +25,7 @@ from wic import WicError
 logger = logging.getLogger('wic')
 
 # executable -> recipe pairs for exec_native_cmd
-NATIVE_RECIPES = {"bmaptool": "bmap-tools",
+NATIVE_RECIPES = {"bmaptool": "bmaptool",
   "dumpe2fs": "e2fsprogs",
   "grub-mkimage": "grub-efi",
   "isohybrid": "syslinux",

but I'll squash that into the patch.

Cheers,

Richard


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#196630): 
https://lists.openembedded.org/g/openembedded-core/message/196630
Mute This Topic: https://lists.openembedded.org/mt/104729497/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub 
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-