layer: Convert to new override syntax
PATCH 1/2 layer: Convert to new override syntax
--- classes/rockchip-gpt-img.bbclass | 2 +- conf/machine/include/rockchip-wic.inc | 2 +- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 6 +++--- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 8 ++++---- recipes-bsp/u-boot/u-boot%.bbappend | 6 +++--- recipes-graphics/mesa/mesa_%.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto%.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto_5.4.bbappend | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-)
classes/rockchip-gpt-img.bbclass +1 -1
@@ -40,7 +40,7 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \ PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" PER_CHIP_IMG_GENERATION_COMMAND_rock2-square = "generate_rock2_loader1_image" -IMAGE_CMD_rockchip-gpt-img () { +IMAGE_CMD:rockchip-gpt-img () { # Change to image directory cd ${DEPLOY_DIR_IMAGE}
conf/machine/include/rockchip-wic.inc +1 -1
@@ -23,7 +23,7 @@ RK_CONSOLE_DEVICE ?= "${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}" # boot device (sd-card/emmc) RK_BOOT_DEVICE ??= "mmcblk0" -WICVARS_append = " \ +WICVARS:append = " \ RK_BOOT_DEVICE \ RK_CONSOLE_BAUD \ RK_CONSOLE_DEVICE \
dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +3 -3
@@ -1,9 +1,9 @@ PACKAGECONFIG_GL_rk3399 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append_rk3399 = " kms gbm" +PACKAGECONFIG_GL:append_rk3399 = " kms gbm" PACKAGECONFIG_FONTS_rk3399 = "fontconfig" -PACKAGECONFIG_append_rk3399 = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove_rk3399 = "tests" +PACKAGECONFIG:append_rk3399 = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove_rk3399 = "tests"
recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +4 -4
@@ -1,11 +1,11 @@ # Rockchip RK3399 compiles some M0 firmware which requires an arm-none-eabi GCC # toolchain -DEPENDS_append_rk3399 = " virtual/arm-none-eabi-gcc-native" +DEPENDS:append_rk3399 = " virtual/arm-none-eabi-gcc-native" -COMPATIBLE_MACHINE_append_rk3399 = "|rk3399" -COMPATIBLE_MACHINE_append_rk3328 = "|rk3328" +COMPATIBLE_MACHINE:append_rk3399 = "|rk3399" +COMPATIBLE_MACHINE:append_rk3328 = "|rk3328" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ file://serial-console-baudrate.patch \ file://0001-Fix-build-with-gcc-11.patch \
recipes-bsp/u-boot/u-boot%.bbappend +3 -3
@@ -1,4 +1,4 @@ -do_compile_append_rock2-square () { +do_compile:append_rock2-square () { # copy to default search path if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then cp ${B}/spl/${SPL_BINARY} ${B}
@@ -7,9 +7,9 @@ do_compile_append_rock2-square () { ATF_DEPENDS ??= "" -EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" +EXTRA_OEMAKE:append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" ATF_DEPENDS_rk3399 = " virtual/trusted-firmware-a:do_deploy" -EXTRA_OEMAKE_append_rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" +EXTRA_OEMAKE:append_rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" ATF_DEPENDS_rk3328 = " virtual/trusted-firmware-a:do_deploy" do_compile[depends] .= "${ATF_DEPENDS}"
recipes-graphics/mesa/mesa_%.bbappend +2 -2
@@ -1,2 +1,2 @@ -PACKAGECONFIG_append_rk3288 = " kmsro panfrost" -PACKAGECONFIG_append_rk3399 = " kmsro panfrost" +PACKAGECONFIG:append_rk3288 = " kmsro panfrost" +PACKAGECONFIG:append_rk3399 = " kmsro panfrost"
recipes-kernel/linux/linux-yocto%.bbappend +2 -2
@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb" COMPATIBLE_MACHINE_rock64 = "rock64" COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # indeed applicable to all rk3328 boards -SRC_URI_append_rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch" +SRC_URI:append_rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch"
recipes-kernel/linux/linux-yocto_5.4.bbappend +2 -2
@@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # tinker-board and tinker-board-s. rk3288 covers both -SRC_URI_append_rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch" +SRC_URI:append_rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch"
Signature · 1 line
2.32.0
PATCH 2/2 layer.conf: Drop compatibility with older than hardknott releases
New override syntax requires it
--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
conf/layer.conf +1 -1
@@ -14,7 +14,7 @@ BBFILE_PRIORITY_rockchip = "1" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_rockchip = "1" -LAYERSERIES_COMPAT_rockchip = "hardknott" +LAYERSERIES_COMPAT_rockchip = "honister" LAYERDEPENDS_rockchip = "core meta-arm" BBFILES_DYNAMIC += " \
Signature · 1 line
2.32.0
Re: [yocto] [meta-rockchip][PATCH 2/2] layer.conf: Drop compatibility with older than hardknott releases
I don't use meta-rockchip, but new syntax doesn't require honister, recent revisions of 1.50 bitbake are forward compatible with the new syntax.
Quoted 27 lines · Khem Raj
New override syntax requires it
Signed-off-by Khem Raj <[email protected]>--- conf/layer.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)conf/layer.conf +1
-2@@ -14,7 +14,7 @@ BBFILE_PRIORITY_rockchip = "1" # This should only be incremented on significant changes that will # cause compatibility issues with other layers LAYERVERSION_rockchip = "1" -LAYERSERIES_COMPAT_rockchip = "hardknott" +LAYERSERIES_COMPAT_rockchip = "honister" LAYERDEPENDS_rockchip = "core meta-arm" BBFILES_DYNAMIC += " \ --2.32.0
"_rk3399" also needs to be replaced.
Quoted 157 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- classes/rockchip-gpt-img.bbclass | 2 +- conf/machine/include/rockchip-wic.inc | 2 +- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 6 +++--- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 8 ++++---- recipes-bsp/u-boot/u-boot%.bbappend | 6 +++--- recipes-graphics/mesa/mesa_%.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto%.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto_5.4.bbappend | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-)classes/rockchip-gpt-img.bbclass +0
-0@@ -40,7 +40,7 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \ PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" PER_CHIP_IMG_GENERATION_COMMAND_rock2-square ="
generate_rock2_loader1_image"classes/rockchip-gpt-img.bbclass +1
-1-IMAGE_CMD_rockchip-gpt-img () { +IMAGE_CMD:rockchip-gpt-img () { # Change to image directory cd ${DEPLOY_DIR_IMAGE}conf/machine/include/rockchip-wic.inc +0
-0@@ -23,7 +23,7 @@ RK_CONSOLE_DEVICE ?="${@d.getVar('SERIAL_CONSOLES').split(';')[1].split()[0]}"
# boot device (sd-card/emmc) RK_BOOT_DEVICE ??= "mmcblk0"conf/machine/include/rockchip-wic.inc +1
-1-WICVARS_append = " \ +WICVARS:append = " \ RK_BOOT_DEVICE \ RK_CONSOLE_BAUD \ RK_CONSOLE_DEVICE \dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +3
-3@@ -1,9 +1,9 @@ PACKAGECONFIG_GL_rk3399 = "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'gl', \ bb.utils.contains('DISTRO_FEATURES', 'opengl', 'eglfs gles2', \ '', d), d)}" -PACKAGECONFIG_GL_append_rk3399 = " kms gbm" +PACKAGECONFIG_GL:append_rk3399 = " kms gbm" PACKAGECONFIG_FONTS_rk3399 = "fontconfig" -PACKAGECONFIG_append_rk3399 = " libinput examples tslib xkbcommon" -PACKAGECONFIG_remove_rk3399 = "tests" +PACKAGECONFIG:append_rk3399 = " libinput examples tslib xkbcommon" +PACKAGECONFIG:remove_rk3399 = "tests"recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +0
-0@@ -1,11 +1,11 @@ # Rockchip RK3399 compiles some M0 firmware which requires anarm-none-eabi GCC
# toolchainrecipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend +4
-4-DEPENDS_append_rk3399 = " virtual/arm-none-eabi-gcc-native" +DEPENDS:append_rk3399 = " virtual/arm-none-eabi-gcc-native" -COMPATIBLE_MACHINE_append_rk3399 = "|rk3399" -COMPATIBLE_MACHINE_append_rk3328 = "|rk3328" +COMPATIBLE_MACHINE:append_rk3399 = "|rk3399" +COMPATIBLE_MACHINE:append_rk3328 = "|rk3328" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "\ file://serial-console-baudrate.patch \ file://0001-Fix-build-with-gcc-11.patch \recipes-bsp/u-boot/u-boot%.bbappend +3
-3@@ -1,4 +1,4 @@ -do_compile_append_rock2-square () { +do_compile:append_rock2-square () { # copy to default search path if [ "${SPL_BINARY}" = "u-boot-spl-dtb.bin" ]; then cp ${B}/spl/${SPL_BINARY} ${B}@@ -7,9 +7,9 @@ do_compile_append_rock2-square () { ATF_DEPENDS ??= "" -EXTRA_OEMAKE_append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" +EXTRA_OEMAKE:append_rk3399 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3399.elf" ATF_DEPENDS_rk3399 = " virtual/trusted-firmware-a:do_deploy" -EXTRA_OEMAKE_append_rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" +EXTRA_OEMAKE:append_rk3328 = " BL31=${DEPLOY_DIR_IMAGE}/bl31-rk3328.elf" ATF_DEPENDS_rk3328 = " virtual/trusted-firmware-a:do_deploy" do_compile[depends] .= "${ATF_DEPENDS}"recipes-graphics/mesa/mesa_%.bbappend +2
-2@@ -1,2 +1,2 @@ -PACKAGECONFIG_append_rk3288 = " kmsro panfrost" -PACKAGECONFIG_append_rk3399 = " kmsro panfrost" +PACKAGECONFIG:append_rk3288 = " kmsro panfrost" +PACKAGECONFIG:append_rk3399 = " kmsro panfrost"recipes-kernel/linux/linux-yocto%.bbappend +1
-2@@ -11,7 +11,7 @@ COMPATIBLE_MACHINE_nanopi-m4-2gb = "nanopi-m4-2gb" COMPATIBLE_MACHINE_rock64 = "rock64" COMPATIBLE_MACHINE_rock-pi-e = "rock-pi-e" -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" # indeed applicable to all rk3328 boards -SRC_URI_append_rock64 = "file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch" +SRC_URI:append_rock64 = " file://0001-ayufan-dtsi-rk3328-add-mmc0-mmc1-aliases.patch"
recipes-kernel/linux/linux-yocto_5.4.bbappend +1
-2@@ -1,5 +1,5 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" # tinker-board and tinker-board-s. rk3288 covers both -SRC_URI_append_rk3288 = "file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch" +SRC_URI:append_rk3288 = " file://0001-ARM-dts-rockchip-Keep-rk3288-tinker-SD-card-IO-power.patch"
--
2.32.0
classes/rockchip-gpt-img.bbclass do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \
Quoted 17 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- classes/rockchip-gpt-img.bbclass | 2 +- conf/machine/include/rockchip-wic.inc | 2 +- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 6 +++--- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 8 ++++---- recipes-bsp/u-boot/u-boot%.bbappend | 6 +++--- recipes-graphics/mesa/mesa_%.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto%.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto_5.4.bbappend | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-)classes/rockchip-gpt-img.bbclass +0
-0@@ -40,7 +40,7 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \
The following two need changes too, don't they?
classes/rockchip-gpt-img.bbclass do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \ · line 41
Quoted 2 lines
classes/rockchip-gpt-img.bbclass +0
-0PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" PER_CHIP_IMG_GENERATION_COMMAND_rock2-square = "generate_rock2_loader1_image"
There seem to be a few that were missed. I'm working on a patch as well. I'm just testing the images on some of the targets now.
Quoted 22 lines · Trevor Woerner
classes/rockchip-gpt-img.bbclass do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \
Quoted 17 lines · Khem Raj
Signed-off-by Khem Raj <[email protected]>--- classes/rockchip-gpt-img.bbclass | 2 +- conf/machine/include/rockchip-wic.inc | 2 +- dynamic-layers/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 6 +++--- .../trusted-firmware-a/trusted-firmware-a_%.bbappend | 8 ++++---- recipes-bsp/u-boot/u-boot%.bbappend | 6 +++--- recipes-graphics/mesa/mesa_%.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto%.bbappend | 4 ++-- recipes-kernel/linux/linux-yocto_5.4.bbappend | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-)classes/rockchip-gpt-img.bbclass +0
-0@@ -40,7 +40,7 @@ do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \The following two need changes too, don't they?
Quoted 5 lines
classes/rockchip-gpt-img.bbclass do_image_rockchip_gpt_img[depends] = "parted-native:do_populate_sysroot \ · line 41
Quoted 2 lines
classes/rockchip-gpt-img.bbclass +0
-0PER_CHIP_IMG_GENERATION_COMMAND_rk3288 = "generate_rk3288_loader1_image" PER_CHIP_IMG_GENERATION_COMMAND_rock2-square = "generate_rock2_loader1_image"There seem to be a few that were missed. I'm working on a patch as well. I'm just testing the images on some of the targets now.
please use v2