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-lxqt/lxqt-panel/lxqt-panel_%.bbappend | 4 +-- .../lxqt-session/lxqt-session_%.bbappend | 2 +- .../lxqt-themes/lxqt-themes_%.bbappend | 30 +++++++++++----------- .../recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend | 2 +- meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend | 2 +- meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb | 4 +-- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'meta-qt5-extra') diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend index 52b09c4..8d437cb 100644 --- a/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend +++ b/meta-qt5-extra/recipes-lxqt/lxqt-panel/lxqt-panel_%.bbappend @@ -1,9 +1,9 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/lxqt-panel:" +FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-panel:" # add some widgets, add some applications to quicklaunch by injecting # panel.conf configured on the target SRC_URI += "file://panel.conf" -do_configure_prepend () { +do_configure:prepend () { cp ${WORKDIR}/panel.conf ${S}/panel/resources/ } diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend index eb58ce3..c3b8be2 100644 --- a/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend +++ b/meta-qt5-extra/recipes-lxqt/lxqt-session/lxqt-session_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/lxqt-session:" +FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-session:" SRC_URI += "file://0001-session.conf-add-qterminal-as-default-terminal.patch" diff --git a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend index e71ec4b..3c2c82c 100644 --- a/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend +++ b/meta-qt5-extra/recipes-lxqt/lxqt-themes/lxqt-themes_%.bbappend @@ -1,12 +1,12 @@ WALLPAPER-MACHINE = "Wallpaper_Toradex.png" -WALLPAPER-MACHINE_colibri-t20 = "Wallpaper_ColibriT20.png" -WALLPAPER-MACHINE_colibri-t30 = "Wallpaper_ColibriT30.png" -WALLPAPER-MACHINE_apalis-t30 = "Wallpaper_ApalisT30.png" -WALLPAPER-MACHINE_apalis-tk1 = "Wallpaper_ApalisTK1.png" -WALLPAPER-MACHINE_colibri-imx6ull = "Wallpaper_ColibriiMX6ULL.png" -WALLPAPER-MACHINE_colibri-imx7-emmc = "Wallpaper_ColibriiMX7D.png" +WALLPAPER-MACHINE:colibri-t20 = "Wallpaper_ColibriT20.png" +WALLPAPER-MACHINE:colibri-t30 = "Wallpaper_ColibriT30.png" +WALLPAPER-MACHINE:apalis-t30 = "Wallpaper_ApalisT30.png" +WALLPAPER-MACHINE:apalis-tk1 = "Wallpaper_ApalisTK1.png" +WALLPAPER-MACHINE:colibri-imx6ull = "Wallpaper_ColibriiMX6ULL.png" +WALLPAPER-MACHINE:colibri-imx7-emmc = "Wallpaper_ColibriiMX7D.png" -FILESEXTRAPATHS_prepend := "${THISDIR}/lxqt-themes:" +FILESEXTRAPATHS:prepend := "${THISDIR}/lxqt-themes:" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -16,31 +16,31 @@ SRC_URI += " \ " # for apalis-imx6/colibri-imx6, we decide on the target during postinst -SRC_URI_append_apalis-imx6 += " \ +SRC_URI:append:apalis-imx6 += " \ file://Wallpaper_ApalisiMX6D.png \ file://Wallpaper_ApalisiMX6Q.png \ " -SRC_URI_append_colibri-imx6 += " \ +SRC_URI:append:colibri-imx6 += " \ file://Wallpaper_ColibriiMX6DL.png \ file://Wallpaper_ColibriiMX6S.png \ " # for colibri-imx7 we decide on the target during postinst -SRC_URI_append_colibri-imx7 += " \ +SRC_URI:append:colibri-imx7 += " \ file://Wallpaper_ColibriiMX7D.png \ file://Wallpaper_ColibriiMX7S.png \ " -SRC_URI_append_colibri-imx7-emmc += " \ +SRC_URI:append:colibri-imx7-emmc += " \ file://Wallpaper_ColibriiMX7D.png \ " -do_install_append () { +do_install:append () { install -m 0755 -d ${D}/${datadir}/lxqt/themes/toradex install -m 0644 ${WORKDIR}/Wallpaper*.png ${D}/${datadir}/lxqt/themes/toradex ln -sf ${WALLPAPER-MACHINE} ${D}/${datadir}/lxqt/themes/toradex/toradex.png } -pkg_postinst_ontarget_${PN}_apalis-imx6 () { +pkg_postinst_ontarget:${PN}:apalis-imx6 () { CORES=`grep -c processor /proc/cpuinfo` case $CORES in 4) @@ -55,7 +55,7 @@ pkg_postinst_ontarget_${PN}_apalis-imx6 () { ;; esac } -pkg_postinst_ontarget_${PN}_colibri-imx6 () { +pkg_postinst_ontarget:${PN}:colibri-imx6 () { CORES=`grep -c processor /proc/cpuinfo` case $CORES in 2) @@ -70,7 +70,7 @@ pkg_postinst_ontarget_${PN}_colibri-imx6 () { esac } -pkg_postinst_ontarget_${PN}_colibri-imx7 () { +pkg_postinst_ontarget:${PN}:colibri-imx7 () { # Currently the soc bus subsystem seems not to work on i.MX 7Solo # SOC_TYPE=`cat /sys/bus/soc/devices/soc0/soc_id` # if [ "x$SOC_TYPE" = "xi.MX7D" ]; then diff --git a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend b/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend index 7cbea39..13ce53d 100644 --- a/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend +++ b/meta-qt5-extra/recipes-lxqt/pcmanfm-qt/pcmanfm-qt_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/pcmanfm-qt:" +FILESEXTRAPATHS:prepend := "${THISDIR}/pcmanfm-qt:" SRC_URI += "file://0001-settings.conf.in-change-to-use-a-toradex-wallpaper.patch" diff --git a/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend b/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend index 81fe7b7..8802adb 100644 --- a/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend +++ b/meta-qt5-extra/recipes-misc/sddm/sddm_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" diff --git a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb index 4e2627d..4a7af6b 100644 --- a/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb +++ b/meta-qt5-extra/recipes-qt/falkon/falkon_3.1.0.bb @@ -13,14 +13,14 @@ SRC_URI = "https://download.kde.org/stable/falkon/3.1/falkon-3.1.0.tar.xz" SRC_URI[md5sum] = "9255fb335d3ba361dea44b7b297ddf7d" SRC_URI[sha256sum] = "ce743cd80c0e2d525a784e29c9b487f73480119b0567f9ce8ef1f44cca527587" -PATH_prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" +PATH:prepend = "${STAGING_DIR_NATIVE}${OE_QMAKE_PATH_QT_BINS}:" export USE_LIBPATH = "${libdir}" export QUPZILLA_PREFIX = "${prefix}" export SHARE_FOLDER = "${datadir}" export QMAKE_LRELEASE = "${RECIPE_SYSROOT_NATIVE}/usr/bin/qt5" -FILES_${PN} += " \ +FILES:${PN} += " \ ${OE_QMAKE_PATH_DATA}/icons \ ${OE_QMAKE_PATH_DATA}/metainfo \ ${OE_QMAKE_PATH_DATA}/bash-completion/completions \ -- cgit v1.2.3