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:50 +0000 |
commit | f15676592bb8ba082b31d35c46631f35f1b3a222 (patch) | |
tree | ca2e7a0bda40e55cef614281187595af45649ddd /meta | |
parent | d827eec21c99b0aa189589aabac6ae3bd188cfc0 (diff) | |
download | poky-f15676592bb8ba082b31d35c46631f35f1b3a222.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]
(From OE-Core rev: 7a036b1a1ec7dcd27dbe18d4c2e703bd2a8af182)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 |
8 files changed, 8 insertions, 8 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" | |||
363 | CONVERSION_DEPENDS_7zip = "p7zip-native" | 363 | CONVERSION_DEPENDS_7zip = "p7zip-native" |
364 | CONVERSION_DEPENDS_zst = "zstd-native" | 364 | CONVERSION_DEPENDS_zst = "zstd-native" |
365 | CONVERSION_DEPENDS_sum = "mtd-utils-native" | 365 | CONVERSION_DEPENDS_sum = "mtd-utils-native" |
366 | CONVERSION_DEPENDS_bmap = "bmap-tools-native" | 366 | CONVERSION_DEPENDS_bmap = "bmaptool-native" |
367 | CONVERSION_DEPENDS_u-boot = "u-boot-tools-native" | 367 | CONVERSION_DEPENDS_u-boot = "u-boot-tools-native" |
368 | CONVERSION_DEPENDS_vmdk = "qemu-system-native" | 368 | CONVERSION_DEPENDS_vmdk = "qemu-system-native" |
369 | CONVERSION_DEPENDS_vdi = "qemu-system-native" | 369 | 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" | |||
106 | do_image_wic[deptask] += "do_image_complete" | 106 | do_image_wic[deptask] += "do_image_complete" |
107 | 107 | ||
108 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' | 108 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' |
109 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" | 109 | WKS_FILE_DEPENDS_DEFAULT += "bmaptool-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" |
110 | # Unified kernel images need objcopy | 110 | # Unified kernel images need objcopy |
111 | WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils" | 111 | WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils" |
112 | WKS_FILE_DEPENDS_BOOTLOADERS = "" | 112 | 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>" | |||
70 | RECIPE_MAINTAINER:pn-blktool = "Yi Zhao <yi.zhao@windriver.com>" | 70 | RECIPE_MAINTAINER:pn-blktool = "Yi Zhao <yi.zhao@windriver.com>" |
71 | RECIPE_MAINTAINER:pn-blktrace = "Alexander Kanavin <alex.kanavin@gmail.com>" | 71 | RECIPE_MAINTAINER:pn-blktrace = "Alexander Kanavin <alex.kanavin@gmail.com>" |
72 | RECIPE_MAINTAINER:pn-bluez5 = "Anuj Mittal <anuj.mittal@intel.com>" | 72 | RECIPE_MAINTAINER:pn-bluez5 = "Anuj Mittal <anuj.mittal@intel.com>" |
73 | RECIPE_MAINTAINER:pn-bmap-tools = "Anuj Mittal <anuj.mittal@intel.com>" | 73 | RECIPE_MAINTAINER:pn-bmaptool = "Trevor Woerner <twoerner@gmail.com>" |
74 | RECIPE_MAINTAINER:pn-boost = "Alexander Kanavin <alex.kanavin@gmail.com>" | 74 | RECIPE_MAINTAINER:pn-boost = "Alexander Kanavin <alex.kanavin@gmail.com>" |
75 | RECIPE_MAINTAINER:pn-boost-build-native = "Alexander Kanavin <alex.kanavin@gmail.com>" | 75 | RECIPE_MAINTAINER:pn-boost-build-native = "Alexander Kanavin <alex.kanavin@gmail.com>" |
76 | RECIPE_MAINTAINER:pn-bootchart2 = "Alexander Kanavin <alex.kanavin@gmail.com>" | 76 | 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" | |||
4 | 4 | ||
5 | DEPENDS = "\ | 5 | DEPENDS = "\ |
6 | parted-native gptfdisk-native dosfstools-native \ | 6 | parted-native gptfdisk-native dosfstools-native \ |
7 | mtools-native bmap-tools-native grub-native cdrtools-native \ | 7 | mtools-native bmaptool-native grub-native cdrtools-native \ |
8 | btrfs-tools-native squashfs-tools-native pseudo-native \ | 8 | btrfs-tools-native squashfs-tools-native pseudo-native \ |
9 | e2fsprogs-native util-linux-native tar-native erofs-utils-native \ | 9 | e2fsprogs-native util-linux-native tar-native erofs-utils-native \ |
10 | virtual/${TARGET_PREFIX}binutils \ | 10 | 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 @@ | |||
1 | SUMMARY = "Tools to generate block map (AKA bmap) and flash images using bmap" | 1 | SUMMARY = "Tools to generate block map (AKA bmap) and flash images using bmap" |
2 | DESCRIPTION = "Bmap-tools - tools to generate block map (AKA bmap) and flash images using \ | 2 | DESCRIPTION = "bmaptool - tools to generate block map (AKA bmap) and flash images using \ |
3 | bmap. Bmaptool is a generic tool for creating the block map (bmap) for a file, \ | 3 | bmap. bmaptool is a generic tool for creating the block map (bmap) for a file, \ |
4 | and copying files using the block map. The idea is that large file containing \ | 4 | and copying files using the block map. The idea is that large file containing \ |
5 | unused blocks, like raw system image files, can be copied or flashed a lot \ | 5 | unused blocks, like raw system image files, can be copied or flashed a lot \ |
6 | faster with bmaptool than with traditional tools like "dd" or "cp"." | 6 | faster with bmaptool than with traditional tools like "dd" or "cp"." |
7 | HOMEPAGE = "https://github.com/01org/bmap-tools" | 7 | HOMEPAGE = "https://github.com/yoctoproject/bmaptool" |
8 | SECTION = "console/utils" | 8 | SECTION = "console/utils" |
9 | LICENSE = "GPL-2.0-only" | 9 | LICENSE = "GPL-2.0-only" |
10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" | 10 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" |
11 | 11 | ||
12 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" | 12 | FILESEXTRAPATHS:prepend := "${THISDIR}/files:" |
13 | SRC_URI = "git://github.com/intel/${BPN};branch=main;protocol=https \ | 13 | SRC_URI = "git://github.com/yoctoproject/${BPN};branch=main;protocol=https \ |
14 | file://0001-BmapCopy.py-fix-error-message.patch \ | 14 | file://0001-BmapCopy.py-fix-error-message.patch \ |
15 | file://0002-CLI.py-fix-block-device-udev-race-condition.patch \ | 15 | file://0002-CLI.py-fix-block-device-udev-race-condition.patch \ |
16 | file://0003-BmapCopy.py-tweak-suggested-udev-rule.patch \ | 16 | 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 | |||