From 9ea7aa2cd2cdc775425797b689e782718896ea50 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Jul 2021 19:58:04 +0200 Subject: Convert to new override syntax This is the result of automated script conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa --- conf/machine/include/rpi-base.inc | 2 +- conf/machine/include/rpi-default-settings.inc | 6 +++--- conf/machine/include/tune-arm1176jzf-s.inc | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'conf/machine/include') diff --git a/conf/machine/include/rpi-base.inc b/conf/machine/include/rpi-base.inc index 75c3727..a4db938 100644 --- a/conf/machine/include/rpi-base.inc +++ b/conf/machine/include/rpi-base.inc @@ -144,4 +144,4 @@ do_image_wic[recrdeps] = "do_build" # The kernel image is installed into the FAT32 boot partition and does not need # to also be installed into the rootfs. -RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" +RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" diff --git a/conf/machine/include/rpi-default-settings.inc b/conf/machine/include/rpi-default-settings.inc index bb18496..a89ddb1 100644 --- a/conf/machine/include/rpi-default-settings.inc +++ b/conf/machine/include/rpi-default-settings.inc @@ -3,7 +3,7 @@ IMAGE_CLASSES += "sdcard_image-rpi" # RPI kernel has errors of its own which should be filtered -# therefore use parselogs_rpi test instead of parselogs from oe-core +# therefore use parselogs:rpi test instead of parselogs from oe-core # -DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" -DEFAULT_TEST_SUITES_remove_rpi = " parselogs" +DEFAULT_TEST_SUITES:append:rpi = " parselogs:rpi" +DEFAULT_TEST_SUITES:remove:rpi = " parselogs" diff --git a/conf/machine/include/tune-arm1176jzf-s.inc b/conf/machine/include/tune-arm1176jzf-s.inc index b9e0377..ce5f08e 100644 --- a/conf/machine/include/tune-arm1176jzf-s.inc +++ b/conf/machine/include/tune-arm1176jzf-s.inc @@ -7,11 +7,11 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', ' -mcpu=arm MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}" AVAILTUNES += "arm1176jzfs" -ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs" -TUNE_FEATURES_tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" -PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1176jzfs" +ARMPKGARCH:tune-arm1176jzfs = "arm1176jzfs" +TUNE_FEATURES:tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" +PACKAGE_EXTRA_ARCHS:tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS:tune-armv6} arm1176jzfs" AVAILTUNES += "arm1176jzfshf" -ARMPKGARCH_tune-arm1176jzfshf = "${ARMPKGARCH_tune-arm1176jzfs}" -TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard" -PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} arm1176jzfshf-vfp" +ARMPKGARCH:tune-arm1176jzfshf = "${ARMPKGARCH:tune-arm1176jzfs}" +TUNE_FEATURES:tune-arm1176jzfshf = "${TUNE_FEATURES:tune-arm1176jzfs} callconvention-hard" +PACKAGE_EXTRA_ARCHS:tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS:tune-armv6thf} arm1176jzfshf-vfp" -- cgit v1.2.3-54-g00ecf