From c61dc077bbd81260e4f167fa2251643ba0ba6974 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 29 Jul 2021 17:04:53 +0200 Subject: Convert to new override syntax This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa --- .../packagegroups/packagegroup-meta-oe.bbappend | 2 +- .../openbox/openbox-xdgmenu_0.3.bb | 2 +- .../speedtest-cli/speedtest-cli_2.1.3.bb | 2 +- .../recipes-connectivity/lirc/lirc_0.10.1.bb | 54 +++++++++++----------- .../thingsboard-gateway_2.5.2.bb | 8 ++-- .../packagegroups/packagegroup-meta-oe.bbappend | 10 ++-- .../meta-python/recipes-dbs/mongodb/mongodb_git.bb | 24 +++++----- .../recipes-devtools/nanopb/nanopb_0.4.5.bb | 8 ++-- .../recipes-extended/lcdproc/lcdproc_git.bb | 34 +++++++------- .../recipes-extended/mozjs/mozjs_60.9.0.bb | 34 +++++++------- .../meta-python/recipes-support/smem/smem_1.5.bb | 6 +-- .../packagegroups/packagegroup-meta-oe.bbappend | 6 +-- .../recipes-devtools/valijson/valijson_0.4.bb | 2 +- .../packagegroups/packagegroup-meta-oe.bbappend | 2 +- .../recipes-support/debsums/debsums_2.2.2.bb | 8 ++-- .../recipes-support/rasdaemon/rasdaemon_0.6.7.bb | 18 ++++---- 16 files changed, 110 insertions(+), 110 deletions(-) (limited to 'meta-oe/dynamic-layers') diff --git a/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index dcd88841f9..f15b36184d 100644 --- a/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-oe/dynamic-layers/gnome-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1,3 +1,3 @@ -RDEPENDS_packagegroup-meta-oe-graphics +="\ +RDEPENDS:packagegroup-meta-oe-graphics +="\ openbox-xdgmenu \ " diff --git a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb index 237154e295..93ef228efe 100644 --- a/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb +++ b/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb @@ -33,4 +33,4 @@ do_install() { install -m 0755 openbox-xdgmenu ${D}${bindir} } -RDEPENDS_${PN} += "virtual/x-terminal-emulator" +RDEPENDS:${PN} += "virtual/x-terminal-emulator" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb b/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb index 949b45ba8e..004c04e007 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-benchmark/speedtest-cli/speedtest-cli_2.1.3.bb @@ -11,4 +11,4 @@ SRCREV = "42e96b13dda2afabbcec2622612d13495a415caa" S = "${WORKDIR}/git" -RDEPENDS_${PN} = "python3 python3-setuptools-scm" +RDEPENDS:${PN} = "python3 python3-setuptools-scm" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb index b68303241e..d8cf9b9f54 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/lirc/lirc_0.10.1.bb @@ -1,8 +1,8 @@ DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red signals of many commonly used remote controls." -DESCRIPTION_append_lirc = " This package contains the lirc daemon, libraries and tools." -DESCRIPTION_append_lirc-exec = " This package contains a daemon that runs programs on IR signals." -DESCRIPTION_append_lirc-remotes = " This package contains some config files for remotes." -DESCRIPTION_append_lirc-nslu2example = " This package contains a working config for RC5 remotes and a modified NSLU2." +DESCRIPTION:append_lirc = " This package contains the lirc daemon, libraries and tools." +DESCRIPTION:append_lirc-exec = " This package contains a daemon that runs programs on IR signals." +DESCRIPTION:append_lirc-remotes = " This package contains some config files for remotes." +DESCRIPTION:append_lirc-nslu2example = " This package contains a working config for RC5 remotes and a modified NSLU2." HOMEPAGE = "http://www.lirc.org" SECTION = "console/network" LICENSE = "GPLv2" @@ -24,10 +24,10 @@ SRC_URI[md5sum] = "86c3f8e4efaba10571addb8313d1e040" SRC_URI[sha256sum] = "8b753c60df2a7f5dcda2db72c38e448ca300c3b4f6000c1501fcb0bd5df414f2" SYSTEMD_PACKAGES = "lirc lirc-exec" -SYSTEMD_SERVICE_${PN} = "lircd.service lircmd.service lircd-setup.service lircd-uinput.service" -SYSTEMD_SERVICE_${PN}-exec = "irexec.service" -SYSTEMD_AUTO_ENABLE_lirc = "enable" -SYSTEMD_AUTO_ENABLE_lirc-exec = "enable" +SYSTEMD_SERVICE:${PN} = "lircd.service lircmd.service lircd-setup.service lircd-uinput.service" +SYSTEMD_SERVICE:${PN}-exec = "irexec.service" +SYSTEMD_AUTO_ENABLE:lirc = "enable" +SYSTEMD_AUTO_ENABLE:lirc-exec = "enable" inherit autotools pkgconfig systemd python3native distutils-common-base @@ -43,12 +43,12 @@ CACHED_CONFIGUREVARS = "HAVE_WORKING_POLL=yes" #EXTRA_OEMAKE = 'SUBDIRS="lib daemons tools"' # Ensure python-pkg/VERSION exists -do_configure_append() { +do_configure:append() { cp ${S}/VERSION ${S}/python-pkg/ } # Create PYTHON_TARBALL which LIRC needs for install-nodist_pkgdataDATA -do_install_prepend() { +do_install:prepend() { rm -rf ${WORKDIR}/${PN}-${PV}/python-pkg/dist/ mkdir ${WORKDIR}/${PN}-${PV}/python-pkg/dist/ tar --exclude='${WORKDIR}/${PN}-${PV}/python-pkg/*' -czf ${WORKDIR}/${PN}-${PV}/python-pkg/dist/${PN}-${PV}.tar.gz ${S} @@ -57,7 +57,7 @@ do_install_prepend() { # In code, path to python is a variable that is replaced with path to native version of it # during the configure stage, e.g ../recipe-sysroot-native/usr/bin/python3-native/python3. # Replace it with #!/usr/bin/env python3 -do_install_append() { +do_install:append() { sed -i '1c#!/usr/bin/env python3' ${D}${bindir}/lirc-setup \ ${D}${PYTHON_SITEPACKAGES_DIR}/lirc-setup/lirc-setup \ ${D}${bindir}/irtext2udp \ @@ -82,28 +82,28 @@ do_install_append() { PACKAGES =+ "${PN}-contrib ${PN}-exec ${PN}-plugins ${PN}-python" -RDEPENDS_${PN} = "bash python3" -RDEPENDS_${PN}-exec = "${PN}" -RDEPENDS_${PN}-python = "python3-shell python3-pyyaml python3-datetime python3-netclient python3-stringold" +RDEPENDS:${PN} = "bash python3" +RDEPENDS:${PN}-exec = "${PN}" +RDEPENDS:${PN}-python = "python3-shell python3-pyyaml python3-datetime python3-netclient python3-stringold" -RRECOMMENDS_${PN} = "${PN}-exec ${PN}-plugins" +RRECOMMENDS:${PN} = "${PN}-exec ${PN}-plugins" -FILES_${PN}-plugins = "${libdir}/lirc/plugins/*.so ${datadir}/lirc/configs" -FILES_${PN}-contrib = "${datadir}/lirc/contrib" -FILES_${PN}-exec = "${bindir}/irexec ${sysconfdir}/lircexec ${systemd_unitdir}/system/irexec.service" -FILES_${PN} += "${systemd_unitdir}/system/lircexec.init" -FILES_${PN} += "${systemd_unitdir}/system/lircd.service" -FILES_${PN} += "${systemd_unitdir}/system/lircd.socket" -FILES_${PN} += "${libdir}/tmpfiles.d/lirc.conf" -FILES_${PN}-dbg += "${libdir}/lirc/plugins/.debug" -FILES_${PN}-python += "${bindir}/irdb-get ${bindir}/irtext2udp ${bindir}/lircd-setup ${bindir}/pronto2lirc ${libdir}/python*/site-packages" +FILES:${PN}-plugins = "${libdir}/lirc/plugins/*.so ${datadir}/lirc/configs" +FILES:${PN}-contrib = "${datadir}/lirc/contrib" +FILES:${PN}-exec = "${bindir}/irexec ${sysconfdir}/lircexec ${systemd_unitdir}/system/irexec.service" +FILES:${PN} += "${systemd_unitdir}/system/lircexec.init" +FILES:${PN} += "${systemd_unitdir}/system/lircd.service" +FILES:${PN} += "${systemd_unitdir}/system/lircd.socket" +FILES:${PN} += "${libdir}/tmpfiles.d/lirc.conf" +FILES:${PN}-dbg += "${libdir}/lirc/plugins/.debug" +FILES:${PN}-python += "${bindir}/irdb-get ${bindir}/irtext2udp ${bindir}/lircd-setup ${bindir}/pronto2lirc ${libdir}/python*/site-packages" INITSCRIPT_PACKAGES = "lirc lirc-exec" -INITSCRIPT_NAME_lirc-exec = "lircexec" -INITSCRIPT_PARAMS_lirc-exec = "defaults 21" +INITSCRIPT_NAME:lirc-exec = "lircexec" +INITSCRIPT_PARAMS:lirc-exec = "defaults 21" # this is for distributions that don't use udev -pkg_postinst_${PN}_append() { +pkg_postinst:${PN}:append() { if [ ! -c $D/dev/lirc -a ! -f /sbin/udevd ]; then mknod $D/dev/lirc c 61 0; fi } diff --git a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb index 2f0ef16c80..3c89c377a7 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_2.5.2.bb @@ -14,7 +14,7 @@ inherit pypi setuptools3 PYPI_PACKAGE = "thingsboard-gateway" -RDEPENDS_${PN} += " python3-jsonpath-rw \ +RDEPENDS:${PN} += " python3-jsonpath-rw \ python3-regex \ python3-paho-mqtt \ python3-pyyaml \ @@ -45,14 +45,14 @@ SRC_URI += "file://bacnet.json \ inherit systemd SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "thingsboard-gateway.service" +SYSTEMD_SERVICE:${PN} = "thingsboard-gateway.service" -FILES_${PN} += "/etc \ +FILES:${PN} += "/etc \ /lib \ /usr \ " -do_install_append(){ +do_install:append(){ install -d ${D}${sysconfdir}/thingsboard-gateway/config diff --git a/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 50da5e5d0d..09f3e34f4c 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-oe/dynamic-layers/meta-python/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1,20 +1,20 @@ -RDEPENDS_packagegroup-meta-oe-devtools += "\ +RDEPENDS:packagegroup-meta-oe-devtools += "\ python3-distutils-extra \ rwmem \ speedtest-cli \ mongodb \ " -RDEPENDS_packagegroup-meta-oe-connectivity += "\ +RDEPENDS:packagegroup-meta-oe-connectivity += "\ lirc \ " -RDEPENDS_packagegroup-meta-oe-extended += "\ +RDEPENDS:packagegroup-meta-oe-extended += "\ lcdproc \ mozjs \ " -RDEPENDS_packagegroup-meta-oe-support += "\ +RDEPENDS:packagegroup-meta-oe-support += "\ smem \ " -RDEPENDS_packagegroup-meta-oe-extended_remove_libc-musl = "lcdproc" +RDEPENDS:packagegroup-meta-oe-extended:remove:libc-musl = "lcdproc" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb index 9d461078ae..eff014a4cb 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-dbs/mongodb/mongodb_git.bb @@ -33,13 +33,13 @@ SRC_URI = "git://github.com/mongodb/mongo.git;branch=v4.4 \ file://0001-Use-explicit-typecast-to-size_t.patch \ file://PTHREAD_STACK_MIN.patch \ " -SRC_URI_append_libc-musl ="\ +SRC_URI:append:libc-musl ="\ file://0001-Mark-one-of-strerror_r-implementation-glibc-specific.patch \ file://0002-Fix-default-stack-size-to-256K.patch \ file://0004-wiredtiger-Disable-strtouq-on-musl.patch \ " -SRC_URI_append_toolchain-clang = "\ +SRC_URI:append:toolchain-clang = "\ file://0001-asio-Dont-use-experimental-with-clang.patch \ " @@ -51,20 +51,20 @@ COMPATIBLE_HOST ?= '(x86_64|i.86|powerpc64|arm|aarch64).*-linux' PACKAGECONFIG ??= "tcmalloc system-pcre" # gperftools compilation fails for arm below v7 because of missing support of # dmb operation. So we use system-allocator instead of tcmalloc -PACKAGECONFIG_remove_armv6 = "tcmalloc" -PACKAGECONFIG_remove_libc-musl = "tcmalloc" -PACKAGECONFIG_remove_riscv64 = "tcmalloc" -PACKAGECONFIG_remove_riscv32 = "tcmalloc" +PACKAGECONFIG:remove:armv6 = "tcmalloc" +PACKAGECONFIG:remove:libc-musl = "tcmalloc" +PACKAGECONFIG:remove:riscv64 = "tcmalloc" +PACKAGECONFIG:remove:riscv32 = "tcmalloc" PACKAGECONFIG[tcmalloc] = "--use-system-tcmalloc,--allocator=system,gperftools," PACKAGECONFIG[shell] = ",--js-engine=none,," PACKAGECONFIG[system-pcre] = "--use-system-pcre,,libpcre," MONGO_ARCH ?= "${HOST_ARCH}" -MONGO_ARCH_powerpc64le = "ppc64le" +MONGO_ARCH:powerpc64le = "ppc64le" WIREDTIGER ?= "off" -WIREDTIGER_x86-64 = "on" -WIREDTIGER_aarch64 = "on" +WIREDTIGER:x86-64 = "on" +WIREDTIGER:aarch64 = "on" EXTRA_OESCONS = "PREFIX=${prefix} \ DESTDIR=${D} \ @@ -85,7 +85,7 @@ EXTRA_OESCONS = "PREFIX=${prefix} \ USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}" +USERADD_PARAM:${PN} = "--system --no-create-home --home-dir /var/run/${BPN} --shell /bin/false --user-group ${BPN}" scons_do_compile() { @@ -123,6 +123,6 @@ scons_do_install() { chown ${PN}:${PN} ${D}${localstatedir}/log/${BPN} } -CONFFILES_${PN} = "${sysconfdir}/mongod.conf" +CONFFILES:${PN} = "${sysconfdir}/mongod.conf" -SYSTEMD_SERVICE_${PN} = "mongod.service" +SYSTEMD_SERVICE:${PN} = "mongod.service" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb index b2f8db9c0c..6ccefd22e5 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-devtools/nanopb/nanopb_0.4.5.bb @@ -11,16 +11,16 @@ S = "${WORKDIR}/git" inherit cmake python3native -do_install_append() { +do_install:append() { install -Dm 0755 ${S}/generator/nanopb_generator.py ${D}${bindir}/nanopb_generator.py install -Dm 0755 ${S}/generator/protoc-gen-nanopb ${D}${bindir}/protoc-gen-nanopb install -Dm 0755 ${S}/generator/proto/__init__.py ${D}${PYTHON_SITEPACKAGES_DIR}/proto/__init__.py } -FILES_${PN} += "${PYTHON_SITEPACKAGES_DIR}" -FILES_${PN}-dev += "${libdir}/cmake/${BPN}" +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" +FILES:${PN}-dev += "${libdir}/cmake/${BPN}" -RDEPENDS_${PN} += "\ +RDEPENDS:${PN} += "\ ${PYTHON_PN}-protobuf \ protobuf-compiler \ " diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb index 35585d0690..4442793097 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/lcdproc/lcdproc_git.bb @@ -24,9 +24,9 @@ inherit autotools pkgconfig update-rc.d LCD_DRIVERS ?= "all,!irman,!svga${SERIALVFD}" SERIALVFD ?= "" -SERIALVFD_libc-musl = ",!serialVFD" -SERIALVFD_libc-musl_x86 = "" -SERIALVFD_libc-musl_x86-64 = "" +SERIALVFD:libc-musl = ",!serialVFD" +SERIALVFD:libc-musl:x86 = "" +SERIALVFD:libc-musl:x86-64 = "" LCD_DEFAULT_DRIVER ?= "curses" @@ -37,7 +37,7 @@ PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid" PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" -LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" +LCD_DRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" EXTRA_OECONF = "--enable-drivers='${LCD_DRIVERS}'" @@ -74,31 +74,31 @@ do_install () { PACKAGES =+ "lcdd lcdvc" -RRECOMMENDS_${PN} = "lcdd" +RRECOMMENDS:${PN} = "lcdd" -FILES_lcdd = "${sysconfdir}/LCDd.conf \ +FILES:lcdd = "${sysconfdir}/LCDd.conf \ ${sbindir}/LCDd \ ${sysconfdir}/init.d/lcdd" -CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" -CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf" -CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf" -FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc" +CONFFILES:lcdd = "${sysconfdir}/LCDd.conf" +CONFFILES:${PN} = "${sysconfdir}/lcdproc.conf" +CONFFILES:lcdvc = "${sysconfdir}/lcdvc.conf" +FILES:lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc" # Driver packages # USB / no USB trickery -RCONFLICTS_lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" -RCONFLICTS_lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" +RCONFLICTS:lcdd-driver-hd47780nousb = "lcdd-driver-hd44780" +RCONFLICTS:lcdd-driver-hd47780 = "lcdd-driver-hd44780nousb" INITSCRIPT_PACKAGES = "lcdd lcdproc" -INITSCRIPT_NAME_lcdd = "lcdd" -INITSCRIPT_NAME_lcdproc = "lcdproc" -INITSCRIPT_PARAMS_lcdd = "defaults 70 21" -INITSCRIPT_PARAMS_lcdproc = "defaults 71 20" +INITSCRIPT_NAME:lcdd = "lcdd" +INITSCRIPT_NAME:lcdproc = "lcdproc" +INITSCRIPT_PARAMS:lcdd = "defaults 70 21" +INITSCRIPT_PARAMS:lcdproc = "defaults 71 20" -python populate_packages_prepend() { +python populate_packages:prepend() { plugindir = d.expand('${libdir}/lcdproc') do_split_packages(d, plugindir, '(.*)\.so$', 'lcdd-driver-%s', 'LCDd driver for %s', prepend=True) } diff --git a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb index 7367c30a5e..1747e6b293 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-extended/mozjs/mozjs_60.9.0.bb @@ -20,11 +20,11 @@ SRC_URI = " \ file://0013-riscv-Disable-atomic-operations.patch \ file://0014-remove-JS_VOLATIME_ARM.patch \ " -SRC_URI_append_libc-musl = " \ +SRC_URI:append:libc-musl = " \ file://musl/0001-support-musl.patch \ file://musl/0002-js-Fix-build-with-musl.patch \ " -SRC_URI_append_mipsarchn32 = " \ +SRC_URI:append:mipsarchn32 = " \ file://mipsarchn32/0001-fix-compiling-failure-on-mips64-n32-bsp.patch \ " SRC_URI[md5sum] = "69a0be9ce695e5dc4941ed0c78ef00c2" @@ -35,7 +35,7 @@ S = "${WORKDIR}/firefox-${@d.getVar("PV").replace("esr", "")}" inherit autotools pkgconfig perlnative python3native inherit features_check -CONFLICT_DISTRO_FEATURES_mipsarchn32 = "ld-is-gold" +CONFLICT_DISTRO_FEATURES:mipsarchn32 = "ld-is-gold" DEPENDS += " \ nspr zlib autoconf-2.13-native \ @@ -62,18 +62,18 @@ EXTRA_OECONF = " \ " # Without this, JS_Init() will fail for mips64. -EXTRA_OECONF_append_mipsarch = " --with-intl-api=build" -EXTRA_OECONF_append_powerpc = " --with-intl-api=build" +EXTRA_OECONF:append:mipsarch = " --with-intl-api=build" +EXTRA_OECONF:append:powerpc = " --with-intl-api=build" -EXTRA_OECONF_append_mipsarch = " --disable-ion" -EXTRA_OECONF_append_riscv64 = " --disable-ion" -EXTRA_OECONF_append_riscv32 = " --disable-ion" +EXTRA_OECONF:append:mipsarch = " --disable-ion" +EXTRA_OECONF:append:riscv64 = " --disable-ion" +EXTRA_OECONF:append:riscv32 = " --disable-ion" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--x-includes=no --x-libraries=no,virtual/libx11" -EXTRA_OEMAKE_task-compile += "BUILD_OPT=1 OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" -EXTRA_OEMAKE_task-install += "STATIC_LIBRARY_NAME=js_static" +EXTRA_OEMAKE:task-compile += "BUILD_OPT=1 OS_LDFLAGS='-Wl,-latomic ${LDFLAGS}'" +EXTRA_OEMAKE:task-install += "STATIC_LIBRARY_NAME=js_static" export HOST_CC = "${BUILD_CC}" export HOST_CXX = "${BUILD_CXX}" @@ -110,12 +110,12 @@ do_configure() { touch ${B}/config.status } -do_compile_prepend() { +do_compile:prepend() { export SHELL="/bin/sh" export PYTHONPATH=`cat ${B}/PYTHONPATH` } -do_install_prepend() { +do_install:prepend() { export SHELL="/bin/sh" export PYTHONPATH=`cat ${B}/PYTHONPATH` } @@ -124,15 +124,15 @@ inherit multilib_script multilib_header MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js60-config" -do_install_append() { +do_install:append() { oe_multilib_header mozjs-60/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ -i ${D}${bindir}/js60-config } PACKAGES =+ "lib${BPN}" -FILES_lib${BPN} += "${libdir}/lib*.so" -FILES_${PN}-dev += "${bindir}/js60-config" +FILES:lib${BPN} += "${libdir}/lib*.so" +FILES:${PN}-dev += "${bindir}/js60-config" # Fails to build with thumb-1 (qemuarm) #| {standard input}: Assembler messages: @@ -141,7 +141,7 @@ FILES_${PN}-dev += "${bindir}/js60-config" #| {standard input}:2174: Error: unshifted register required -- `orr r1,r1,#(1<<20)' #| {standard input}:2176: Error: instruction not supported in Thumb16 mode -- `subs r2,r2,#0x300' #| {standard input}:2178: Error: instruction not supported in Thumb16 mode -- `subs r5,r2,#52' -ARM_INSTRUCTION_SET_armv5 = "arm" -ARM_INSTRUCTION_SET_armv4 = "arm" +ARM_INSTRUCTION_SET:armv5 = "arm" +ARM_INSTRUCTION_SET:armv4 = "arm" DISABLE_STATIC = "" diff --git a/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb index 90db9c3f3e..544c15421b 100644 --- a/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb +++ b/meta-oe/dynamic-layers/meta-python/recipes-support/smem/smem_1.5.bb @@ -33,11 +33,11 @@ do_install() { install -m 0644 ${S}/smem.8 ${D}/${mandir}/man8/ } -RDEPENDS_${PN} = "python3-core python3-compression" -RRECOMMENDS_${PN} = "python3-matplotlib python3-numpy" +RDEPENDS:${PN} = "python3-core python3-compression" +RRECOMMENDS:${PN} = "python3-matplotlib python3-numpy" PACKAGE_BEFORE_PN = "smemcap" -FILES_smemcap = "${bindir}/smemcap" +FILES:smemcap = "${bindir}/smemcap" BBCLASSEXTEND = "native" diff --git a/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 09c478eb10..359067cda3 100644 --- a/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-oe/dynamic-layers/networking-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1,6 +1,6 @@ -RDEPENDS_packagegroup-meta-oe-devtools += "\ +RDEPENDS:packagegroup-meta-oe-devtools += "\ valijson \ " -RDEPENDS_packagegroup-meta-oe-support_append_x86 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" -RDEPENDS_packagegroup-meta-oe-support_append_x86-64 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" +RDEPENDS:packagegroup-meta-oe-support:append:x86 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" +RDEPENDS:packagegroup-meta-oe-support:append:x86-64 = "${@bb.utils.contains('BBFILE_COLLECTIONS', 'filesystems-layer', ' open-vm-tools', '', d)}" diff --git a/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.4.bb b/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.4.bb index 63930b960c..a9302616b7 100644 --- a/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.4.bb +++ b/meta-oe/dynamic-layers/networking-layer/recipes-devtools/valijson/valijson_0.4.bb @@ -15,7 +15,7 @@ EXTRA_OECMAKE = "-DINSTALL_HEADERS=1 -DBUILD_TESTS=0" DEPENDS = "curlpp" # valijson is a header only C++ library, so the main package will be empty. -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend b/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend index 2aee5975d7..8cb8d22a2d 100644 --- a/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend +++ b/meta-oe/dynamic-layers/perl-layer/recipes-core/packagegroups/packagegroup-meta-oe.bbappend @@ -1 +1 @@ -RDEPENDS_packagegroup-meta-oe-support += "debsums rasdaemon" +RDEPENDS:packagegroup-meta-oe-support += "debsums rasdaemon" diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb index 07ab5e62b1..8c53af4cf6 100644 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/debsums/debsums_2.2.2.bb @@ -1,10 +1,10 @@ SUMMARY = "Miscellaneous utilities specific to Debian" -SUMMARY_${PN}-cron = "Cron scripts to control automatic debsum checking" +SUMMARY:${PN}-cron = "Cron scripts to control automatic debsum checking" DESCRIPTION = "A tool for verification of installed package files against \ MD5 checksums debsums can verify the integrity of installed package files \ against MD5 checksums installed by the package, or generated from a .deb \ archive." -DESCRIPTION_${PN}-cron = "Cron scripts to control automatic system integrity \ +DESCRIPTION:${PN}-cron = "Cron scripts to control automatic system integrity \ checking via debsums." SECTION = "base" LICENSE = "GPLv2" @@ -44,7 +44,7 @@ do_install() { PACKAGES =+ "${PN}-cron" -RDEPENDS_${PN} = "dpkg dpkg-perl libfile-fnmatch-perl perl \ +RDEPENDS:${PN} = "dpkg dpkg-perl libfile-fnmatch-perl perl \ perl-module-constant perl-module-digest-md5 \ perl-module-errno perl-module-fcntl \ perl-module-file-basename perl-module-file-copy \ @@ -53,4 +53,4 @@ RDEPENDS_${PN} = "dpkg dpkg-perl libfile-fnmatch-perl perl \ perl-module-file-temp perl-module-getopt-long \ perl-module-posix" -FILES_${PN}-cron = "${sysconfdir}/cron.*" +FILES:${PN}-cron = "${sysconfdir}/cron.*" diff --git a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb index 39ed3d1071..a68dfa1d01 100644 --- a/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb +++ b/meta-oe/dynamic-layers/perl-layer/recipes-support/rasdaemon/rasdaemon_0.6.7.bb @@ -12,7 +12,7 @@ SRCREV = "aa96737648d867a3d73e4151d05b54bbab494605" S = "${WORKDIR}/git" -RDEPENDS_${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ +RDEPENDS:${BPN} = "perl perl-module-file-basename perl-module-file-find perl-module-file-spec perl-module-getopt-long \ perl-module-posix perl-module-file-glob libdbi-perl libdbd-sqlite-perl" inherit autotools pkgconfig update-rc.d systemd @@ -29,27 +29,27 @@ PACKAGECONFIG[hisi-ns-decode] = "--enable-hisi-ns-decode,--disable-hisi-ns-decod PACKAGECONFIG[non-standard] = "--enable-non-standard,--disable-non-standard" PACKAGECONFIG[abrt-report] = "--enable-abrt-report,--disable-abrt-report" -DEPENDS_append_libc-musl = " argp-standalone" -LDFLAGS_append_libc-musl = " -largp" +DEPENDS:append:libc-musl = " argp-standalone" +LDFLAGS:append:libc-musl = " -largp" -do_configure_prepend () { +do_configure:prepend () { ( cd ${S}; autoreconf -vfi ) } -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 755 ${WORKDIR}/init ${D}${sysconfdir}/init.d/rasdaemon install -d ${D}${systemd_unitdir}/system install -m 0644 ${WORKDIR}/rasdaemon.service ${D}${systemd_unitdir}/system } -FILES_${PN} += "${sbindir}/rasdaemon \ +FILES:${PN} += "${sbindir}/rasdaemon \ ${sysconfdir}/init.d \ ${systemd_unitdir}/system/rasdaemon.service" -SYSTEMD_SERVICE_${PN} = "rasdaemon.service" +SYSTEMD_SERVICE:${PN} = "rasdaemon.service" SYSTEMD_AUTO_ENABLE = "enable" INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "rasdaemon" -INITSCRIPT_PARAMS_${PN} = "defaults 89" +INITSCRIPT_NAME:${PN} = "rasdaemon" +INITSCRIPT_PARAMS:${PN} = "defaults 89" -- cgit 1.2.3-korg