mirror of
https://git.yoctoproject.org/meta-arm
synced 2026-06-01 13:10:04 +00:00
meta-arm: Convert to new override syntax
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
# an alternate kernel (set via PREFERRED_PROVIDER_alternate/kernel).
|
||||
#
|
||||
# It is mandatory to also set the KERNEL_PACKAGE_NAME for the alternate kernel
|
||||
# recipe via KERNEL_PACKAGE_NAME_pn-${PREFERRED_PROVIDER_alternate/kernel} and
|
||||
# recipe via KERNEL_PACKAGE_NAME:pn-${PREFERRED_PROVIDER_alternate/kernel} and
|
||||
# its value needs to be different from "kernel" since this is the default set
|
||||
# for PREFERRED_PROVIDER_virtual/kernel.
|
||||
#
|
||||
@@ -16,11 +16,11 @@ PREFERRED_PROVIDER_alternate/kernel ??= ""
|
||||
python () {
|
||||
alternate_kernel = d.getVar('PREFERRED_PROVIDER_alternate/kernel')
|
||||
if alternate_kernel:
|
||||
alternate_kernel_pkg_name = d.getVar('KERNEL_PACKAGE_NAME_pn-%s' % alternate_kernel)
|
||||
alternate_kernel_pkg_name = d.getVar('KERNEL_PACKAGE_NAME:pn-%s' % alternate_kernel)
|
||||
if alternate_kernel_pkg_name:
|
||||
d.appendVar('EXTRA_IMAGEDEPENDS', ' ' + alternate_kernel)
|
||||
d.appendVar('IMAGE_INSTALL', ' kernel-modules')
|
||||
d.appendVar('IMAGE_INSTALL', ' ' + alternate_kernel_pkg_name + '-modules')
|
||||
else:
|
||||
raise bb.parse.SkipRecipe("No KERNEL_PACKAGE_NAME_pn-%s set" % alternate_kernel )
|
||||
raise bb.parse.SkipRecipe("No KERNEL_PACKAGE_NAME:pn-%s set" % alternate_kernel )
|
||||
}
|
||||
|
||||
@@ -71,7 +71,7 @@ inherit features_check
|
||||
|
||||
REQUIRED_DISTRO_FEATURES = "docker"
|
||||
|
||||
RDEPENDS_${PN} = "packagegroup-docker-runtime-minimal"
|
||||
RDEPENDS:${PN} = "packagegroup-docker-runtime-minimal"
|
||||
|
||||
CONTAINER_IMAGE_FILES ??= ""
|
||||
CONTAINERS_INSTALL_DIR ??= "${datadir}/docker/images"
|
||||
@@ -112,4 +112,4 @@ do_install() {
|
||||
|
||||
do_install[vardeps] += "CONTAINER_IMAGE_FILES"
|
||||
|
||||
FILES_${PN} += "${CONTAINERS_INSTALL_DIR}"
|
||||
FILES:${PN} += "${CONTAINERS_INSTALL_DIR}"
|
||||
|
||||
@@ -29,7 +29,7 @@ do_assemble_xenguest_initramfs() {
|
||||
}
|
||||
do_assemble_xenguest_initramfs[depends] += "${INITRAMFS_IMAGE}:do_merge_xenguestenv"
|
||||
|
||||
kernel_do_deploy_append() {
|
||||
kernel_do_deploy:append() {
|
||||
if [ -f "${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest" ]; then
|
||||
install -m 0644 ${B}/${KERNEL_OUTPUT_DIR}/Image-initramfs.xenguest "$deployDir/Image-${INITRAMFS_NAME}.xenguest"
|
||||
ln -snf Image-${INITRAMFS_NAME}.xenguest $deployDir/Image-${INITRAMFS_LINK_NAME}.xenguest
|
||||
|
||||
@@ -48,7 +48,7 @@ XENGUEST_IMAGE_VARS_EXTRA += "\
|
||||
XENGUEST_EXTRA_INIT_PRE XENGUEST_EXTRA_INIT XENGUEST_EXTRA_INIT_POST \
|
||||
XENGUEST_EXTRA_FILES XENGUEST_EXTRA_DISK_FILES"
|
||||
|
||||
do_deploy_append() {
|
||||
do_deploy:append() {
|
||||
if [ -z "${XENGUEST_IMAGE_DEPLOY_DIR}" -o \
|
||||
-z "${XENGUEST_IMAGE_DEPLOY_SUBDIR}" ]; then
|
||||
die "Configuration error: XENGUEST_IMAGE_DEPLOY_DIR or XENGUEST_IMAGE_DEPLOY_SUBDIR is empty"
|
||||
|
||||
Reference in New Issue
Block a user