diff options
author | Trevor Woerner <twoerner@gmail.com> | 2024-03-04 14:25:58 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-03-05 12:24:31 +0000 |
commit | 7a036b1a1ec7dcd27dbe18d4c2e703bd2a8af182 (patch) | |
tree | c9f941d17765ac18e67514a781d07460f929a21d | |
parent | 61949efcdb496b27d03f89ccde3d16c8cf4a56d5 (diff) | |
download | openembedded-core-7a036b1a1ec7dcd27dbe18d4c2e703bd2a8af182.tar.gz |
bmaptool: now part of Yocto Project
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
[RP: Added a couple of missing renames]
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-recipe/image_types.bbclass | 2 | ||||
-rw-r--r-- | meta/classes-recipe/image_types_wic.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 2 | ||||
-rw-r--r-- | meta/recipes-core/meta/wic-tools.bb | 2 | ||||
-rw-r--r-- | meta/recipes-support/bmaptool/bmaptool_git.bb (renamed from meta/recipes-support/bmap-tools/bmap-tools_git.bb) | 8 | ||||
-rw-r--r-- | meta/recipes-support/bmaptool/files/0001-BmapCopy.py-fix-error-message.patch (renamed from meta/recipes-support/bmap-tools/files/0001-BmapCopy.py-fix-error-message.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-support/bmaptool/files/0002-CLI.py-fix-block-device-udev-race-condition.patch (renamed from meta/recipes-support/bmap-tools/files/0002-CLI.py-fix-block-device-udev-race-condition.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-support/bmaptool/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch (renamed from meta/recipes-support/bmap-tools/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch) | 0 | ||||
-rw-r--r-- | scripts/lib/wic/misc.py | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/meta/classes-recipe/image_types.bbclass b/meta/classes-recipe/image_types.bbclass index 3733bdfc20..4ad13b4367 100644 --- a/meta/classes-recipe/image_types.bbclass +++ b/meta/classes-recipe/image_types.bbclass @@ -363,7 +363,7 @@ CONVERSION_DEPENDS_zip = "zip-native" CONVERSION_DEPENDS_7zip = "p7zip-native" CONVERSION_DEPENDS_zst = "zstd-native" CONVERSION_DEPENDS_sum = "mtd-utils-native" -CONVERSION_DEPENDS_bmap = "bmap-tools-native" +CONVERSION_DEPENDS_bmap = "bmaptool-native" CONVERSION_DEPENDS_u-boot = "u-boot-tools-native" CONVERSION_DEPENDS_vmdk = "qemu-system-native" CONVERSION_DEPENDS_vdi = "qemu-system-native" diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index ce7125f6f1..cf3be909b3 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass @@ -106,7 +106,7 @@ do_image_wic[recrdeptask] += "do_deploy" do_image_wic[deptask] += "do_image_complete" WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' -WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" +WKS_FILE_DEPENDS_DEFAULT += "bmaptool-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" # Unified kernel images need objcopy WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils" WKS_FILE_DEPENDS_BOOTLOADERS = "" diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 7e17e9b71f..a3433f496c 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -70,7 +70,7 @@ RECIPE_MAINTAINER:pn-bison = "Chen Qi <Qi.Chen@windriver.com>" RECIPE_MAINTAINER:pn-blktool = "Yi Zhao <yi.zhao@windriver.com>" RECIPE_MAINTAINER:pn-blktrace = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-bluez5 = "Anuj Mittal <anuj.mittal@intel.com>" -RECIPE_MAINTAINER:pn-bmap-tools = "Anuj Mittal <anuj.mittal@intel.com>" +RECIPE_MAINTAINER:pn-bmaptool = "Trevor Woerner <twoerner@gmail.com>" RECIPE_MAINTAINER:pn-boost = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-boost-build-native = "Alexander Kanavin <alex.kanavin@gmail.com>" RECIPE_MAINTAINER:pn-bootchart2 = "Alexander Kanavin <alex.kanavin@gmail.com>" diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index 9282d36a4d..76494e7fca 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/meta/recipes-support/bmap-tools/bmap-tools_git.bb b/meta/recipes-support/bmaptool/bmaptool_git.bb index ffb6ccfe99..87328af8c6 100644 --- a/meta/recipes-support/bmap-tools/bmap-tools_git.bb +++ b/meta/recipes-support/bmaptool/bmaptool_git.bb @@ -1,16 +1,16 @@ SUMMARY = "Tools to generate block map (AKA bmap) and flash images using bmap" -DESCRIPTION = "Bmap-tools - tools to generate block map (AKA bmap) and flash images using \ -bmap. Bmaptool is a generic tool for creating the block map (bmap) for a file, \ +DESCRIPTION = "bmaptool - tools to generate block map (AKA bmap) and flash images using \ +bmap. bmaptool is a generic tool for creating the block map (bmap) for a file, \ and copying files using the block map. The idea is that large file containing \ unused blocks, like raw system image files, can be copied or flashed a lot \ faster with bmaptool than with traditional tools like "dd" or "cp"." -HOMEPAGE = "https://github.com/01org/bmap-tools" +HOMEPAGE = "https://github.com/yoctoproject/bmaptool" SECTION = "console/utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -SRC_URI = "git://github.com/intel/${BPN};branch=main;protocol=https \ +SRC_URI = "git://github.com/yoctoproject/${BPN};branch=main;protocol=https \ file://0001-BmapCopy.py-fix-error-message.patch \ file://0002-CLI.py-fix-block-device-udev-race-condition.patch \ file://0003-BmapCopy.py-tweak-suggested-udev-rule.patch \ diff --git a/meta/recipes-support/bmap-tools/files/0001-BmapCopy.py-fix-error-message.patch b/meta/recipes-support/bmaptool/files/0001-BmapCopy.py-fix-error-message.patch index ddac322e91..ddac322e91 100644 --- a/meta/recipes-support/bmap-tools/files/0001-BmapCopy.py-fix-error-message.patch +++ b/meta/recipes-support/bmaptool/files/0001-BmapCopy.py-fix-error-message.patch diff --git a/meta/recipes-support/bmap-tools/files/0002-CLI.py-fix-block-device-udev-race-condition.patch b/meta/recipes-support/bmaptool/files/0002-CLI.py-fix-block-device-udev-race-condition.patch index ea2749a264..ea2749a264 100644 --- a/meta/recipes-support/bmap-tools/files/0002-CLI.py-fix-block-device-udev-race-condition.patch +++ b/meta/recipes-support/bmaptool/files/0002-CLI.py-fix-block-device-udev-race-condition.patch diff --git a/meta/recipes-support/bmap-tools/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch b/meta/recipes-support/bmaptool/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch index 2794eeada3..2794eeada3 100644 --- a/meta/recipes-support/bmap-tools/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch +++ b/meta/recipes-support/bmaptool/files/0003-BmapCopy.py-tweak-suggested-udev-rule.patch diff --git a/scripts/lib/wic/misc.py b/scripts/lib/wic/misc.py index 2b90821b30..1a7c140fa6 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", |