diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 19:58:04 +0200 |
|---|---|---|
| committer | Andrei Gherzan <andrei@gherzan.com> | 2021-08-04 12:30:12 +0300 |
| commit | 9ea7aa2cd2cdc775425797b689e782718896ea50 (patch) | |
| tree | 3831e2403262e27cd178a213b82c2ed8ad91e9a6 /conf/machine/include | |
| parent | 8dc3a310883ea87cd9900442f46f20bb08e57583 (diff) | |
| download | meta-raspberrypi-9ea7aa2cd2cdc775425797b689e782718896ea50.tar.gz | |
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 <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/rpi-base.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/rpi-default-settings.inc | 6 | ||||
| -rw-r--r-- | conf/machine/include/tune-arm1176jzf-s.inc | 12 |
3 files changed, 10 insertions, 10 deletions
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" | |||
| 144 | 144 | ||
| 145 | # The kernel image is installed into the FAT32 boot partition and does not need | 145 | # The kernel image is installed into the FAT32 boot partition and does not need |
| 146 | # to also be installed into the rootfs. | 146 | # to also be installed into the rootfs. |
| 147 | RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" | 147 | 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 @@ | |||
| 3 | IMAGE_CLASSES += "sdcard_image-rpi" | 3 | IMAGE_CLASSES += "sdcard_image-rpi" |
| 4 | 4 | ||
| 5 | # RPI kernel has errors of its own which should be filtered | 5 | # RPI kernel has errors of its own which should be filtered |
| 6 | # therefore use parselogs_rpi test instead of parselogs from oe-core | 6 | # therefore use parselogs:rpi test instead of parselogs from oe-core |
| 7 | # | 7 | # |
| 8 | DEFAULT_TEST_SUITES_append_rpi = " parselogs_rpi" | 8 | DEFAULT_TEST_SUITES:append:rpi = " parselogs:rpi" |
| 9 | DEFAULT_TEST_SUITES_remove_rpi = " parselogs" | 9 | 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 | |||
| 7 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}" | 7 | MACHINEOVERRIDES =. "${@bb.utils.contains('TUNE_FEATURES', 'arm1176jzfs', 'armv6:', '', d)}" |
| 8 | 8 | ||
| 9 | AVAILTUNES += "arm1176jzfs" | 9 | AVAILTUNES += "arm1176jzfs" |
| 10 | ARMPKGARCH_tune-arm1176jzfs = "arm1176jzfs" | 10 | ARMPKGARCH:tune-arm1176jzfs = "arm1176jzfs" |
| 11 | TUNE_FEATURES_tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" | 11 | TUNE_FEATURES:tune-arm1176jzfs = "arm thumb vfp arm1176jzfs" |
| 12 | PACKAGE_EXTRA_ARCHS_tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS_tune-armv6} arm1176jzfs" | 12 | PACKAGE_EXTRA_ARCHS:tune-arm1176jzfs = "${PACKAGE_EXTRA_ARCHS:tune-armv6} arm1176jzfs" |
| 13 | 13 | ||
| 14 | AVAILTUNES += "arm1176jzfshf" | 14 | AVAILTUNES += "arm1176jzfshf" |
| 15 | ARMPKGARCH_tune-arm1176jzfshf = "${ARMPKGARCH_tune-arm1176jzfs}" | 15 | ARMPKGARCH:tune-arm1176jzfshf = "${ARMPKGARCH:tune-arm1176jzfs}" |
| 16 | TUNE_FEATURES_tune-arm1176jzfshf = "${TUNE_FEATURES_tune-arm1176jzfs} callconvention-hard" | 16 | TUNE_FEATURES:tune-arm1176jzfshf = "${TUNE_FEATURES:tune-arm1176jzfs} callconvention-hard" |
| 17 | PACKAGE_EXTRA_ARCHS_tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS_tune-armv6thf} arm1176jzfshf-vfp" | 17 | PACKAGE_EXTRA_ARCHS:tune-arm1176jzfshf = "${PACKAGE_EXTRA_ARCHS:tune-armv6thf} arm1176jzfshf-vfp" |
