From e7f6f37cdbc8ba971a151ef23d96edd8cda76e30 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 8 Aug 2021 11:11:22 +0200 Subject: layer: convert to new override syntax This is the result of automated script (0.9.3) conversion: +# meta-toradex-distro +vars = vars + ["preempt-rt","tdx","upstream"] +# meta-toradex-* machines +vars = vars + ["apalis-","colibri-","verdin-","tegra124"] +# meta-freescale +vars = vars + ["imx","mx6","mx7","mx8","use-mainline-bsp","use-nxp-bsp"] ../openembedded-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Max Krummenacher --- recipes-connectivity/bluez-alsa/bluez-alsa_git.bb | 8 ++++---- recipes-connectivity/connman/connman_%.bbappend | 4 ++-- recipes-connectivity/hostapd-example/hostapd-example.bb | 10 +++++----- recipes-connectivity/openssh/openssh_%.bbappend | 14 +++++++------- .../wireless-regdb/wireless-regdb_2018.05.31.bb | 10 +++++----- 5 files changed, 23 insertions(+), 23 deletions(-) (limited to 'recipes-connectivity') diff --git a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb b/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb index 085792d..c9021bd 100644 --- a/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb +++ b/recipes-connectivity/bluez-alsa/bluez-alsa_git.bb @@ -26,22 +26,22 @@ inherit autotools pkgconfig inherit systemd SYSTEMD_AUTO_ENABLE = "enable" -SYSTEMD_SERVICE_${PN} = "bluez-alsa.service" +SYSTEMD_SERVICE:${PN} = "bluez-alsa.service" PACKAGECONFIG += "hcitop" -do_install_append () { +do_install:append () { install -d ${D}${base_libdir}/systemd/system install -m 0644 ${WORKDIR}/bluez-alsa.service ${D}${base_libdir}/systemd/system } -FILES_${PN} += "\ +FILES:${PN} += "\ ${datadir}/alsa/alsa.conf.d/20-bluealsa.conf\ ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.so\ ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.so\ " -FILES_${PN}-staticdev += "\ +FILES:${PN}-staticdev += "\ ${libdir}/alsa-lib/libasound_module_ctl_bluealsa.a\ ${libdir}/alsa-lib/libasound_module_pcm_bluealsa.a\ " diff --git a/recipes-connectivity/connman/connman_%.bbappend b/recipes-connectivity/connman/connman_%.bbappend index 330f66e..9c56db0 100644 --- a/recipes-connectivity/connman/connman_%.bbappend +++ b/recipes-connectivity/connman/connman_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/connman:" +FILESEXTRAPATHS:prepend := "${THISDIR}/connman:" SRC_URI += " \ file://0001-connman.service.in-don-t-start-if-nfs-boot.patch \ @@ -6,7 +6,7 @@ SRC_URI += " \ file://0003-connman-clock-ntp-client-should-not-update-time-time.patch \ " -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/connman/ install -m 0644 ${S}/src/main.conf ${D}${sysconfdir}/connman/ } diff --git a/recipes-connectivity/hostapd-example/hostapd-example.bb b/recipes-connectivity/hostapd-example/hostapd-example.bb index dc0b9db..17f52e8 100644 --- a/recipes-connectivity/hostapd-example/hostapd-example.bb +++ b/recipes-connectivity/hostapd-example/hostapd-example.bb @@ -2,9 +2,9 @@ SUMMARY = "Deployment of example files to run hostapd on Toradex demo images" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -RDEPENDS_${PN} = "hostapd" +RDEPENDS:${PN} = "hostapd" S = "${WORKDIR}" @@ -17,8 +17,8 @@ SRC_URI = " \ inherit allarch systemd -SYSTEMD_SERVICE_${PN} = "hostapd-example.service" -SYSTEMD_AUTO_ENABLE_${PN} = "disable" +SYSTEMD_SERVICE:${PN} = "hostapd-example.service" +SYSTEMD_AUTO_ENABLE:${PN} = "disable" do_install() { install -d ${D}${systemd_unitdir}/system/ ${D}${systemd_unitdir}/network/ ${D}${sysconfdir}/ @@ -29,7 +29,7 @@ do_install() { sed -i -e 's,@SBINDIR@,${sbindir},g' -e 's,@SYSCONFDIR@,${sysconfdir},g' ${D}${systemd_unitdir}/system/hostapd-example.service } -FILES_${PN} += " \ +FILES:${PN} += " \ ${systemd_unitdir}/system/* \ ${systemd_unitdir}/network/hostapd-example.network \ ${sysconfdir}/hostapd-tdx-demo-img.conf \ diff --git a/recipes-connectivity/openssh/openssh_%.bbappend b/recipes-connectivity/openssh/openssh_%.bbappend index 4bfdc03..3eff917 100644 --- a/recipes-connectivity/openssh/openssh_%.bbappend +++ b/recipes-connectivity/openssh/openssh_%.bbappend @@ -1,14 +1,14 @@ PACKAGES =+ "${PN}-scp-dev ${PN}-sftp-dev ${PN}-sftp-server-dev" PACKAGES =+ "${PN}-scp-dbg ${PN}-sftp-dbg ${PN}-sftp-server-dbg" -FILES_${PN}-scp-dev = "" -FILES_${PN}-sftp-dev = "" -FILES_${PN}-sftp-server-dev = "" -FILES_${PN}-scp-dbg = "${bindir}/.debug/scp.${BPN}" -FILES_${PN}-sftp-dbg = "${bindir}/.debug/sftp" -FILES_${PN}-sftp-server-dbg = "${libexecdir}/.debug/sftp-server" +FILES:${PN}-scp-dev = "" +FILES:${PN}-sftp-dev = "" +FILES:${PN}-sftp-server-dev = "" +FILES:${PN}-scp-dbg = "${bindir}/.debug/scp.${BPN}" +FILES:${PN}-sftp-dbg = "${bindir}/.debug/sftp" +FILES:${PN}-sftp-server-dbg = "${libexecdir}/.debug/sftp-server" #do not use reverse DNS -do_install_append () { +do_install:append () { sed -i -e 's:^#UseDNS.*$:UseDNS no:g' ${D}${sysconfdir}/ssh/sshd_config } diff --git a/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb b/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb index 340a312..874fd5f 100644 --- a/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb +++ b/recipes-connectivity/wireless-regdb/wireless-regdb_2018.05.31.bb @@ -24,21 +24,21 @@ do_install() { # This requires Linux kernel >= v4.15. # For kernel <= v4.14, inherit the kernel_wireless_regdb.bbclass in kernel's recipe. PACKAGES =+ "${PN}-static" -RCONFLICTS_${PN} = "${PN}-static" -RDEPENDS_${PN}-dev = "" +RCONFLICTS:${PN} = "${PN}-static" +RDEPENDS:${PN}-dev = "" -FILES_${PN}-static = " \ +FILES:${PN}-static = " \ ${nonarch_base_libdir}/firmware/regulatory.db \ ${nonarch_base_libdir}/firmware/regulatory.db.p7s \ " # Native users might want to use the source of regulatory DB. # This is for example used by Linux kernel <= v4.14 and kernel_wireless_regdb.bbclass. -do_install_append_class-native() { +do_install:append:class-native() { install -m 0644 -D db.txt ${D}${libdir}/crda/db.txt } -RSUGGESTS_${PN} = "crda" +RSUGGESTS:${PN} = "crda" BBCLASSEXTEND = "native" -- cgit v1.2.3