From ba3a417fbbccb5f6af9ac036eac97c87dcf4c1b7 Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Wed, 25 Nov 2020 15:33:57 +0000 Subject: [PATCH] rpi-bootfiles: Rename recipe to avoid ambiguity The name `bootfiles` is too generic, we should use `rpi-bootfiles` instead. Signed-off-by: Paul Barker --- classes/sdcard_image-rpi.bbclass | 5 +---- conf/machine/include/rpi-base.inc | 2 +- recipes-bsp/bootfiles/{bootfiles.bb => rpi-bootfiles.bb} | 0 3 files changed, 2 insertions(+), 5 deletions(-) rename recipes-bsp/bootfiles/{bootfiles.bb => rpi-bootfiles.bb} (100%) diff --git a/classes/sdcard_image-rpi.bbclass b/classes/sdcard_image-rpi.bbclass index ba50aa5..0ae98cd 100644 --- a/classes/sdcard_image-rpi.bbclass +++ b/classes/sdcard_image-rpi.bbclass @@ -25,9 +25,6 @@ inherit image_types # This image depends on the rootfs image IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}" -# Set kernel and boot loader -IMAGE_BOOTLOADER ?= "bootfiles" - # Kernel image name SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img" SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img" @@ -56,7 +53,7 @@ do_image_rpi_sdimg[depends] = " \ mtools-native:do_populate_sysroot \ dosfstools-native:do_populate_sysroot \ virtual/kernel:do_deploy \ - ${IMAGE_BOOTLOADER}:do_deploy \ + rpi-bootfiles:do_deploy \ ${@bb.utils.contains('MACHINE_FEATURES', 'armstub', 'armstubs:do_deploy', '' ,d)} \ ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot-default-script:do_deploy', '',d)} \ diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index d4a25a4..18368c6 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -123,7 +123,7 @@ IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \ '${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \ " do_image_wic[depends] += " \ - bootfiles:do_deploy \ + rpi-bootfiles:do_deploy \ ${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \ " diff --git a/recipes-bsp/bootfiles/bootfiles.bb b/recipes-bsp/bootfiles/rpi-bootfiles.bb similarity index 100% rename from recipes-bsp/bootfiles/bootfiles.bb rename to recipes-bsp/bootfiles/rpi-bootfiles.bb