From 28ed54d3b2cc89dbb482e1950aec62365beb4dda Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Thu, 1 Feb 2018 20:30:37 +0100 Subject: recipes: use oe.utils.conditional instead of deprecated base_conditional Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- recipes-images/images/angstrom-lxde-image.bb | 2 +- recipes-images/images/angstrom-lxqt-image.bb | 2 +- recipes-images/images/angstrom-qt-x11-image.bb | 2 +- recipes-images/images/angstrom-qt5-x11-image.bb | 2 +- recipes-images/images/console-tdx-image.bb | 2 +- recipes-images/images/qt4e-demo-image.bb | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/recipes-images/images/angstrom-lxde-image.bb b/recipes-images/images/angstrom-lxde-image.bb index 67246d7..dd05c8c 100644 --- a/recipes-images/images/angstrom-lxde-image.bb +++ b/recipes-images/images/angstrom-lxde-image.bb @@ -28,7 +28,7 @@ IMAGE_LINGUAS = "en-us" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' +ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' CONMANPKGS ?= "connman connman-client connman-gnome" CONMANPKGS_libc-uclibc = "" diff --git a/recipes-images/images/angstrom-lxqt-image.bb b/recipes-images/images/angstrom-lxqt-image.bb index 14fa760..d76e8e3 100644 --- a/recipes-images/images/angstrom-lxqt-image.bb +++ b/recipes-images/images/angstrom-lxqt-image.bb @@ -30,7 +30,7 @@ IMAGE_LINGUAS = "en-us" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' +ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' # for a more complete configuration tool consider replacing lxqt-connman-applet # with cmst at the price of a bigger footprint diff --git a/recipes-images/images/angstrom-qt-x11-image.bb b/recipes-images/images/angstrom-qt-x11-image.bb index fb0a2c7..66b85aa 100644 --- a/recipes-images/images/angstrom-qt-x11-image.bb +++ b/recipes-images/images/angstrom-qt-x11-image.bb @@ -28,7 +28,7 @@ IMAGE_LINGUAS = "en-us" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' +ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" CONMANPKGS_libc-uclibc = "" diff --git a/recipes-images/images/angstrom-qt5-x11-image.bb b/recipes-images/images/angstrom-qt5-x11-image.bb index ec5edef..a98f64a 100644 --- a/recipes-images/images/angstrom-qt5-x11-image.bb +++ b/recipes-images/images/angstrom-qt5-x11-image.bb @@ -34,7 +34,7 @@ IMAGE_LINGUAS = "en-us" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' +ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" CONMANPKGS_libc-uclibc = "" diff --git a/recipes-images/images/console-tdx-image.bb b/recipes-images/images/console-tdx-image.bb index 1f7e54f..4c798e3 100644 --- a/recipes-images/images/console-tdx-image.bb +++ b/recipes-images/images/console-tdx-image.bb @@ -28,7 +28,7 @@ IMAGE_LINGUAS = "en-us" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' +ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" CONMANPKGS_libc-uclibc = "" diff --git a/recipes-images/images/qt4e-demo-image.bb b/recipes-images/images/qt4e-demo-image.bb index 907991a..0e60f1e 100644 --- a/recipes-images/images/qt4e-demo-image.bb +++ b/recipes-images/images/qt4e-demo-image.bb @@ -21,7 +21,7 @@ IMAGE_LINGUAS = "en-us" #ROOTFS_POSTPROCESS_COMMAND += 'install_linguas; ' DISTRO_UPDATE_ALTERNATIVES ??= "" -ROOTFS_PKGMANAGE_PKGS ?= '${@base_conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' +ROOTFS_PKGMANAGE_PKGS ?= '${@oe.utils.conditional("ONLINE_PACKAGE_MANAGEMENT", "none", "", "${ROOTFS_PKGMANAGE} ${DISTRO_UPDATE_ALTERNATIVES}", d)}' CONMANPKGS ?= "connman connman-plugin-loopback connman-plugin-ethernet connman-plugin-wifi connman-client" CONMANPKGS_libc-uclibc = "" -- cgit v1.2.3