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 --- classes/toradex-mirrors.bbclass | 2 +- .../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 +- ...ivesdk-packagegroup-qt5-toolchain-host.bbappend | 2 +- qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb | 6 +- qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb | 2 +- qt5-layer/recipes-qt/qt5/qt3d_%.bbappend | 8 +-- qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb | 2 +- qt5-layer/recipes-qt/qt5/qtbase_%.bbappend | 16 +++--- recipes-benchmark/cpuburn/cpuburn-a53_git.bb | 6 +- recipes-connectivity/bluez-alsa/bluez-alsa_git.bb | 8 +-- recipes-connectivity/connman/connman_%.bbappend | 4 +- .../hostapd-example/hostapd-example.bb | 10 ++-- recipes-connectivity/openssh/openssh_%.bbappend | 14 ++--- .../wireless-regdb/wireless-regdb_2018.05.31.bb | 10 ++-- recipes-core/base-files/base-files_3.0.14.bbappend | 4 +- recipes-core/busybox/busybox_%.bbappend | 2 +- recipes-core/glibc/glibc_2.%.bbappend | 2 +- .../packagegroups/packagegroup-dotnet-core.bb | 2 +- recipes-core/readline/readline_%.bbappend | 2 +- recipes-core/systemd/systemd_%.bbappend | 8 +-- recipes-core/systemd/timestamp-service.bb | 2 +- recipes-devtools/mmc/mmc-utils-cos_git.bb | 8 +-- recipes-devtools/opkg/opkg_0.%.bbappend | 2 +- .../run-postinsts/run-postinsts_1.0.bbappend | 2 +- .../gnome-disk-utility_3.21.3.bb | 6 +- recipes-gnome/gvfs/gvfs_%.bbappend | 4 +- recipes-graphics/cogl/cogl-1.0_%.bbappend | 2 +- recipes-graphics/gpicview/gpicview_0.2.5.bb | 4 +- recipes-graphics/graphviz/graphviz_2.38.0.bb | 2 +- recipes-graphics/mesa/mesa-demos_%.bbappend | 6 +- .../packagegroups/packagegroup-core-x11.bbappend | 2 +- recipes-graphics/scrot/giblib_1.2.4.bb | 8 +-- recipes-graphics/scrot/imlib2_git.bb | 26 ++++----- recipes-graphics/scrot/scrot_0.8.bb | 6 +- recipes-graphics/vnc/tightvnc_1.3.10.bb | 8 +-- .../wayland-app-launch/wayland-app-launch.inc | 6 +- .../x-window-analogclock_1.0.bb | 2 +- .../x-window-qtcinematicexperience_1.0.bb | 2 +- .../x-window-qtsmarthome_1.0.bb | 2 +- .../x-window-simple-app/x-window-simple-app.inc | 4 +- .../x-window-simple-app/x-window-xterm_1.0.bb | 2 +- .../xinput-calibrator_git.bbappend | 4 +- .../xorg-xserver/xserver-xorg_%.bbappend | 2 +- recipes-images/images/packagegroup-tdx-cli.bb | 66 +++++++++++----------- .../images/packagegroup-tdx-graphical.bb | 54 +++++++++--------- recipes-images/images/packagegroup-tdx-qt5.bb | 20 +++---- .../images/tdx-reference-minimal-image.bb | 8 +-- .../images/tdx-reference-multimedia-image.bb | 28 ++++----- .../codecgraph/codecgraph_20120114.bb | 2 +- recipes-multimedia/mediainfo/mediainfo_0.7.62.bb | 2 +- recipes-sato/webkit/webkitgtk_%.bbappend | 4 +- recipes-support/curl/curl_%.bbappend | 4 +- recipes-support/florence/florence3_0.6.3.bb | 8 +-- recipes-support/florence/florence3_0.6.3.bbappend | 2 +- recipes-support/florence/florence_0.5.4.bbappend | 2 +- recipes-support/gpio-tool/gpio-tool.bb | 4 +- recipes-support/libfm/libfm_%.bbappend | 2 +- .../tdx-oak-sensors/tdx-oak-sensors_0082.bb | 2 +- 63 files changed, 237 insertions(+), 237 deletions(-) diff --git a/classes/toradex-mirrors.bbclass b/classes/toradex-mirrors.bbclass index 88db3b4..60864e7 100644 --- a/classes/toradex-mirrors.bbclass +++ b/classes/toradex-mirrors.bbclass @@ -1,6 +1,6 @@ TORADEX_MIRROR_URL="https://artifacts.toradex.com/artifactory/tdxref-torizoncore-sources-frankfurt/${TDX_MAJOR}" -PREMIRRORS_append () { +PREMIRRORS:append () { cvs://.*/.* ${TORADEX_MIRROR_URL} svn://.*/.* ${TORADEX_MIRROR_URL} git://.*/.* ${TORADEX_MIRROR_URL} 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 \ diff --git a/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend b/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend index 2d005a5..c58fcf2 100644 --- a/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend +++ b/qt5-layer/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bbappend @@ -1 +1 @@ -RDEPENDS_${PN} += "nativesdk-python3-json" +RDEPENDS:${PN} += "nativesdk-python3-json" diff --git a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb index 112a8c0..7c1e563 100644 --- a/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb +++ b/qt5-layer/recipes-qt/qedit/qedit_2.8.2.bb @@ -24,10 +24,10 @@ do_configure() { cmake_do_configure } -do_install_append () { +do_install:append () { install -d ${D}/${datadir}/applications install -m 755 ${WORKDIR}/qedit.desktop ${D}/${datadir}/applications/ } -FILES_${PN} += "" -FILES_${PN}-dev += "" +FILES:${PN} += "" +FILES:${PN}-dev += "" diff --git a/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb b/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb index 32700ad..222e970 100644 --- a/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb +++ b/qt5-layer/recipes-qt/qt5/packagegroup-qt5.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ qtbase \ qtbase-tools \ qtmultimedia \ diff --git a/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend index 85d7eab..0b9a117 100644 --- a/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qt3d_%.bbappend @@ -1,13 +1,13 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/qt3d:" +FILESEXTRAPATHS:prepend := "${THISDIR}/qt3d:" # qt3d links against the opengl flavours we configured qtbase for, so # depend on them here DEPENDS_GLES = "" -DEPENDS_GLES_imxpxp += "virtual/libgles2 virtual/egl" +DEPENDS_GLES:imxpxp += "virtual/libgles2 virtual/egl" DEPENDS_GLES_imgpu3d += "virtual/libgles2 virtual/egl" -DEPENDS_GLES_use-mainline-bsp += "virtual/libgles2 virtual/egl" +DEPENDS_GLES:use-mainline-bsp += "virtual/libgles2 virtual/egl" -DEPENDS_class-target += " ${DEPENDS_GLES}" +DEPENDS:class-target += " ${DEPENDS_GLES}" # Fix race condition SRC_URI += "file://0001-qt3d-do-not-set-resources_big.patch" diff --git a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb index 6d5963e..81769ff 100644 --- a/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb +++ b/qt5-layer/recipes-qt/qt5/qt5-x11-free-systemd.bb @@ -21,4 +21,4 @@ do_install () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "qt5-x11-demo.service" +SYSTEMD_SERVICE:${PN} = "qt5-x11-demo.service" diff --git a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend index 2d1f9d6..83eeb1a 100644 --- a/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend +++ b/qt5-layer/recipes-qt/qt5/qtbase_%.bbappend @@ -7,31 +7,31 @@ PACKAGECONFIG_EXAMPLES ?= "examples" # | /build/krm/oe-core_V2.6/build/out-glibc/work/armv7at2hf-vfp-neon-mx6qdl-angstrom-linux-gnueabi/qtbase/5.5.1+gitAUTOINC+5afc431323-r0/git/src/widgets/styles/qgtkstyle.cpp:3636:74: error: 'QAccessible' has not been declared # | } else if (QStyleHelper::isInstanceOf(groupBox->styleObject, QAccessible::Grouping)) { -PACKAGECONFIG_append = " accessibility" -PACKAGECONFIG_append = " sql-sqlite" +PACKAGECONFIG:append = " accessibility" +PACKAGECONFIG:append = " sql-sqlite" -PACKAGECONFIG_FONTS_append = " fontconfig" +PACKAGECONFIG_FONTS:append = " fontconfig" #qtbase must be configured with icu for qtwebkit -PACKAGECONFIG_append = " \ +PACKAGECONFIG:append = " \ icu \ ${PACKAGECONFIG_EXAMPLES} \ " -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" IMX_BACKEND = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', \ bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', \ 'fb', d), d)}" -SRC_URI_append = " \ +SRC_URI:append = " \ file://qt5-${IMX_BACKEND}.sh \ " -do_install_append () { +do_install:append () { install -d ${D}${sysconfdir}/profile.d/ install -m 0755 ${WORKDIR}/qt5-${IMX_BACKEND}.sh ${D}${sysconfdir}/profile.d/ } -FILES_${PN} += "${sysconfdir}/profile.d/qt5*.sh" +FILES:${PN} += "${sysconfdir}/profile.d/qt5*.sh" diff --git a/recipes-benchmark/cpuburn/cpuburn-a53_git.bb b/recipes-benchmark/cpuburn/cpuburn-a53_git.bb index f8f3d03..e56e70a 100644 --- a/recipes-benchmark/cpuburn/cpuburn-a53_git.bb +++ b/recipes-benchmark/cpuburn/cpuburn-a53_git.bb @@ -2,7 +2,7 @@ SUMMARY = "CPU burn app that loads the NEON coprocessor fully" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://cpuburn-a53.S;md5=a32d75f7e1fa9afbb887bef71d89875a" -DL_DIR_append = "/${PN}-${PV}" +DL_DIR:append = "/${PN}-${PV}" # Ensure to make this available for machine which has neon COMPATIBLE_MACHINE = "(${@bb.utils.contains("TUNE_FEATURES", "aarch64", "${MACHINE}", "Invalid!", d)})" @@ -27,7 +27,7 @@ do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a8.S -o burn-neona8 } -do_compile_aarch64() { +do_compile:aarch64() { ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a53.S -o burn-a53 } @@ -37,7 +37,7 @@ do_install() { install -m 0755 ${S}/burn-neona8 ${D}${bindir}/ } -do_install_aarch64() { +do_install:aarch64() { install -d ${D}${bindir} install -m 0755 ${S}/burn-a53 ${D}${bindir}/ } 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" diff --git a/recipes-core/base-files/base-files_3.0.14.bbappend b/recipes-core/base-files/base-files_3.0.14.bbappend index f52cb85..13d7822 100644 --- a/recipes-core/base-files/base-files_3.0.14.bbappend +++ b/recipes-core/base-files/base-files_3.0.14.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/base-files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/base-files:" SRC_URI += " \ file://disable_systemd_coloroutput.sh \ @@ -6,7 +6,7 @@ SRC_URI += " \ file://wayland-env.sh \ " -do_install_append () { +do_install:append () { install -m 0755 -d ${D}${sysconfdir}/profile.d install -m 0644 ${WORKDIR}/disable_systemd_coloroutput.sh ${D}${sysconfdir}/profile.d/ install -m 0644 ${WORKDIR}/x11-display-var.sh ${D}${sysconfdir}/profile.d/ diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend index 19c83d2..3015561 100644 --- a/recipes-core/busybox/busybox_%.bbappend +++ b/recipes-core/busybox/busybox_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:" +FILESEXTRAPATHS:prepend := "${THISDIR}/busybox:" SRC_URI += "file://resize.cfg" diff --git a/recipes-core/glibc/glibc_2.%.bbappend b/recipes-core/glibc/glibc_2.%.bbappend index b7b36fa..3a90e89 100644 --- a/recipes-core/glibc/glibc_2.%.bbappend +++ b/recipes-core/glibc/glibc_2.%.bbappend @@ -1,2 +1,2 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/glibc-2.22:" +FILESEXTRAPATHS:prepend := "${THISDIR}/glibc-2.22:" #SRC_URI_append = " file://0001-memcpy-don-t-use-optimized-for-VFP-NEON-versions.patch" diff --git a/recipes-core/packagegroups/packagegroup-dotnet-core.bb b/recipes-core/packagegroups/packagegroup-dotnet-core.bb index 6b4fa94..0894b65 100644 --- a/recipes-core/packagegroups/packagegroup-dotnet-core.bb +++ b/recipes-core/packagegroups/packagegroup-dotnet-core.bb @@ -4,7 +4,7 @@ inherit packagegroup PACKAGES = "packagegroup-dotnet-deps" -RDEPENDS_packagegroup-dotnet-deps = "\ +RDEPENDS:packagegroup-dotnet-deps = "\ libunwind \ icu \ libcurl \ diff --git a/recipes-core/readline/readline_%.bbappend b/recipes-core/readline/readline_%.bbappend index 81fe7b7..8802adb 100644 --- a/recipes-core/readline/readline_%.bbappend +++ b/recipes-core/readline/readline_%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" diff --git a/recipes-core/systemd/systemd_%.bbappend b/recipes-core/systemd/systemd_%.bbappend index afbc6f8..802daa2 100644 --- a/recipes-core/systemd/systemd_%.bbappend +++ b/recipes-core/systemd/systemd_%.bbappend @@ -1,17 +1,17 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/systemd:" +FILESEXTRAPATHS:prepend := "${THISDIR}/systemd:" SRC_URI += "file://rndis.network" -PACKAGECONFIG_append = " networkd" +PACKAGECONFIG:append = " networkd" PACKAGECONFIG[acl] = "-Dacl=true,-Dacl=false,acl" -do_install_append() { +do_install:append() { # The network files need to be in /usr/lib/systemd, not ${systemd_unitdir}... install -d ${D}${prefix}/lib/systemd/network/ install -m 0644 ${WORKDIR}/rndis.network ${D}${prefix}/lib/systemd/network/ } -FILES_${PN} += " \ +FILES:${PN} += " \ ${nonarch_base_libdir}/systemd/network \ " diff --git a/recipes-core/systemd/timestamp-service.bb b/recipes-core/systemd/timestamp-service.bb index 24d4a1d..914e610 100644 --- a/recipes-core/systemd/timestamp-service.bb +++ b/recipes-core/systemd/timestamp-service.bb @@ -18,4 +18,4 @@ do_install () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "timestamp.service" +SYSTEMD_SERVICE:${PN} = "timestamp.service" diff --git a/recipes-devtools/mmc/mmc-utils-cos_git.bb b/recipes-devtools/mmc/mmc-utils-cos_git.bb index 0f07a07..ff91aa3 100644 --- a/recipes-devtools/mmc/mmc-utils-cos_git.bb +++ b/recipes-devtools/mmc/mmc-utils-cos_git.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://mmc.c;beginline=1;endline=17;md5=d7747fc87f1eb22b946e inherit update-alternatives -ALTERNATIVE_${PN} = "mmc" +ALTERNATIVE:${PN} = "mmc" ALTERNATIVE_PRIORITY = "5" SRCBRANCH ?= "master" @@ -20,9 +20,9 @@ SRC_URI = " \ S = "${WORKDIR}/git" -CFLAGS_append_powerpc64 = " -D__SANE_USERSPACE_TYPES__" -CFLAGS_append_mips64 = " -D__SANE_USERSPACE_TYPES__" -CFLAGS_append_mips64n32 = " -D__SANE_USERSPACE_TYPES__" +CFLAGS:append:powerpc64 = " -D__SANE_USERSPACE_TYPES__" +CFLAGS:append:mips64 = " -D__SANE_USERSPACE_TYPES__" +CFLAGS:append:mips64n32 = " -D__SANE_USERSPACE_TYPES__" do_install() { install -d ${D}${bindir} diff --git a/recipes-devtools/opkg/opkg_0.%.bbappend b/recipes-devtools/opkg/opkg_0.%.bbappend index 49e7305..212a87e 100644 --- a/recipes-devtools/opkg/opkg_0.%.bbappend +++ b/recipes-devtools/opkg/opkg_0.%.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/opkg:" +FILESEXTRAPATHS:prepend := "${THISDIR}/opkg:" diff --git a/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend b/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend index ef0f837..f8ccc1a 100644 --- a/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend +++ b/recipes-devtools/run-postinsts/run-postinsts_1.0.bbappend @@ -1 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/run-postinsts:" +FILESEXTRAPATHS:prepend := "${THISDIR}/run-postinsts:" diff --git a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb index 482ca83..8a39998 100644 --- a/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb +++ b/recipes-gnome/gnome-disk-utility/gnome-disk-utility_3.21.3.bb @@ -17,9 +17,9 @@ GNOME_COMPRESS_TYPE = "xz" EXTRA_OECONF += "--disable-gsd-plugin" -do_configure_prepend() { +do_configure:prepend() { sed -i -e "s: help : :g" ${S}/Makefile.am } -FILES_${PN} += "${datadir}/appdata ${datadir}/dbus-1/services" -FILES_${PN}-libs += "${libdir}/libgdu*.so.*" +FILES:${PN} += "${datadir}/appdata ${datadir}/dbus-1/services" +FILES:${PN}-libs += "${libdir}/libgdu*.so.*" diff --git a/recipes-gnome/gvfs/gvfs_%.bbappend b/recipes-gnome/gvfs/gvfs_%.bbappend index 784fe04..1637cf5 100644 --- a/recipes-gnome/gvfs/gvfs_%.bbappend +++ b/recipes-gnome/gvfs/gvfs_%.bbappend @@ -1,4 +1,4 @@ #do not build with libgphoto2 -PACKAGECONFIG_remove = "libgphoto2" +PACKAGECONFIG:remove = "libgphoto2" -DEPENDS_append = " udev libusb1" +DEPENDS:append = " udev libusb1" diff --git a/recipes-graphics/cogl/cogl-1.0_%.bbappend b/recipes-graphics/cogl/cogl-1.0_%.bbappend index 85e6645..8dde652 100644 --- a/recipes-graphics/cogl/cogl-1.0_%.bbappend +++ b/recipes-graphics/cogl/cogl-1.0_%.bbappend @@ -1,3 +1,3 @@ # Workaround populate_sdk issue which depends on cogl-1.0 which can not be # found. -RDEPENDS_${PN}-dev = "" +RDEPENDS:${PN}-dev = "" diff --git a/recipes-graphics/gpicview/gpicview_0.2.5.bb b/recipes-graphics/gpicview/gpicview_0.2.5.bb index cee82b7..53d996f 100644 --- a/recipes-graphics/gpicview/gpicview_0.2.5.bb +++ b/recipes-graphics/gpicview/gpicview_0.2.5.bb @@ -6,7 +6,7 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" DEPENDS = "glib-2.0-native intltool-native jpeg" -RDEPENDS_${PN} = "adwaita-icon-theme" +RDEPENDS:${PN} = "adwaita-icon-theme" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/lxde/${P}.tar.xz \ @@ -21,4 +21,4 @@ PACKAGECONFIG[gtk3] = "--enable-gtk3,,gtk+3" inherit autotools gettext mime-xdg pkgconfig -FILES_${PN} += "${datadir}/icons/*" +FILES:${PN} += "${datadir}/icons/*" diff --git a/recipes-graphics/graphviz/graphviz_2.38.0.bb b/recipes-graphics/graphviz/graphviz_2.38.0.bb index 2001d79..fa547ed 100644 --- a/recipes-graphics/graphviz/graphviz_2.38.0.bb +++ b/recipes-graphics/graphviz/graphviz_2.38.0.bb @@ -14,7 +14,7 @@ SRC_URI[sha256sum] = "81aa238d9d4a010afa73a9d2a704fc3221c731e1e06577c2ab3496bdef PR = "r1" -FILES_${PN}-dev += " \ +FILES:${PN}-dev += " \ /usr/lib/graphviz/*.so \ " diff --git a/recipes-graphics/mesa/mesa-demos_%.bbappend b/recipes-graphics/mesa/mesa-demos_%.bbappend index c82b27f..ef4e7c3 100644 --- a/recipes-graphics/mesa/mesa-demos_%.bbappend +++ b/recipes-graphics/mesa/mesa-demos_%.bbappend @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" -SRC_URI_append_imxgpu = " file://0001-xeglgears-drop-usage-of-fooEXT-functions.patch" -PACKAGE_ARCH_imxgpu = "${MACHINE_SOCARCH}" +SRC_URI:append:imxgpu = " file://0001-xeglgears-drop-usage-of-fooEXT-functions.patch" +PACKAGE_ARCH:imxgpu = "${MACHINE_SOCARCH}" diff --git a/recipes-graphics/packagegroups/packagegroup-core-x11.bbappend b/recipes-graphics/packagegroups/packagegroup-core-x11.bbappend index b3b082a..8647b87 100644 --- a/recipes-graphics/packagegroups/packagegroup-core-x11.bbappend +++ b/recipes-graphics/packagegroups/packagegroup-core-x11.bbappend @@ -1 +1 @@ -RDEPENDS_${PN}-utils_remove = "${VIRTUAL-RUNTIME_graphical_init_manager}" \ No newline at end of file +RDEPENDS:${PN}-utils:remove = "${VIRTUAL-RUNTIME_graphical_init_manager}" \ No newline at end of file diff --git a/recipes-graphics/scrot/giblib_1.2.4.bb b/recipes-graphics/scrot/giblib_1.2.4.bb index 587c7fb..8cc6835 100644 --- a/recipes-graphics/scrot/giblib_1.2.4.bb +++ b/recipes-graphics/scrot/giblib_1.2.4.bb @@ -5,7 +5,7 @@ LICENSE = "BSD" DEPENDS = "imlib2" -MIRRORS_prepend () { +MIRRORS:prepend () { } SRC_URI = " \ @@ -18,14 +18,14 @@ SRC_URI[sha256sum] = "176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922eb PR = "r0" -do_compile_prepend () { +do_compile:prepend () { #remove linkerpath to host libraries sed -i -e 's:-L/usr/lib\s::' Makefile sed -i -e 's:-L/usr/lib\s::' giblib/Makefile export DESTDIR=${D} } -do_compile_append () { +do_compile:append () { for i in $(find ${B} -name "*?.pc") ; do sed -i -e s:${STAGING_DIR_TARGET}::g \ -e s:/${TARGET_SYS}::g \ @@ -33,7 +33,7 @@ do_compile_append () { done } -FILES_${PN}-doc = "/usr/doc" +FILES:${PN}-doc = "/usr/doc" inherit autotools-brokensep binconfig pkgconfig diff --git a/recipes-graphics/scrot/imlib2_git.bb b/recipes-graphics/scrot/imlib2_git.bb index ee7f2e2..df3109b 100644 --- a/recipes-graphics/scrot/imlib2_git.bb +++ b/recipes-graphics/scrot/imlib2_git.bb @@ -30,26 +30,26 @@ OE_LT_RPATH_ALLOW = "any" OE_LT_RPATH_ALLOW[export]="1" PACKAGES =+ "imlib2-loaders-dbg imlib2-filters-dbg imlib2-loaders imlib2-filters ${PN}-bin imlib2-themes " -FILES_${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" -FILES_${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/" -FILES_${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" -FILES_${PN}-bin = "${bindir}" -FILES_imlib2-themes = "${datadir}/imlib2/data" -FILES_imlib2-loaders = "${libdir}/imlib2/loaders/*.so" -FILES_imlib2-filters = "${libdir}/imlib2/filters/*.so" -FILES_imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" -FILES_imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" +FILES:${PN} = "${libdir}/lib*.so.* ${libdir}/imlib2/*/*.so" +FILES:${PN}-dbg = "${libdir}/.debug/ ${bindir}/.debug/ ${prefix}/src/debug/" +FILES:${PN}-dev += "${bindir}/imlib2-config ${libdir}/*.so ${includedir}" +FILES:${PN}-bin = "${bindir}" +FILES:imlib2-themes = "${datadir}/imlib2/data" +FILES:imlib2-loaders = "${libdir}/imlib2/loaders/*.so" +FILES:imlib2-filters = "${libdir}/imlib2/filters/*.so" +FILES:imlib2-loaders-dbg += "${libdir}/imlib2/loaders/.debug" +FILES:imlib2-filters-dbg += "${libdir}/imlib2/filters/.debug" # png.so jpeg.so id3.so are also provided by lightmediascanner -PRIVATE_LIBS_imlib2-loaders = "pnm.so lbm.so argb.so tiff.so zlib.so bmp.so tga.so gif.so xpm.so bz2.so" +PRIVATE_LIBS:imlib2-loaders = "pnm.so lbm.so argb.so tiff.so zlib.so bmp.so tga.so gif.so xpm.so bz2.so" -PRIVATE_LIBS_imlib2-filters = "bumpmap.so colormod.so testfilter.so" +PRIVATE_LIBS:imlib2-filters = "bumpmap.so colormod.so testfilter.so" -do_configure_prepend() { +do_configure:prepend() { autopoint || touch config.rpath } -do_install_prepend () { +do_install:prepend () { for i in `find ${B}/ -name "*.pc" -type f` ; do \ sed -i -e 's:-L${STAGING_LIBDIR}:-L\$\{libdir\}:g' -e 's:-I${STAGING_LIBDIR}:-I\$\{libdir\}:g' -e 's:-I${STAGING_INCDIR}:-I\$\{includedir\}:g' $i done diff --git a/recipes-graphics/scrot/scrot_0.8.bb b/recipes-graphics/scrot/scrot_0.8.bb index 6a0b6dc..91b5638 100644 --- a/recipes-graphics/scrot/scrot_0.8.bb +++ b/recipes-graphics/scrot/scrot_0.8.bb @@ -4,10 +4,10 @@ DESCRIPTION = "scrot (SCReen shOT) is a simple commandline screen capture utilit HOMEPAGE = "http://linuxbrit.co.uk/software/" LICENSE = "BSD" -RDEPENDS_${PN} = "imlib2-loaders" +RDEPENDS:${PN} = "imlib2-loaders" DEPENDS = "imlib2 giblib" -MIRRORS_prepend () { +MIRRORS:prepend () { } SRC_URI = " \ @@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "613d1cf524c2b62ce3c65f1232ea4f05c7daf248d5e82ff2a6892c9809 PR = "r0" -FILES_${PN}-doc += "/usr/doc" +FILES:${PN}-doc += "/usr/doc" inherit autotools diff --git a/recipes-graphics/vnc/tightvnc_1.3.10.bb b/recipes-graphics/vnc/tightvnc_1.3.10.bb index 5bec3ce..4a707b7 100644 --- a/recipes-graphics/vnc/tightvnc_1.3.10.bb +++ b/recipes-graphics/vnc/tightvnc_1.3.10.bb @@ -17,8 +17,8 @@ SRC_URI = " \ S = "${WORKDIR}/vnc_unixsrc/vncviewer" PACKAGES = "${PN}-viewer-dbg ${PN}-viewer" -FILES_${PN}-viewer-dbg = "${bindir}/.debug" -FILES_${PN}-viewer = "${bindir}/${PN}viewer ${sysconfdir}" +FILES:${PN}-viewer-dbg = "${bindir}/.debug" +FILES:${PN}-viewer = "${bindir}/${PN}viewer ${sysconfdir}" do_compile () { install ${WORKDIR}/Makefile ${S} @@ -32,12 +32,12 @@ do_install () { install -m 644 ${WORKDIR}/Vncviewer ${D}${sysconfdir}/X11/app-defaults/Vncviewer } -pkg_postinst_${PN}-viewer () { +pkg_postinst:${PN}-viewer () { update-alternatives --install ${bindir}/vncviewer vncviewer tightvncviewer 100 } -pkg_prerm_${PN}-viewer () { +pkg_prerm:${PN}-viewer () { update-alternatives --remove ${bindir}/vncviewer vncviewer tightvncviewer 100 } diff --git a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc index 18b6b29..946b4cc 100644 --- a/recipes-graphics/wayland-app-launch/wayland-app-launch.inc +++ b/recipes-graphics/wayland-app-launch/wayland-app-launch.inc @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch systemd -RDEPENDS_${PN} += "weston-init ${INITIAL_APP_PKGS}" +RDEPENDS:${PN} += "weston-init ${INITIAL_APP_PKGS}" S = "${WORKDIR}" @@ -13,7 +13,7 @@ SRC_URI = " \ file://wayland-app-launch.service.in \ file://wayland-app-launch.sh.in \ " -FILESEXTRAPATHS_prepend := "${THISDIR}/wayland-app-launch:" +FILESEXTRAPATHS:prepend := "${THISDIR}/wayland-app-launch:" APPLICATION_ENVIRONMENT ??= "" @@ -29,4 +29,4 @@ do_install () { } SYSTEMD_PACKAGES = "${PN}" -SYSTEMD_SERVICE_${PN} = "wayland-app-launch.service" +SYSTEMD_SERVICE:${PN} = "wayland-app-launch.service" diff --git a/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb index c9bfd7a..9543156 100644 --- a/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb +++ b/recipes-graphics/x-window-simple-app/x-window-analogclock_1.0.bb @@ -5,5 +5,5 @@ INITIAL_APP_PKGS ?= "qtbase-examples" INITIAL_PATH ?= "" X_APPLICATION ?= "/usr/share/examples/gui/analogclock/analogclock" -FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:" +FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb index f9a3f4d..4921351 100644 --- a/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb +++ b/recipes-graphics/x-window-simple-app/x-window-qtcinematicexperience_1.0.bb @@ -5,5 +5,5 @@ INITIAL_APP_PKGS ?= "cinematicexperience" INITIAL_PATH ?= "/usr/share/cinematicexperience-1.0" X_APPLICATION ?= "${INITIAL_PATH}/Qt5_CinematicExperience" -FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:" +FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb index 968c98e..098dec6 100644 --- a/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb +++ b/recipes-graphics/x-window-simple-app/x-window-qtsmarthome_1.0.bb @@ -5,5 +5,5 @@ INITIAL_APP_PKGS ?= "qtsmarthome" INITIAL_PATH ?= "/usr/share/qtsmarthome-1.0" X_APPLICATION ?= "${INITIAL_PATH}/smarthome" -FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:" +FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/x-window-simple-app/x-window-simple-app.inc b/recipes-graphics/x-window-simple-app/x-window-simple-app.inc index c9578ad..a96a0d5 100644 --- a/recipes-graphics/x-window-simple-app/x-window-simple-app.inc +++ b/recipes-graphics/x-window-simple-app/x-window-simple-app.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit allarch -RDEPENDS_${PN} += "${INITIAL_APP_PKGS} xserver-nodm-init" +RDEPENDS:${PN} += "${INITIAL_APP_PKGS} xserver-nodm-init" S = "${WORKDIR}" @@ -31,6 +31,6 @@ do_install () { } # make sure xinput_calibrator is only started once -pkg_postinst_${PN}() { +pkg_postinst:${PN}() { rm -f /etc/xdg/autostart/xinput_calibrator.desktop } diff --git a/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb b/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb index 302a0c7..da711c7 100644 --- a/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb +++ b/recipes-graphics/x-window-simple-app/x-window-xterm_1.0.bb @@ -5,5 +5,5 @@ INITIAL_APP_PKGS ?= "xterm" INITIAL_PATH ?= "" X_APPLICATION ?= "/usr/bin/xterm" -FILESEXTRAPATHS_prepend := "${THISDIR}/x-window-simple-app:" +FILESEXTRAPATHS:prepend := "${THISDIR}/x-window-simple-app:" require recipes-graphics/x-window-simple-app/x-window-simple-app.inc diff --git a/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend b/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend index 2b42880..72933f1 100644 --- a/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend +++ b/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bbappend @@ -1,7 +1,7 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/xinput-calibrator:" +FILESEXTRAPATHS:prepend := "${THISDIR}/xinput-calibrator:" # menu entry should make the calibration permanent instead of printing cal data into a terminal -do_install_append() { +do_install:append() { install -m 0755 ${D}/${datadir}/applications/xinput_calibrator.desktop ${D}/${datadir}/applications/xinput_calibrator.desktop.old sed -i -e 's/xinput_calibrator; cat/rm -f \/etc\/pointercal.xinput; xinput_calibrator_once.sh/' ${D}/${datadir}/applications/xinput_calibrator.desktop sed -i -e 's/Terminal\=true/Terminal=false/' ${D}/${datadir}/applications/xinput_calibrator.desktop diff --git a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index 01a7948..8bfdd5c 100644 --- a/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,3 +1,3 @@ # xinput-calibrator-once expects an evdev interface, so don't install # xf86-input-libinput which takes precedence over xf86-input-evdev -XSERVER_RRECOMMENDS_remove = "xf86-input-libinput" +XSERVER_RRECOMMENDS:remove = "xf86-input-libinput" diff --git a/recipes-images/images/packagegroup-tdx-cli.bb b/recipes-images/images/packagegroup-tdx-cli.bb index 4f9eebc..9d5fb94 100644 --- a/recipes-images/images/packagegroup-tdx-cli.bb +++ b/recipes-images/images/packagegroup-tdx-cli.bb @@ -18,7 +18,7 @@ PACKAGES += " \ packagegroup-wifi-fw-large-tdx-cli \ " -RDEPENDS_packagegroup-tdx-cli = "\ +RDEPENDS:packagegroup-tdx-cli = "\ packagegroup-base-tdx-cli \ packagegroup-benchmark-tdx-cli \ packagegroup-devel-tdx-cli \ @@ -31,8 +31,8 @@ RDEPENDS_packagegroup-tdx-cli = "\ packagegroup-wifi-fw-large-tdx-cli \ " -SUMMARY_packagegroup-base-tdx-cli = "Recommended for any image" -RRECOMMENDS_packagegroup-base-tdx-cli = "\ +SUMMARY:packagegroup-base-tdx-cli = "Recommended for any image" +RRECOMMENDS:packagegroup-base-tdx-cli = "\ can-utils \ dosfstools \ e2fsprogs-mke2fs \ @@ -48,8 +48,8 @@ RRECOMMENDS_packagegroup-base-tdx-cli = "\ util-linux-fstrim \ " -SUMMARY_packagegroup-benchmark-tdx-cli = "Benchmarking tools" -RRECOMMENDS_packagegroup-benchmark-tdx-cli = "\ +SUMMARY:packagegroup-benchmark-tdx-cli = "Benchmarking tools" +RRECOMMENDS:packagegroup-benchmark-tdx-cli = "\ hdparm \ iperf2 \ iperf3 \ @@ -60,8 +60,8 @@ RRECOMMENDS_packagegroup-benchmark-tdx-cli = "\ tinymembench \ " -SUMMARY_packagegroup-devel-tdx-cli = "Tools useful during development" -RRECOMMENDS_packagegroup-devel-tdx-cli = "\ +SUMMARY:packagegroup-devel-tdx-cli = "Tools useful during development" +RRECOMMENDS:packagegroup-devel-tdx-cli = "\ bonnie++ \ devmem2 \ evtest \ @@ -76,40 +76,40 @@ RRECOMMENDS_packagegroup-devel-tdx-cli = "\ spidev-test \ strace \ " -RRECOMMENDS_packagegroup-devel-tdx-cli_remove_use-nxp-bsp_colibri-vf = "perf" +RRECOMMENDS:packagegroup-devel-tdx-cli:remove:use-nxp-bsp:colibri-vf = "perf" -SUMMARY_packagegroup-machine-tdx-cli = "Machine specific tools" -RRECOMMENDS_packagegroup-machine-tdx-cli = "\ +SUMMARY:packagegroup-machine-tdx-cli = "Machine specific tools" +RRECOMMENDS:packagegroup-machine-tdx-cli = "\ " -RRECOMMENDS_packagegroup-machine-tdx-cli_apalis-imx6 = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:apalis-imx6 = "\ bmode-usb \ gpio-export \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx6 = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx6 = "\ bmode-usb \ gpio-export \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx6ull = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx6ull = "\ bmode-usb \ mtd-utils-ubifs \ mwifiexap \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx6ull-emmc = "\ +RRECOMMENDS_packagegroup-machine-tdx-cli:colibri-imx6ull-emmc = "\ bmode-usb \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_colibri-imx7 = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:colibri-imx7 = "\ mtd-utils-ubifs \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_mx8 = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:mx8 = "\ mwifiexap \ " -RRECOMMENDS_packagegroup-machine-tdx-cli_tegra124 = "\ +RRECOMMENDS:packagegroup-machine-tdx-cli:tegra124 = "\ hdmi-hotplug \ kernel-modules \ " -SUMMARY_packagegroup-networking-tdx-cli = "Networking specific tools" -RRECOMMENDS_packagegroup-networking-tdx-cli = "\ +SUMMARY:packagegroup-networking-tdx-cli = "Networking specific tools" +RRECOMMENDS:packagegroup-networking-tdx-cli = "\ avahi-autoipd \ curl \ linuxptp \ @@ -118,19 +118,19 @@ RRECOMMENDS_packagegroup-networking-tdx-cli = "\ ptpd \ " -SUMMARY_packagegroup-utils-tdx-cli = "Useful utilities" +SUMMARY:packagegroup-utils-tdx-cli = "Useful utilities" # Entropy source daemon RANDOM_HELPER = "rng-tools" -RANDOM_HELPER_tegra124 = "haveged" +RANDOM_HELPER:tegra124 = "haveged" USB_GADGET = " \ libusbgx \ libusbgx-examples \ " -USB_GADGET_tegra124 = "" +USB_GADGET:tegra124 = "" -RRECOMMENDS_packagegroup-utils-tdx-cli = "\ +RRECOMMENDS:packagegroup-utils-tdx-cli = "\ alsa-utils \ alsa-utils-aplay \ alsa-utils-amixer \ @@ -155,32 +155,32 @@ RRECOMMENDS_packagegroup-utils-tdx-cli = "\ ${USB_GADGET} \ util-linux \ " -RRECOMMENDS_packagegroup-utils-tdx-cli_append_mx8 = " \ +RRECOMMENDS:packagegroup-utils-tdx-cli:append:mx8 = " \ cpuburn-a53 \ " -RRECOMMENDS_packagegroup-utils-tdx-cli_append_tegra124 = " \ +RRECOMMENDS:packagegroup-utils-tdx-cli:append:tegra124 = " \ tegrastats \ " -SUMMARY_packagegroup-utils-large-tdx-cli = "Useful utilities, but large footprint" -RRECOMMENDS_packagegroup-utils-large-tdx-cli = "\ +SUMMARY:packagegroup-utils-large-tdx-cli = "Useful utilities, but large footprint" +RRECOMMENDS:packagegroup-utils-large-tdx-cli = "\ aspell \ file \ joe \ packagegroup-dotnet-deps \ " -SUMMARY_packagegroup-wifi-tdx-cli = "Useful Wi-Fi utilities and firmware" +SUMMARY:packagegroup-wifi-tdx-cli = "Useful Wi-Fi utilities and firmware" BACKPORTS = "" -RRECOMMENDS_packagegroup-wifi-tdx-cli = "\ +RRECOMMENDS:packagegroup-wifi-tdx-cli = "\ ${BACKPORTS} \ hostapd \ hostapd-example \ wireless-regdb-static \ " -SUMMARY_packagegroup-wifi-fw-tdx-cli = "Wi-Fi firmware" -RRECOMMENDS_packagegroup-wifi-fw-tdx-cli = "\ +SUMMARY:packagegroup-wifi-fw-tdx-cli = "Wi-Fi firmware" +RRECOMMENDS:packagegroup-wifi-fw-tdx-cli = "\ linux-firmware-ath10k \ linux-firmware-sd8686 \ linux-firmware-sd8688 \ @@ -193,8 +193,8 @@ RRECOMMENDS_packagegroup-wifi-fw-tdx-cli = "\ linux-firmware-rtl8188 \ " -SUMMARY_packagegroup-wifi-fw-large-tdx-cli = "Wi-Fi firmware with large footprint" -RRECOMMENDS_packagegroup-wifi-fw-large-tdx-cli = "\ +SUMMARY:packagegroup-wifi-fw-large-tdx-cli = "Wi-Fi firmware with large footprint" +RRECOMMENDS:packagegroup-wifi-fw-large-tdx-cli = "\ linux-firmware-ath9k \ linux-firmware-iwlwifi \ " diff --git a/recipes-images/images/packagegroup-tdx-graphical.bb b/recipes-images/images/packagegroup-tdx-graphical.bb index de9e381..7363d4a 100644 --- a/recipes-images/images/packagegroup-tdx-graphical.bb +++ b/recipes-images/images/packagegroup-tdx-graphical.bb @@ -13,7 +13,7 @@ PACKAGES += " \ packagegroup-x11-utils-tdx-graphical \ " -RRECOMMENDS_packagegroup-tdx-graphical = " \ +RRECOMMENDS:packagegroup-tdx-graphical = " \ packagegroup-gstreamer-tdx-graphical \ packagegroup-gpu-tdx-graphical \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ @@ -22,20 +22,20 @@ RRECOMMENDS_packagegroup-tdx-graphical = " \ packagegroup-x11-utils-tdx-graphical', \ '', d), d)} \ " -RRECOMMENDS_packagegroup-tdx-graphical_append_mx8 = " \ +RRECOMMENDS:packagegroup-tdx-graphical:append:mx8 = " \ packagegroup-drm-utils-tdx-graphical \ " -RRECOMMENDS_packagegroup-tdx-graphical_append_upstream = " \ +RRECOMMENDS:packagegroup-tdx-graphical:append:upstream = " \ packagegroup-drm-utils-tdx-graphical \ " -SUMMARY_packagegroup-drm-utils-tdx-graphical = "Utilities for DRM, Direct Rendering Manager" -RRECOMMENDS_packagegroup-drm-utils-tdx-graphical = " \ +SUMMARY:packagegroup-drm-utils-tdx-graphical = "Utilities for DRM, Direct Rendering Manager" +RRECOMMENDS:packagegroup-drm-utils-tdx-graphical = " \ libdrm-tests \ " -SUMMARY_packagegroup-gstreamer-tdx-graphical = "gstreamer packages" -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical = "\ +SUMMARY:packagegroup-gstreamer-tdx-graphical = "gstreamer packages" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical = "\ gstreamer1.0 \ gstreamer1.0-plugins-base \ gstreamer1.0-plugins-good \ @@ -48,12 +48,12 @@ GSTREAMER_MX6QDL = " \ imx-gst1.0-plugin-gplay \ imx-gst1.0-plugin-grecorder \ " -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx6dl = " ${GSTREAMER_MX6QDL}" -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx6q = " ${GSTREAMER_MX6QDL}" -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_colibri-imx6ull = "" -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_colibri-imx6ull-emmc = "" -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx7 = " imx-gst1.0-plugin" -RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx8 = " \ +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6dl = " ${GSTREAMER_MX6QDL}" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx6q = " ${GSTREAMER_MX6QDL}" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:colibri-imx6ull = "" +RRECOMMENDS_packagegroup-gstreamer-tdx-graphical:colibri-imx6ull-emmc = "" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx7 = " imx-gst1.0-plugin" +RRECOMMENDS:packagegroup-gstreamer-tdx-graphical:append:mx8 = " \ imx-gst1.0-plugin \ imx-gst1.0-plugin-gplay \ imx-gst1.0-plugin-grecorder \ @@ -61,27 +61,27 @@ RRECOMMENDS_packagegroup-gstreamer-tdx-graphical_append_mx8 = " \ gst-examples \ " -SUMMARY_packagegroup-gpu-utils-tdx-graphical = "Utilities for GPU (OpenGL...)" +SUMMARY:packagegroup-gpu-utils-tdx-graphical = "Utilities for GPU (OpenGL...)" IMAGE_INSTALL_OPENCL_IMX = " \ clpeak \ libopencl-imx \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical = " \ glmark2 \ " IMAGE_INSTALL_GPU_MX6QDL = " \ packagegroup-fsl-gpu-libs \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx6dl = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6dl = " \ ${IMAGE_INSTALL_GPU_MX6QDL} \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx6q = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx6q = " \ ${IMAGE_INSTALL_GPU_MX6QDL} \ ${IMAGE_INSTALL_OPENCL_IMX} \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_colibri-imx6ull = "" -RRECOMMENDS_packagegroup-gpu-tdx-graphical_colibri-imx6ull-emmc = "" -RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx8 = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:colibri-imx6ull = "" +RRECOMMENDS_packagegroup-gpu-tdx-graphical:colibri-imx6ull-emmc = "" +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8 = " \ tinycompress \ libvdk-imx \ vulkan-headers \ @@ -89,22 +89,22 @@ RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx8 = " \ vulkan-tools \ ${IMAGE_INSTALL_OPENCL_IMX} \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_remove_mx8mm = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:remove:mx8mm = " \ vulkan \ ${IMAGE_INSTALL_OPENCL_IMX} \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_mx8qm = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:mx8qm = " \ libopenvx-imx \ " -RRECOMMENDS_packagegroup-gpu-tdx-graphical_append_tegra124 = " \ +RRECOMMENDS:packagegroup-gpu-tdx-graphical:append:tegra124 = " \ libglu \ freeglut \ tiff \ xvinfo \ " -SUMMARY_packagegroup-x11-components-tdx-graphical = "Components of X11" -RRECOMMENDS_packagegroup-x11-components-tdx-graphical = "\ +SUMMARY:packagegroup-x11-components-tdx-graphical = "Components of X11" +RRECOMMENDS:packagegroup-x11-components-tdx-graphical = "\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ bb.utils.contains('DISTRO_FEATURES', 'x11', \ 'libxcursor \ @@ -121,8 +121,8 @@ RRECOMMENDS_packagegroup-x11-components-tdx-graphical = "\ '', d), d)} \ " -SUMMARY_packagegroup-x11-utils-tdx-graphical = "Utilities for X11" -RRECOMMENDS_packagegroup-x11-utils-tdx-graphical = " \ +SUMMARY:packagegroup-x11-utils-tdx-graphical = "Utilities for X11" +RRECOMMENDS:packagegroup-x11-utils-tdx-graphical = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', '', \ bb.utils.contains('DISTRO_FEATURES', 'x11', \ 'scrot \ diff --git a/recipes-images/images/packagegroup-tdx-qt5.bb b/recipes-images/images/packagegroup-tdx-qt5.bb index f3828ba..293caad 100644 --- a/recipes-images/images/packagegroup-tdx-qt5.bb +++ b/recipes-images/images/packagegroup-tdx-qt5.bb @@ -11,42 +11,42 @@ PACKAGES += " \ ${PN}-libs \ " -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ ${PN}-demos \ ${PN}-fonts \ ${PN}-libs \ " # Only install qtbase-examples with its dependencies on modules with limited # storage and no gpu. -RRECOMMENDS_${PN}_colibri-imx6ull = " \ +RRECOMMENDS:${PN}:colibri-imx6ull = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtbase-examples \ " -RRECOMMENDS_${PN}_colibri-imx6ull-emmc = " \ +RRECOMMENDS_${PN}:colibri-imx6ull-emmc = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtbase-examples \ " -RRECOMMENDS_${PN}_colibri-imx7 = " \ +RRECOMMENDS:${PN}:colibri-imx7 = " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'qtwayland', '', d)} \ qtbase-examples \ " -SUMMARY_${PN}-demos = "QT5 Demos" -RRECOMMENDS_${PN}-demos = " \ +SUMMARY:${PN}-demos = "QT5 Demos" +RRECOMMENDS:${PN}-demos = " \ cinematicexperience \ qtsmarthome \ " -SUMMARY_${PN}-fonts = "Some fonts useful for QT5" -RRECOMMENDS_${PN}-fonts = " \ +SUMMARY:${PN}-fonts = "Some fonts useful for QT5" +RRECOMMENDS:${PN}-fonts = " \ ttf-dejavu-common \ ttf-dejavu-sans \ ttf-dejavu-sans-mono \ ttf-dejavu-serif \ " -SUMMARY_${PN}-libs = "QT5 libraries" -RRECOMMENDS_${PN}-libs = " \ +SUMMARY:${PN}-libs = "QT5 libraries" +RRECOMMENDS:${PN}-libs = " \ qt3d \ qt5ledscreen \ qtbase \ diff --git a/recipes-images/images/tdx-reference-minimal-image.bb b/recipes-images/images/tdx-reference-minimal-image.bb index 0aaa42f..3ac6196 100644 --- a/recipes-images/images/tdx-reference-minimal-image.bb +++ b/recipes-images/images/tdx-reference-minimal-image.bb @@ -16,10 +16,10 @@ COPY_LIC_DIRS ?= "1" # Show Tezi EULA license TEZI_SHOW_EULA_LICENSE ?= "1" -TEZI_SHOW_EULA_LICENSE_apalis-tk1 ?= "0" -TEZI_SHOW_EULA_LICENSE_use-mainline-bsp ?= "0" -TEZI_SHOW_EULA_LICENSE_colibri-imx6_use-mainline-bsp ?= "1" -TEZI_SHOW_EULA_LICENSE_apalis-imx6_use-mainline-bsp ?= "1" +TEZI_SHOW_EULA_LICENSE:apalis-tk1 ?= "0" +TEZI_SHOW_EULA_LICENSE:use-mainline-bsp ?= "0" +TEZI_SHOW_EULA_LICENSE:colibri-imx6:use-mainline-bsp ?= "1" +TEZI_SHOW_EULA_LICENSE:apalis-imx6:use-mainline-bsp ?= "1" add_rootfs_version () { diff --git a/recipes-images/images/tdx-reference-multimedia-image.bb b/recipes-images/images/tdx-reference-multimedia-image.bb index cd9c396..a05ae22 100644 --- a/recipes-images/images/tdx-reference-multimedia-image.bb +++ b/recipes-images/images/tdx-reference-multimedia-image.bb @@ -10,11 +10,11 @@ export IMAGE_BASENAME = "Reference-Multimedia-Image" # Show Tezi EULA license TEZI_SHOW_EULA_LICENSE ?= "1" -TEZI_SHOW_EULA_LICENSE_apalis-tk1 ?= "0" +TEZI_SHOW_EULA_LICENSE:apalis-tk1 ?= "0" -TEZI_SHOW_EULA_LICENSE_use-mainline-bsp ?= "0" -TEZI_SHOW_EULA_LICENSE_colibri-imx6_use-mainline-bsp ?= "1" -TEZI_SHOW_EULA_LICENSE_apalis-imx6_use-mainline-bsp ?= "1" +TEZI_SHOW_EULA_LICENSE:use-mainline-bsp ?= "0" +TEZI_SHOW_EULA_LICENSE:colibri-imx6:use-mainline-bsp ?= "1" +TEZI_SHOW_EULA_LICENSE:apalis-imx6:use-mainline-bsp ?= "1" SYSTEMD_DEFAULT_TARGET = "graphical.target" @@ -26,18 +26,18 @@ IMAGE_FEATURES += " \ " APP_LAUNCH_WAYLAND ?= "wayland-qtdemo-launch-cinematicexperience" -APP_LAUNCH_WAYLAND_colibri-imx6ull ?= "wayland-qtdemo-launch-analogclock" -APP_LAUNCH_WAYLAND_colibri-imx6ull-emmc ?= "wayland-qtdemo-launch-analogclock" -APP_LAUNCH_WAYLAND_colibri-imx7 ?= "wayland-qtdemo-launch-analogclock" -APP_LAUNCH_WAYLAND_colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock" -APP_LAUNCH_WAYLAND_apalis-tk1 ?= "wayland-qtdemo-launch-qtsmarthome" +APP_LAUNCH_WAYLAND:colibri-imx6ull ?= "wayland-qtdemo-launch-analogclock" +APP_LAUNCH_WAYLAND:colibri-imx6ull-emmc ?= "wayland-qtdemo-launch-analogclock" +APP_LAUNCH_WAYLAND:colibri-imx7 ?= "wayland-qtdemo-launch-analogclock" +APP_LAUNCH_WAYLAND:colibri-imx7-emmc ?= "wayland-qtdemo-launch-analogclock" +APP_LAUNCH_WAYLAND:apalis-tk1 ?= "wayland-qtdemo-launch-qtsmarthome" APP_LAUNCH_X11 ?= "x-window-qtcinematicexperience" -APP_LAUNCH_X11_colibri-imx6ull ?= "x-window-analogclock" -APP_LAUNCH_X11_colibri-imx6ull-emmc ?= "x-window-analogclock" -APP_LAUNCH_X11_colibri-imx7 ?= "x-window-analogclock" -APP_LAUNCH_X11_colibri-imx7-emmc ?= "x-window-analogclock" -APP_LAUNCH_X11_apalis-tk1 ?= "x-window-qtsmarthome" +APP_LAUNCH_X11:colibri-imx6ull ?= "x-window-analogclock" +APP_LAUNCH_X11:colibri-imx6ull-emmc ?= "x-window-analogclock" +APP_LAUNCH_X11:colibri-imx7 ?= "x-window-analogclock" +APP_LAUNCH_X11:colibri-imx7-emmc ?= "x-window-analogclock" +APP_LAUNCH_X11:apalis-tk1 ?= "x-window-qtsmarthome" IMAGE_INSTALL += " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', \ diff --git a/recipes-multimedia/codecgraph/codecgraph_20120114.bb b/recipes-multimedia/codecgraph/codecgraph_20120114.bb index 54d596a..f3b687b 100644 --- a/recipes-multimedia/codecgraph/codecgraph_20120114.bb +++ b/recipes-multimedia/codecgraph/codecgraph_20120114.bb @@ -3,7 +3,7 @@ SUMMARY = "Tool to generate a graph of HDA codec config" DESCRIPTION = "Codecgraph is a tool to generate a graph based on the ALSA description of a High Definition Audio codec." HOMEPAGE = "http://helllabs.org/codecgraph/" LICENSE = "GPLv2+" -RDEPENDS_${PN} = "python graphviz" +RDEPENDS:${PN} = "python graphviz" SRC_URI = "http://helllabs.org/codecgraph/codecgraph-${PV}.tar.gz" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" diff --git a/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb b/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb index 51fc4df..6ec7a03 100644 --- a/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb +++ b/recipes-multimedia/mediainfo/mediainfo_0.7.62.bb @@ -28,7 +28,7 @@ do_configure () { oe_runconf } -do_install_prepend () { +do_install:prepend () { #install media info cd ${S} } diff --git a/recipes-sato/webkit/webkitgtk_%.bbappend b/recipes-sato/webkit/webkitgtk_%.bbappend index a3e97ba..6b5c67e 100644 --- a/recipes-sato/webkit/webkitgtk_%.bbappend +++ b/recipes-sato/webkit/webkitgtk_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://minibrowser.desktop" -do_install_append() { +do_install:append() { install -m 0644 -D ${WORKDIR}/minibrowser.desktop ${D}${datadir}/applications/minibrowser.desktop } diff --git a/recipes-support/curl/curl_%.bbappend b/recipes-support/curl/curl_%.bbappend index 9e29003..70c8849 100644 --- a/recipes-support/curl/curl_%.bbappend +++ b/recipes-support/curl/curl_%.bbappend @@ -1,3 +1,3 @@ # Use default packageconfig but .NET Core 2.0 prefers OpenSSL backend -PACKAGECONFIG_remove = "gnutls" -PACKAGECONFIG_append = " ssl" +PACKAGECONFIG:remove = "gnutls" +PACKAGECONFIG:append = " ssl" diff --git a/recipes-support/florence/florence3_0.6.3.bb b/recipes-support/florence/florence3_0.6.3.bb index 37f2973..d82b57c 100644 --- a/recipes-support/florence/florence3_0.6.3.bb +++ b/recipes-support/florence/florence3_0.6.3.bb @@ -12,9 +12,9 @@ DEPENDS = "cairo gconf glib-2.0-native gnome-doc-utils gstreamer1.0 gtk+3 intlto PROVIDES += "florence" -RPROVIDES_${PN} += "florence" -RREPLACES_${PN} += "florence" -RCONFLICTS_${PN} += "florence" +RPROVIDES:${PN} += "florence" +RREPLACES:${PN} += "florence" +RCONFLICTS:${PN} += "florence" SRC_URI = " \ ${SOURCEFORGE_MIRROR}/florence/florence/${PV}/florence-${PV}.tar.bz2 \ @@ -25,6 +25,6 @@ SRC_URI[sha256sum] = "422992fd07d285be73cce721a203e22cee21320d69b0fda1579ce62944 S = "${WORKDIR}/florence-${PV}" inherit gettext autotools gconf pkgconfig gsettings -FILES_${PN} += "${datadir}/florence" +FILES:${PN} += "${datadir}/florence" EXTRA_OECONF = "--disable-scrollkeeper --without-docs --without-at-spi --without-panelapplet --without-xrecord --without-sound" diff --git a/recipes-support/florence/florence3_0.6.3.bbappend b/recipes-support/florence/florence3_0.6.3.bbappend index 4e79209..ddddf4b 100644 --- a/recipes-support/florence/florence3_0.6.3.bbappend +++ b/recipes-support/florence/florence3_0.6.3.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/florence3:" +FILESEXTRAPATHS:prepend := "${THISDIR}/florence3:" SRC_URI += "file://0001-make-sound-a-configure-option.patch" EXTRA_OECONF += " --without-sound" diff --git a/recipes-support/florence/florence_0.5.4.bbappend b/recipes-support/florence/florence_0.5.4.bbappend index 5d46356..a2c751d 100644 --- a/recipes-support/florence/florence_0.5.4.bbappend +++ b/recipes-support/florence/florence_0.5.4.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://0001-make-sound-a-configure-option.patch" EXTRA_OECONF += " --without-sound" diff --git a/recipes-support/gpio-tool/gpio-tool.bb b/recipes-support/gpio-tool/gpio-tool.bb index b3bd714..9ee6029 100644 --- a/recipes-support/gpio-tool/gpio-tool.bb +++ b/recipes-support/gpio-tool/gpio-tool.bb @@ -18,7 +18,7 @@ PACKAGES = "${PN}" #no gnu_hash in binaries, skip QA dev-so for this package #we have symlinks ending in .so, skip QA ldflags for this package #inhibit warnings about files being stripped -INSANE_SKIP_${PN} = "ldflags already-stripped" +INSANE_SKIP:${PN} = "ldflags already-stripped" # just don't do any configuring do_configure() { @@ -35,6 +35,6 @@ do_install() { ln -s ${datadir}/applications/gpio-tool.desktop ${D}/home/root/Desktop/ } -FILES_${PN} += " \ +FILES:${PN} += " \ /home/root/Desktop \ " diff --git a/recipes-support/libfm/libfm_%.bbappend b/recipes-support/libfm/libfm_%.bbappend index fc8b8e9..89a4719 100644 --- a/recipes-support/libfm/libfm_%.bbappend +++ b/recipes-support/libfm/libfm_%.bbappend @@ -1,3 +1,3 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://libfm_set_terminal.patch" diff --git a/recipes-support/tdx-oak-sensors/tdx-oak-sensors_0082.bb b/recipes-support/tdx-oak-sensors/tdx-oak-sensors_0082.bb index fc13b98..e1d1f3d 100644 --- a/recipes-support/tdx-oak-sensors/tdx-oak-sensors_0082.bb +++ b/recipes-support/tdx-oak-sensors/tdx-oak-sensors_0082.bb @@ -11,5 +11,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1c3a7fb45253c11c74434676d84fe7dd" inherit autotools -FILES_${PN} += "" +FILES:${PN} += "" -- cgit v1.2.3