Convert to new override syntax

This is the result of automated script (0.9.0) conversion:

oe-core/scripts/contrib/convert-overrides.py .

converting the metadata to use ":" as the override character instead of "_".

Signed-off-by: Martin Jansa <[email protected]>

Author: shr-project

meta-chromium/recipes-browser/chromium/chromium-gn.inc

@@ -26,7 +26,7 @@ SRC_URI += " \
     file://0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
 "
 
-SRC_URI_append_libc-musl = "\
+SRC_URI:append:libc-musl = "\
     file://musl/0001-mallinfo-implementation-is-glibc-specific.patch \
     file://musl/0002-execinfo-implementation-is-glibc-specific.patch \
     file://musl/0003-Define-TEMP_FAILURE_RETRY-and-__si_fields.patch \
@@ -87,21 +87,21 @@ DEPENDS += " \
 DEPEND_append_runtime-llvm = " compiler-rt-native libcxx-native"
 
 # The wrapper script we use from upstream requires bash.
-RDEPENDS_${PN} = "bash"
+RDEPENDS:${PN} = "bash"
 
 COMPATIBLE_MACHINE = "(-)"
-COMPATIBLE_MACHINE_aarch64 = "(.*)"
-COMPATIBLE_MACHINE_armv6 = "(.*)"
-COMPATIBLE_MACHINE_armv7a = "(.*)"
-COMPATIBLE_MACHINE_armv7ve = "(.*)"
-COMPATIBLE_MACHINE_x86 = "(.*)"
-COMPATIBLE_MACHINE_x86-64 = "(.*)"
+COMPATIBLE_MACHINE:aarch64 = "(.*)"
+COMPATIBLE_MACHINE:armv6 = "(.*)"
+COMPATIBLE_MACHINE:armv7a = "(.*)"
+COMPATIBLE_MACHINE:armv7ve = "(.*)"
+COMPATIBLE_MACHINE:x86 = "(.*)"
+COMPATIBLE_MACHINE:x86-64 = "(.*)"
 
 # Also build the parts that are run on the host with clang.
-BUILD_AR_toolchain-clang = "llvm-ar"
-BUILD_CC_toolchain-clang = "clang"
-BUILD_CXX_toolchain-clang = "clang++"
-BUILD_LD_toolchain-clang = "clang"
+BUILD_AR:toolchain-clang = "llvm-ar"
+BUILD_CC:toolchain-clang = "clang"
+BUILD_CXX:toolchain-clang = "clang++"
+BUILD_LD:toolchain-clang = "clang"
 
 PACKAGECONFIG ??= "use-egl"
 
@@ -180,25 +180,25 @@ GN_ARGS += "use_lld=true use_gold=false"
 #    instead, so that if DEBUG_BUILD is not set GN will not create a huge debug
 #    binary anyway. Since our compiler flags are passed after GN's, -g0 does
 #    not cause any issues if DEBUG_BUILD is set, as -g1 will be passed later.
-DEBUG_FLAGS_remove_arm = "-g"
-DEBUG_FLAGS_append_arm = "-g1"
-DEBUG_FLAGS_remove_x86 = "-g"
-DEBUG_FLAGS_append_x86 = "-g1"
+DEBUG_FLAGS:remove:arm = "-g"
+DEBUG_FLAGS:append:arm = "-g1"
+DEBUG_FLAGS:remove:x86 = "-g"
+DEBUG_FLAGS:append:x86 = "-g1"
 GN_ARGS += "symbol_level=0"
 
 # As of Chromium 62.0.3202.94 and Yocto Rocko (GCC 7, binutils 2.29), passing
 # -g to the compiler results in many linker errors on aarch64, such as:
 # obj/third_party/WebKit/Source/modules/payments/libpayments.a(PaymentEventDataConversion.o)(.debug_loc+0x4e25): error: relocation overflow in R_AARCH64_ABS32
