global: overrides conversion

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

10 files changed, 93 insertions, 93 deletions

diff --git a/meta-openstack/recipes-support/chef/chef_git.bb b/meta-openstack/recipes-support/chef/chef_git.bb
index 86e4165..8a32584 100644
--- a/meta-openstack/recipes-support/chef/chef_git.bb
+++ b/meta-openstack/recipes-support/chef/chef_git.bb
@@ -31,7 +31,7 @@ DEPENDS += " \
         bundler-native \
         "
 
-RDEPENDS_${PN} += " \
+RDEPENDS:${PN} += " \
         ruby \
         chef-zero \
         coderay \
@@ -64,9 +64,9 @@ RDEPENDS_${PN} += " \
 
 RUBY_INSTALL_GEMS = "pkg/chef-${BPV}.gem"
 
-FILES_${PN} += "${libdir}/ruby/gems/2.2.0/build_info"
-FILES_${PN} += "${libdir}/ruby/gems/2.2.0/extensions"
+FILES:${PN} += "${libdir}/ruby/gems/2.2.0/build_info"
+FILES:${PN} += "${libdir}/ruby/gems/2.2.0/extensions"
 
-do_install_prepend() {
+do_install:prepend() {
         rake gem
 }
diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_openstack.inc b/meta-openstack/recipes-support/dnsmasq/dnsmasq_openstack.inc
index 0c979fe..d731da2 100644
--- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_openstack.inc
+++ b/meta-openstack/recipes-support/dnsmasq/dnsmasq_openstack.inc
@@ -1,4 +1,4 @@
-do_install_append() {
+do_install:append() {
     # Remove /var/run as it is created on startup
     rm -rf ${D}${localstatedir}/run
 }
diff --git a/meta-openstack/recipes-support/ebtables/ebtables_openstack.inc b/meta-openstack/recipes-support/ebtables/ebtables_openstack.inc
index 9f6f2e6..83aff01 100644
--- a/meta-openstack/recipes-support/ebtables/ebtables_openstack.inc
+++ b/meta-openstack/recipes-support/ebtables/ebtables_openstack.inc
@@ -1,4 +1,4 @@
-RRECOMMENDS_${PN} += " \
+RRECOMMENDS:${PN} += " \
         kernel-module-ebtables \
         kernel-module-ebtable-nat \
         kernel-module-ebt-arp \
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_openstack.inc b/meta-openstack/recipes-support/iproute2/iproute2_openstack.inc
index 2fde00d..f0302b0 100644
--- a/meta-openstack/recipes-support/iproute2/iproute2_openstack.inc
+++ b/meta-openstack/recipes-support/iproute2/iproute2_openstack.inc
@@ -1,4 +1,4 @@
-FILESEXTRAPATHS_append := "${THISDIR}/${PN}"
+FILESEXTRAPATHS:append := "${THISDIR}/${PN}"
 
-RRECOMMENDS_${PN} += "kernel-module-veth \
+RRECOMMENDS:${PN} += "kernel-module-veth \
         "
diff --git a/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb b/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb
index b2d776b..bc8ae25 100644
--- a/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb
+++ b/meta-openstack/recipes-support/memcached/memcached_1.5.3.bb
@@ -15,7 +15,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7e5ded7363d335e1bb18013ca08046ff"
 inherit autotools systemd
 
 DEPENDS += "libevent"
-RDEPENDS_${PN} += "\
+RDEPENDS:${PN} += "\
     bash \
     perl \
     perl-module-posix \
@@ -51,9 +51,9 @@ INITSCRIPT_NAME = "memcached"
 INITSCRIPT_PARAMS = "defaults"
 
 SYSTEMD_PACKAGES = "memcached"
-SYSTEMD_SERVICE_${PN} = "memcached.service"
+SYSTEMD_SERVICE:${PN} = "memcached.service"
 
-do_install_append() {
+do_install:append() {
     install -D -m 755 ${S}/scripts/memcached-init ${D}${sysconfdir}/init.d/memcached
     
     mkdir -p ${D}/usr/share/memcached/scripts
diff --git a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
index 73dab13..fbb46d3 100644
--- a/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
+++ b/meta-openstack/recipes-support/mod-wsgi/mod-wsgi_git.bb
@@ -23,7 +23,7 @@ SRC_URI = "\
 inherit autotools-brokensep distutils3-base
 
 DEPENDS += "apache2-native apache2 python3"
-RDEPENDS_${PN} = "python3"
+RDEPENDS:${PN} = "python3"
 
 EXTRA_OECONF = "\
         --with-apxs=${STAGING_BINDIR_CROSS}/apxs \
@@ -42,10 +42,10 @@ EXTRA_OECONF = "\
 
 CFLAGS += " -I${STAGING_INCDIR}/apache2"
 
-FILES_${PN} += "/etc/apache2/"
-FILES_${PN}-dbg += "${libdir}/apache2/modules/.debug"
+FILES:${PN} += "/etc/apache2/"
+FILES:${PN}-dbg += "${libdir}/apache2/modules/.debug"
 
-do_install_append() {
+do_install:append() {
         mkdir -p ${D}/etc/apache2/modules.d/
         echo "LoadModule wsgi_module ${libexecdir}/apache2/modules/mod_wsgi.so" > \
           ${D}/etc/apache2/modules.d/wsgi.load
diff --git a/meta-openstack/recipes-support/openldap/openldap_openstack.inc b/meta-openstack/recipes-support/openldap/openldap_openstack.inc
index 63f6064..603dc3f 100644
--- a/meta-openstack/recipes-support/openldap/openldap_openstack.inc
+++ b/meta-openstack/recipes-support/openldap/openldap_openstack.inc
@@ -1,7 +1,7 @@
 DEPEND_${PN} += "cyrus-sasl" 
 RDEPEND_${PN} += "libsasl2-modules"
 
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
 SRC_URI += "file://initscript"
 SRC_URI += "file://ops-base.ldif"
 
@@ -12,7 +12,7 @@ OPENLDAP_LIBEXECDIR = "${libexecdir}"
 
 EXTRA_OECONF += "--libexecdir=${OPENLDAP_LIBEXECDIR}"
 
-do_install_append() {
+do_install:append() {
     install -D -m 0755 ${WORKDIR}/initscript ${D}${sysconfdir}/init.d/openldap
     sed -i -e 's/%DEFAULT_DN%/${LDAP_DN}/g' ${D}${sysconfdir}/init.d/openldap
     sed -i -e 's#%LDAP_DATADIR%#${LDAP_DATADIR}#g' ${D}${sysconfdir}/init.d/openldap
@@ -69,5 +69,5 @@ inherit update-rc.d
 INITSCRIPT_NAME = "openldap"
 INITSCRIPT_PARAMS = "defaults"
 
-FILES_${PN} += "${OPENLDAP_LIBEXECDIR}/* ${sysconfdir}/openldap/ops-base.ldif"
-FILES_${PN}-dbg += "${OPENLDAP_LIBEXECDIR}/openldap/.debug ${OPENLDAP_LIBEXECDIR}/.debug"
+FILES:${PN} += "${OPENLDAP_LIBEXECDIR}/* ${sysconfdir}/openldap/ops-base.ldif"
+FILES:${PN}-dbg += "${OPENLDAP_LIBEXECDIR}/openldap/.debug ${OPENLDAP_LIBEXECDIR}/.debug"
diff --git a/meta-openstack/recipes-support/salt/salt_3001.1.bb b/meta-openstack/recipes-support/salt/salt_3001.1.bb
index 9b485d6..9c6e132 100644
--- a/meta-openstack/recipes-support/salt/salt_3001.1.bb
+++ b/meta-openstack/recipes-support/salt/salt_3001.1.bb
@@ -25,9 +25,9 @@ SRC_URI[md5sum] = "4174a6dd2c7eee808086ca06bdd928c9"
 SRC_URI[sha256sum] = "e9ebb4d92fae8dabf21b8749dc126e4a4048bf8f613f5b1b851fe4b8226b5abc"
 
 
-SYSTEMD_AUTO_ENABLE_${PN}-master = "disable"
-SYSTEMD_AUTO_ENABLE_${PN}-minion = "disable"
-SYSTEMD_AUTO_ENABLE_${PN}-api = "disable"
+SYSTEMD_AUTO_ENABLE:${PN}-master = "disable"
+SYSTEMD_AUTO_ENABLE:${PN}-minion = "disable"
+SYSTEMD_AUTO_ENABLE:${PN}-api = "disable"
 
 S = "${WORKDIR}/${PN}-${PV}"
 
@@ -35,9 +35,9 @@ inherit setuptools3 systemd
 
 # Avoid a QA Warning triggered by the test package including a file
 # with a .a extension
-INSANE_SKIP_${PN}-tests += "staticdev"
+INSANE_SKIP:${PN}-tests += "staticdev"
 
-RDEPENDS_${PN} += "${PN}-api \
+RDEPENDS:${PN} += "${PN}-api \
                    ${PN}-common \
                    ${PN}-master \
                    ${PN}-minion \
@@ -58,7 +58,7 @@ PACKAGES += "\
            ${PN}-zsh-completion \
 "
 
-do_install_append() {
+do_install:append() {
         install -Dm644 ${S}/pkg/salt-common.logrotate ${D}${sysconfdir}/logrotate.d/${PN}
         install -Dm644 ${S}/pkg/salt.bash ${D}${datadir}/bash-completion/completions/${PN}
         install -Dm644 ${S}/pkg/zsh_completion.zsh ${D}${datadir}/zsh/site-functions/_${PN}
@@ -73,9 +73,9 @@ do_install_append() {
         done
 }
 
-ALLOW_EMPTY_${PN} = "1"
-FILES_${PN} = ""
-FILES_${PN} += "${systemd_system_unitdir} ${systemd_system_unitdir}/* /etc/salt/master.d /etc/salt/master.d/preseed_key.py"
+ALLOW_EMPTY:${PN} = "1"
+FILES:${PN} = ""
+FILES:${PN} += "${systemd_system_unitdir} ${systemd_system_unitdir}/* /etc/salt/master.d /etc/salt/master.d/preseed_key.py"
 
 DESCRIPTION_COMMON = "salt is a powerful remote execution manager that can be used to administer servers in a\
  fast and efficient way. It allows commands to be executed across large groups of servers. This means systems\
@@ -85,74 +85,74 @@ DESCRIPTION_COMMON = "salt is a powerful remote execution manager that can be us
 Between the remote execution system, and state management Salt addresses the backbone of cloud and data center\
  management."
 
-SUMMARY_${PN}-minion = "client package for salt, the distributed remote execution system"
-DESCRIPTION_${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt."
-RDEPENDS_${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
-RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
-RDEPENDS_${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
-RRECOMMENDS_${PN}-minion_append_x64 = "dmidecode"
-RSUGGESTS_${PN}-minion = "python3-augeas"
-CONFFILES_${PN}-minion = "${sysconfdir}/${PN}/minion"
-FILES_${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy ${systemd_system_unitdir}/salt-minion.service"
-
-SUMMARY_${PN}-common = "shared libraries that salt requires for all packages"
-DESCRIPTION_${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \
+SUMMARY:${PN}-minion = "client package for salt, the distributed remote execution system"
+DESCRIPTION:${PN}-minion = "${DESCRIPTION_COMMON} This particular package provides the worker agent for salt."
+RDEPENDS:${PN}-minion = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
+RDEPENDS:${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
+RDEPENDS:${PN}-minion += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
+RRECOMMENDS:${PN}-minion:append_x64 = "dmidecode"
+RSUGGESTS:${PN}-minion = "python3-augeas"
+CONFFILES:${PN}-minion = "${sysconfdir}/${PN}/minion"
+FILES:${PN}-minion = "${bindir}/${PN}-minion ${sysconfdir}/${PN}/minion.d/ ${CONFFILES_${PN}-minion} ${bindir}/${PN}-proxy ${systemd_system_unitdir}/salt-minion.service"
+
+SUMMARY:${PN}-common = "shared libraries that salt requires for all packages"
+DESCRIPTION:${PN}-common ="${DESCRIPTION_COMMON} This particular package provides shared libraries that \
 salt-master, salt-minion, and salt-syndic require to function."
-RDEPENDS_${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-distro"
-RRECOMMENDS_${PN}-common = "lsb-release"
-RSUGGESTS_${PN}-common = "python3-mako python3-git"
-RCONFLICTS_${PN}-common = "python3-mako (< 0.7.0)"
-CONFFILES_${PN}-common="${sysconfdir}/logrotate.d/${PN}"
-FILES_${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}"
-
-SUMMARY_${PN}-ssh = "remote manager to administer servers via salt"
-DESCRIPTION_${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \
+RDEPENDS:${PN}-common = "python3-dateutil python3-jinja2 python3-pyyaml python3-requests (>= 1.0.0) python3-distro"
+RRECOMMENDS:${PN}-common = "lsb-release"
+RSUGGESTS:${PN}-common = "python3-mako python3-git"
+RCONFLICTS:${PN}-common = "python3-mako (< 0.7.0)"
+CONFFILES:${PN}-common="${sysconfdir}/logrotate.d/${PN}"
+FILES:${PN}-common = "${bindir}/${PN}-call ${PYTHON_SITEPACKAGES_DIR}/* ${CONFFILES_${PN}-common}"
+
+SUMMARY:${PN}-ssh = "remote manager to administer servers via salt"
+DESCRIPTION:${PN}-ssh = "${DESCRIPTION_COMMON} This particular package provides the salt ssh controller. It \
 is able to run salt modules and states on remote hosts via ssh. No minion or other salt specific software needs\
  to be installed on the remote host."
-RDEPENDS_${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
-CONFFILES_${PN}-ssh="${sysconfdir}/${PN}/roster"
-FILES_${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}"
+RDEPENDS:${PN}-ssh = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack"
+CONFFILES:${PN}-ssh="${sysconfdir}/${PN}/roster"
+FILES:${PN}-ssh = "${bindir}/${PN}-ssh ${CONFFILES_${PN}-ssh}"
 
-SUMMARY_${PN}-api = "generic, modular network access system"
-DESCRIPTION_${PN}-api = "a modular interface on top of Salt that can provide a variety of entry points into a \
+SUMMARY:${PN}-api = "generic, modular network access system"
+DESCRIPTION:${PN}-api = "a modular interface on top of Salt that can provide a variety of entry points into a \
 running Salt system. It can start and manage multiple interfaces allowing a REST API to coexist with XMLRPC or \
 even a Websocket API. The Salt API system is used to expose the fundamental aspects of Salt control to external\
  sources. salt-api acts as the bridge between Salt itself and REST, Websockets, etc. Documentation is available\
  on Read the Docs: http://salt-api.readthedocs.org/"
-RDEPENDS_${PN}-api = "${PN}-master"
-RSUGGESTS_${PN}-api = "python3-cherrypy"
-CONFFILES_${PN}-api = "${sysconfdir}/init.d/${PN}-api"
-FILES_${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_unitdir}/${PN}-api.service"
+RDEPENDS:${PN}-api = "${PN}-master"
+RSUGGESTS:${PN}-api = "python3-cherrypy"
+CONFFILES:${PN}-api = "${sysconfdir}/init.d/${PN}-api"
+FILES:${PN}-api = "${bindir}/${PN}-api ${CONFFILES_${PN}-api} ${systemd_system_unitdir}/${PN}-api.service"
 
 
-SUMMARY_${PN}-master = "remote manager to administer servers via salt"
-DESCRIPTION_${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller."
-RDEPENDS_${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
-RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
-RDEPENDS_${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
-CONFFILES_${PN}-master="${sysconfdir}/init.d/${PN}-master  ${sysconfdir}/${PN}/master"
-RSUGGESTS_${PN}-master = "python3-git"
-FILES_${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master} ${systemd_system_unitdir}/${PN}-master.service"
+SUMMARY:${PN}-master = "remote manager to administer servers via salt"
+DESCRIPTION:${PN}-master ="${DESCRIPTION_COMMON} This particular package provides the salt controller."
+RDEPENDS:${PN}-master = "${PN}-common (= ${EXTENDPKGV}) python3-msgpack python3-pycryptodomex (>= 3.9.7)"
+RDEPENDS:${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'zeromq', 'python3-pycrypto python3-pyzmq (>= 13.1.0)', '',d)}"
+RDEPENDS:${PN}-master += "${@bb.utils.contains('PACKAGECONFIG', 'tcp', 'python3-pycrypto', '',d)}"
+CONFFILES:${PN}-master="${sysconfdir}/init.d/${PN}-master  ${sysconfdir}/${PN}/master"
+RSUGGESTS:${PN}-master = "python3-git"
+FILES:${PN}-master = "${bindir}/${PN} ${bindir}/${PN}-cp ${bindir}/${PN}-key ${bindir}/${PN}-master ${bindir}/${PN}-run ${bindir}/${PN}-unity ${bindir}/spm ${CONFFILES_${PN}-master} ${systemd_system_unitdir}/${PN}-master.service"
 
 
-SUMMARY_${PN}-syndic = "master-of-masters for salt, the distributed remote execution system"
-DESCRIPTION_${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \
+SUMMARY:${PN}-syndic = "master-of-masters for salt, the distributed remote execution system"
+DESCRIPTION:${PN}-syndic = "${DESCRIPTION_COMMON} This particular package provides the master of masters for \
 salt; it enables the management of multiple masters at a time."
-RDEPENDS_${PN}-syndic = "${PN}-master (= ${EXTENDPKGV})"
-CONFFILES_${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic"
-FILES_${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic} ${systemd_system_unitdir}/${PN}-syndic.service"
-
-SUMMARY_${PN}-cloud = "public cloud VM management system"
-DESCRIPTION_${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system."
-RDEPENDS_${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})"
-RSUGGESTS_${PN}-cloud = "python3-netaddr python3-botocore"
-CONFFILES_${PN}-cloud = "${sysconfdir}/${PN}/cloud"
-FILES_${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}"
-
-SUMMARY_${PN}-tests = "salt stack test suite"
-DESCRIPTION_${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite."
-RDEPENDS_${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash"
-FILES_${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/"
-
-FILES_${PN}-bash-completion = "${datadir}/bash-completion"
-FILES_${PN}-zsh-completion = "${datadir}/zsh/site-functions"
+RDEPENDS:${PN}-syndic = "${PN}-master (= ${EXTENDPKGV})"
+CONFFILES:${PN}-syndic="${sysconfdir}/init.d/${PN}-syndic"
+FILES:${PN}-syndic = "${bindir}/${PN}-syndic ${CONFFILES_${PN}-syndic} ${systemd_system_unitdir}/${PN}-syndic.service"
+
+SUMMARY:${PN}-cloud = "public cloud VM management system"
+DESCRIPTION:${PN}-cloud = "provision virtual machines on various public clouds via a cleanly controlled profile and mapping system."
+RDEPENDS:${PN}-cloud = "${PN}-common (= ${EXTENDPKGV})"
+RSUGGESTS:${PN}-cloud = "python3-netaddr python3-botocore"
+CONFFILES:${PN}-cloud = "${sysconfdir}/${PN}/cloud"
+FILES:${PN}-cloud = "${bindir}/${PN}-cloud ${sysconfdir}/${PN}/cloud.conf.d/ ${sysconfdir}/${PN}/cloud.profiles.d/ ${sysconfdir}/${PN}/cloud.providers.d/ ${CONFFILES_${PN}-cloud}"
+
+SUMMARY:${PN}-tests = "salt stack test suite"
+DESCRIPTION:${PN}-tests ="${DESCRIPTION_COMMON} This particular package provides the salt unit test suite."
+RDEPENDS:${PN}-tests = "${PN}-common python3-pytest-salt python3-tests python3-image bash"
+FILES:${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/salt-tests/tests/"
+
+FILES:${PN}-bash-completion = "${datadir}/bash-completion"
+FILES:${PN}-zsh-completion = "${datadir}/zsh/site-functions"
diff --git a/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb b/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
index b488130..2006e1f 100644
--- a/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
+++ b/meta-openstack/recipes-support/spice-html5/spice-html5_git.bb
@@ -23,7 +23,7 @@ SRC_URI = "git://anongit.freedesktop.org/spice/spice-html5"
 
 S = "${WORKDIR}/git"
 
-RDEPENDS_${PN} = "python-websockify"
+RDEPENDS:${PN} = "python-websockify"
 
 do_install() {
         oe_runmake DESTDIR="${D}" datadir="${D}/${datadir}" install
diff --git a/meta-openstack/recipes-support/tgt/tgt_git.bb b/meta-openstack/recipes-support/tgt/tgt_git.bb
index 5242dd5..d74de4e 100644
--- a/meta-openstack/recipes-support/tgt/tgt_git.bb
+++ b/meta-openstack/recipes-support/tgt/tgt_git.bb
@@ -19,12 +19,12 @@ SRC_URI += "file://tgtd.init \
 
 S = "${WORKDIR}/git"
 
-CONFFILES_${PN} += "${sysconfdir}/tgt/targets.conf"
+CONFFILES:${PN} += "${sysconfdir}/tgt/targets.conf"
 
 inherit update-rc.d systemd
 
-SYSTEMD_SERVICE_${PN} = "tgtd.service"
-SYSTEMD_AUTO_ENABLE_${PN} = "disable"
+SYSTEMD_SERVICE:${PN} = "tgtd.service"
+SYSTEMD_AUTO_ENABLE:${PN} = "disable"
 
 CFLAGS += ' -I. -DUSE_SIGNALFD -DUSE_TIMERFD -D_GNU_SOURCE -DTGT_VERSION=\\"1.0.63\\" -DBSDIR=\\"${libdir}/backing-store\\"'
 
@@ -50,11 +50,11 @@ do_install() {
     fi
 }
 
-FILES_${PN} += "${systemd_unitdir}/system/tgtd.service \
+FILES:${PN} += "${systemd_unitdir}/system/tgtd.service \
                 ${sysconfdir}/sysconfig/tgtd \
 "
 
-RDEPENDS_${PN} = " \
+RDEPENDS:${PN} = " \
     bash \
     libaio \
     libconfig-general-perl \
@@ -88,5 +88,5 @@ RDEPENDS_${PN} = " \
     perl-module-constant \
     "
 INITSCRIPT_PACKAGES = "${PN}"
-INITSCRIPT_NAME_${PN} = "tgtd"
+INITSCRIPT_NAME:${PN} = "tgtd"