mirror of
https://github.com/agherzan/meta-raspberrypi.git
synced 2025-12-06 06:19:11 +00:00
rpi-bootfiles: Rename recipe to avoid ambiguity
The name `bootfiles` is too generic, we should use `rpi-bootfiles` instead. Signed-off-by: Paul Barker <pbarker@konsulko.com>
This commit is contained in:
committed by
Andrei Gherzan
parent
b8440b3d26
commit
ba3a417fbb
@@ -25,9 +25,6 @@ inherit image_types
|
|||||||
# This image depends on the rootfs image
|
# This image depends on the rootfs image
|
||||||
IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"
|
IMAGE_TYPEDEP_rpi-sdimg = "${SDIMG_ROOTFS_TYPE}"
|
||||||
|
|
||||||
# Set kernel and boot loader
|
|
||||||
IMAGE_BOOTLOADER ?= "bootfiles"
|
|
||||||
|
|
||||||
# Kernel image name
|
# Kernel image name
|
||||||
SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img"
|
SDIMG_KERNELIMAGE_raspberrypi ?= "kernel.img"
|
||||||
SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
|
SDIMG_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
|
||||||
@@ -56,7 +53,7 @@ do_image_rpi_sdimg[depends] = " \
|
|||||||
mtools-native:do_populate_sysroot \
|
mtools-native:do_populate_sysroot \
|
||||||
dosfstools-native:do_populate_sysroot \
|
dosfstools-native:do_populate_sysroot \
|
||||||
virtual/kernel:do_deploy \
|
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('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:do_deploy', '',d)} \
|
||||||
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot-default-script:do_deploy', '',d)} \
|
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot-default-script:do_deploy', '',d)} \
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ IMAGE_BOOT_FILES ?= "${BOOTFILES_DIR_NAME}/* \
|
|||||||
'${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
|
'${KERNEL_IMAGETYPE};${SDIMG_KERNELIMAGE}', d)} \
|
||||||
"
|
"
|
||||||
do_image_wic[depends] += " \
|
do_image_wic[depends] += " \
|
||||||
bootfiles:do_deploy \
|
rpi-bootfiles:do_deploy \
|
||||||
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
|
${@bb.utils.contains('RPI_USE_U_BOOT', '1', 'u-boot:do_deploy', '',d)} \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user