-DEBUG_FLAGS_remove_aarch64 = "-g"
-DEBUG_FLAGS_append_aarch64 = "-g1"
+DEBUG_FLAGS:remove:aarch64 = "-g"
+DEBUG_FLAGS:append:aarch64 = "-g1"
 
 # As of Chromium 60.0.3112.101 and Yocto Pyro (GCC 6, binutils 2.28), passing
 # -g to the compiler results in many linker errors on x86_64, such as:
 # obj/third_party/WebKit/Source/core/loader/libloader.a(ModuleTreeLinker.o)(.debug_loc+0x1e9a5): error: relocation overflow: reference to local symbol 82 in obj/third_party/WebKit/Source/core/loader/libloader.a(ModuleTreeLinker.o)
 # obj/third_party/WebKit/Source/core/libcore_generated.a(ScriptModule.o)(.debug_loc+0x253c): error: relocation overflow: reference to local symbol 31 in obj/third_party/WebKit/Source/core/libcore_generated.a(ScriptModule.o)
 # so we have to use the same hack described above.
-DEBUG_FLAGS_remove_x86-64 = "-g"
-DEBUG_FLAGS_append_x86-64 = "-g1"
+DEBUG_FLAGS:remove:x86-64 = "-g"
+DEBUG_FLAGS:append:x86-64 = "-g1"
 
 # Disable Chrome Remote Desktop (aka Chromoting) support. Building host support
 # (so that the machine running this recipe can be controlled remotely from
@@ -277,7 +277,7 @@ GN_ARGS += ' \
 # If we do not pass |arm_arch| and friends to GN, it will deduce a value that
 # will then conflict with TUNE_CCARGS and CC.
 # Note that as of M61 in some corner cases parts of the build system disable
-# the "compiler_arm_fpu" GN config, whereas -mfpu is always passed via ${CC}.
+# the "compiler:arm_fpu" GN config, whereas -mfpu is always passed via ${CC}.
 # We might want to rework that if there are issues in the future.
 def get_compiler_flag(params, param_name, d):
     """Given a sequence of compiler arguments in |params|, returns the value of
@@ -290,33 +290,33 @@ def get_compiler_flag(params, param_name, d):
 ARM_FLOAT_ABI = "${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'hard', 'softfp', d)}"
 ARM_FPU = "${@get_compiler_flag(d.getVar('TUNE_CCARGS').split(), '-mfpu', d)}"
 ARM_TUNE = "${@get_compiler_flag(d.getVar('TUNE_CCARGS').split(), '-mcpu', d)}"
-ARM_VERSION_aarch64 = "8"
-ARM_VERSION_armv7a = "7"
-ARM_VERSION_armv7ve = "7"
-ARM_VERSION_armv6 = "6"
+ARM_VERSION:aarch64 = "8"
+ARM_VERSION:armv7a = "7"
+ARM_VERSION:armv7ve = "7"
+ARM_VERSION:armv6 = "6"
 
 # GN computes and defaults to it automatically where needed
 # forcing it from cmdline breaks build on places where it ends up
 # overriding what GN wants
-TUNE_CCARGS_remove = "-mthumb"
+TUNE_CCARGS:remove = "-mthumb"
 
-GN_ARGS_append_arm = ' \
+GN_ARGS:append:arm = ' \
         arm_float_abi="${ARM_FLOAT_ABI}" \
         arm_fpu="${ARM_FPU}" \
         arm_tune="${ARM_TUNE}" \
         arm_version=${ARM_VERSION} \
 '
 # tcmalloc's atomicops-internals-arm-v6plus.h uses the "dmb" instruction that
 # is not available on (some?) ARMv6 models, which causes the build to fail.
-GN_ARGS_append_armv6 += 'use_allocator="none"'
+GN_ARGS:append:armv6 += 'use_allocator="none"'
 # The WebRTC code fails to build on ARMv6 when NEON is enabled.
 # https://bugs.chromium.org/p/webrtc/issues/detail?id=6574
-GN_ARGS_append_armv6 += 'arm_use_neon=false'
+GN_ARGS:append:armv6 += 'arm_use_neon=false'
 
 # Disable glibc shims on musl
 # tcmalloc does not play well with musl as of M62 (and possibly earlier).
 # https://github.com/gperftools/gperftools/issues/693
-GN_ARGS_append_libc-musl = ' use_allocator_shim=false'
+GN_ARGS:append:libc-musl = ' use_allocator_shim=false'
 
 CHROMIUM_EXTRA_ARGS ?= " \
         ${@bb.utils.contains('PACKAGECONFIG', 'use-egl', '--use-gl=egl', '', d)} \
@@ -471,9 +471,9 @@ do_install() {
 
 PACKAGES =+ "${PN}-chromedriver"
 
-FILES_${PN}-chromedriver = "${bindir}/chromedriver"
+FILES:${PN}-chromedriver = "${bindir}/chromedriver"
 
-FILES_${PN} = " \
+FILES:${PN} = " \
         ${bindir}/chromium \
         ${datadir}/applications/chromium.desktop \
         ${datadir}/icons/hicolor/*x*/apps/chromium.png \
@@ -483,4 +483,4 @@ FILES_${PN} = " \
 PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
 
 # There is no need to ship empty -dev packages.
-ALLOW_EMPTY_${PN}-dev = "0"
+ALLOW_EMPTY:${PN}-dev = "0"

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_92.0.4515.107.bb

@@ -38,5 +38,5 @@ GN_ARGS += "\
 GN_ARGS += "use_x11=false"
 
 # The chromium binary must always be started with those arguments.
-CHROMIUM_EXTRA_ARGS_append = " --ozone-platform=wayland"
+CHROMIUM_EXTRA_ARGS:append = " --ozone-platform=wayland"
 

meta-chromium/recipes-browser/chromium/chromium.inc

@@ -14,9 +14,9 @@ S = "${WORKDIR}/chromium-${PV}"
 # guarantee that the generated code will work as expected.
 TOOLCHAIN = "clang"
 
-# By default, clang.bbclass sets TOOLCHAIN_class-native to "gcc", but we want
+# By default, clang.bbclass sets TOOLCHAIN:class-native to "gcc", but we want
 # to build the native recipes (e.g. GN) with clang too.
-TOOLCHAIN_class-native = "clang"
+TOOLCHAIN:class-native = "clang"
 
 # This makes the target build use libc++ and compiler_rt instead of the GNU
 # runtime, just like upstream does. The native binaries compiled and run as

meta-chromium/recipes-browser/chromium/gn-native_92.0.4515.107.bb

@@ -45,4 +45,4 @@ do_install() {
 	install -m 0755 ${S}/out/Release/gn ${D}${bindir}/gn
 }
 
-INSANE_SKIP_${PN} += "already-stripped"
+INSANE_SKIP:${PN} += "already-stripped"

meta-chromium/recipes-browser/chromium/gn-utils.inc

@@ -28,10 +28,10 @@ def gn_host_arch_name(d):
 # non-Python variables with overrides that are generic enough (i.e. "x86"
 # instead of "i586") and then use gn_target_arch_name() to return the right
 # value with some validation.
-GN_TARGET_ARCH_NAME_aarch64 = "arm64"
-GN_TARGET_ARCH_NAME_arm = "arm"
-GN_TARGET_ARCH_NAME_x86 = "x86"
-GN_TARGET_ARCH_NAME_x86-64 = "x64"
+GN_TARGET_ARCH_NAME:aarch64 = "arm64"
+GN_TARGET_ARCH_NAME:arm = "arm"
+GN_TARGET_ARCH_NAME:x86 = "x86"
+GN_TARGET_ARCH_NAME:x86-64 = "x64"
 
 def clang_install_path(d):
     """Return clang compiler install path."""

meta-firefox/classes/mozilla.bbclass

@@ -9,9 +9,9 @@ EXTRA_OECONF = "--target=${TARGET_SYS} --host=${BUILD_SYS} \
                 --with-toolchain-prefix=${TARGET_SYS}- \
                 --prefix=${prefix} \
                 --libdir=${libdir}"
-EXTRA_OECONF_append_arm = " --disable-elf-hack"
-EXTRA_OECONF_append_x86 = " --disable-elf-hack"
-EXTRA_OECONF_append_x86-64 = " --disable-elf-hack"
+EXTRA_OECONF:append:arm = " --disable-elf-hack"
+EXTRA_OECONF:append:x86 = " --disable-elf-hack"
+EXTRA_OECONF:append:x86-64 = " --disable-elf-hack"
 SELECTED_OPTIMIZATION = "-Os -fsigned-char -fno-strict-aliasing"
 
 export CROSS_COMPILE = "1"

meta-firefox/recipes-browser/firefox-l10n/firefox-l10n.inc

@@ -2,7 +2,7 @@
 # Released under the MIT license (see packages/COPYING)
 
 DEPENDS = "unzip-native"
-RDEPENDS_${PN} = "firefox"
+RDEPENDS:${PN} = "firefox"
 
 LICENSE = "MPLv2"
 
@@ -12,7 +12,7 @@ LANGUAGE = "${@get_language_name('${PN}')}"
 PR = "r3"
 
 # Mangle place where to store the file
-DL_DIR_append = "/${PN}-${PV}"
+DL_DIR:append = "/${PN}-${PV}"
 
 SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}/linux-x86_64/xpi/${LANGUAGE}.xpi"
 S = "${WORKDIR}"
@@ -45,4 +45,4 @@ do_install_xpi_pack() {
     install -D -m 0644 ${LANGUAGE}.xpi ${D}${libdir}/firefox/browser/extensions/${EXTENSION}.xpi
 }
 
-FILES_${PN} += "${libdir}/firefox"
+FILES:${PN} += "${libdir}/firefox"

meta-firefox/recipes-browser/firefox/firefox_68.9.0esr.bb

@@ -8,7 +8,7 @@ DEPENDS += "curl startup-notification libevent cairo libnotify \
             yasm-native nasm-native unzip-native \
             virtual/${TARGET_PREFIX}rust cargo-native ${RUSTLIB_DEP} \
            "
-RDEPENDS_${PN}-dev = "dbus"
+RDEPENDS:${PN}-dev = "dbus"
 
 LICENSE = "MPLv2"
 LIC_FILES_CHKSUM = "file://toolkit/content/license.html;endline=33;md5=35d7fa1c4b86c115051c925fd624a5be"
@@ -60,12 +60,12 @@ MOZ_APP_BASE_VERSION = "${@'${PV}'.replace('esr', '')}"
 
 inherit mozilla rust-common
 
-TOOLCHAIN_pn-firefox = "clang"
+TOOLCHAIN:pn-firefox = "clang"
 AS = "${CC}"
 
 DISABLE_STATIC=""
 
-ARM_INSTRUCTION_SET_armv5 = "arm"
+ARM_INSTRUCTION_SET:armv5 = "arm"
 
 PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "alsa", "alsa", "", d)} \
                    ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "wayland", "", d)} \
@@ -97,7 +97,7 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'forbit-multiple-compositors',
             file://fixes/0001-Enable-to-suppress-multiple-compositors.patch \
 	   ', '', d)}"
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${datadir}/applications
     install -d ${D}${datadir}/pixmaps
 
@@ -122,15 +122,15 @@ do_install_append() {
     chown root:root -R ${D}${libdir}
 }
 
-FILES_${PN} = "${bindir}/${PN} \
+FILES:${PN} = "${bindir}/${PN} \
                ${datadir}/applications/ \
                ${datadir}/pixmaps/ \
                ${libdir}/${PN}/* \
                ${libdir}/${PN}/.autoreg \
                ${bindir}/defaults"
-FILES_${PN}-dev += "${datadir}/idl ${bindir}/${PN}-config ${libdir}/${PN}-devel-*"
-FILES_${PN}-staticdev += "${libdir}/${PN}-devel-*/sdk/lib/*.a"
-FILES_${PN}-dbg += "${libdir}/${PN}/.debug \
+FILES:${PN}-dev += "${datadir}/idl ${bindir}/${PN}-config ${libdir}/${PN}-devel-*"
+FILES:${PN}-staticdev += "${libdir}/${PN}-devel-*/sdk/lib/*.a"
+FILES:${PN}-dbg += "${libdir}/${PN}/.debug \
                     ${libdir}/${PN}/*/.debug \
                     ${libdir}/${PN}/*/*/.debug \
                     ${libdir}/${PN}/*/*/*/.debug \