diff options
Diffstat (limited to 'meta-openstack/recipes-extended')
27 files changed, 71 insertions, 349 deletions
diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch b/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch deleted file mode 100644 index 869fb311..00000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud-init-source-local-lsb-functions.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 72dd3b4b38705442d821fe97a40061f23e748769 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Thu, 6 Mar 2014 01:55:09 -0500 -Subject: [PATCH] cloud-init: source local lsb functions - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - sysvinit/debian/cloud-config | 1 + - sysvinit/debian/cloud-final | 1 + - sysvinit/debian/cloud-init | 1 + - sysvinit/debian/cloud-init-local | 1 + - 4 files changed, 4 insertions(+) - -diff --git a/sysvinit/debian/cloud-config b/sysvinit/debian/cloud-config -index 53322748ac65..7874dcfab9b0 100644 ---- a/sysvinit/debian/cloud-config -+++ b/sysvinit/debian/cloud-config -@@ -30,6 +30,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-final b/sysvinit/debian/cloud-final -index 55afc8b0678a..661314f0b64c 100644 ---- a/sysvinit/debian/cloud-final -+++ b/sysvinit/debian/cloud-final -@@ -32,6 +32,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-init b/sysvinit/debian/cloud-init -index 48fa04233f00..d3ccec99bacc 100755 ---- a/sysvinit/debian/cloud-init -+++ b/sysvinit/debian/cloud-init -@@ -30,6 +30,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in -diff --git a/sysvinit/debian/cloud-init-local b/sysvinit/debian/cloud-init-local -index 802ee8e9f386..c309e8347324 100644 ---- a/sysvinit/debian/cloud-init-local -+++ b/sysvinit/debian/cloud-init-local -@@ -29,6 +29,7 @@ SCRIPTNAME=/etc/init.d/$NAME - # Depend on lsb-base (>= 3.2-14) to ensure that this file is present - # and status_of_proc is working. - . /lib/lsb/init-functions -+. /etc/init.d/functions - - if init_is_upstart; then - case "$1" in --- -1.7.10.4 - diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg b/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg deleted file mode 100644 index f8689363..00000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/cloud.cfg +++ /dev/null @@ -1,99 +0,0 @@ -# The top level settings are used as module -# and system configuration. - -# A set of users which may be applied and/or used by various modules -# when a 'default' entry is found it will reference the 'default_user' -# from the distro configuration specified below -users: - - default - -# If this is set, 'root' will not be able to ssh in and they -# will get a message to login instead as the above $user (ubuntu) -disable_root: False - -# This will cause the set+update hostname module to not operate (if true) -preserve_hostname: false -manage_etc_hosts: %MANAGE_HOSTS% - -datasource_list: - - None - -# Example datasource config -# datasource: -# Ec2: -# metadata_urls: [ 'blah.com' ] -# timeout: 5 # (defaults to 50 seconds) -# max_wait: 10 # (defaults to 120 seconds) - -# The modules that run in the 'init' stage -cloud_init_modules: - - migrator - - seed_random - - bootcmd - - write-files - - growpart - - set_hostname - - update_hostname - - update_etc_hosts - - ca-certs - - rsyslog - - users-groups - - ssh - -# The modules that run in the 'config' stage -cloud_config_modules: -# Emit the cloud config ready event -# this can be used by upstart jobs for 'start on cloud-config'. - - emit_upstart - - disk_setup - - mounts - - ssh-import-id - - locale - - set-passwords - - grub-dpkg - - apt-pipelining - - apt-configure - - package-update-upgrade-install - - landscape - - timezone - - puppet - - chef - - salt-minion - - mcollective - - disable-ec2-metadata - - runcmd - - byobu - -# The modules that run in the 'final' stage -cloud_final_modules: - - rightscale_userdata - - scripts-per-once - - scripts-per-boot - - scripts-per-instance - - scripts-user - - ssh-authkey-fingerprints - - keys-to-console - - phone-home - - final-message - - power-state-change - -# set the hostname -hostname: %HOSTNAME% - -# System and/or distro specific settings -# (not accessible to handlers/transforms) -system_info: - # This will affect which distro class gets used - distro: windriver - # Default user name + that default users groups (if added/used) - default_user: - name: root - lock_passwd: False - groups: [adm, audio, cdrom, dialout, dip, floppy, netdev, plugdev, sudo, video] - sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/bash - # Other config here will be given to the distro class and/or path classes - paths: - cloud_dir: /var/lib/cloud/ - templates_dir: /etc/cloud/templates/ - ssh_svcname: ssh diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch b/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch deleted file mode 100644 index f52faf39..00000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init/distros-add-windriver-skeleton-distro-file.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6ad7caf6410237f3b1bed6ff4d9f0423e69afcd6 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Mon, 10 Mar 2014 00:57:18 -0400 -Subject: [PATCH] distros: add windriver skeleton distro file - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - cloudinit/distros/windriver.py | 24 ++++++++++++++++++++++++ - 1 file changed, 24 insertions(+) - create mode 100644 cloudinit/distros/windriver.py - -diff --git a/cloudinit/distros/windriver.py b/cloudinit/distros/windriver.py -new file mode 100644 -index 000000000000..8eec13fe2207 ---- /dev/null -+++ b/cloudinit/distros/windriver.py -@@ -0,0 +1,24 @@ -+# vi: ts=4 expandtab -+# -+# Copyright (C) 2014 WindRiver -+# -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License version 3, as -+# published by the Free Software Foundation. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <http://www.gnu.org/licenses/>. -+ -+from cloudinit.distros import debian -+from cloudinit import log as logging -+ -+LOG = logging.getLogger(__name__) -+ -+ -+class Distro(debian.Distro): -+ pass --- -1.7.10.4 - diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb deleted file mode 100644 index 8bbbef1e..00000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Init scripts for use on cloud images" -HOMEPAGE = "https://launchpad.net/cloud-init" -SECTION = "devel/python" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" - -PR = "r0" - -SRC_URI = "https://launchpad.net/cloud-init/trunk/${PV}/+download/${BPN}-${PV}.tar.gz \ - file://cloud-init-source-local-lsb-functions.patch \ - file://distros-add-windriver-skeleton-distro-file.patch \ - file://cloud.cfg" - -SRC_URI[md5sum] = "cd392e943dd0165e90a6d56afd0e4ad3" -SRC_URI[sha256sum] = "9e8fd22eb7f6e40ae6a5f66173ddc3cc18f65ee406c460a728092b37db2f3ed7" - -S = "${WORKDIR}/${BPN}-${PV}" - -DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}" -DISTUTILS_INSTALL_ARGS_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}" - -MANAGE_HOSTS ?= "False" -HOSTNAME ?= "" - -do_install_prepend() { - sed -e 's:/lib/${BPN}:${base_libdir}/${BPN}:' -i ${S}/setup.py -} - -do_install_append() { - install -m 0755 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg - - sed -e "s:%MANAGE_HOSTS%:${MANAGE_HOSTS}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg - sed -e "s:%HOSTNAME%:${HOSTNAME}:g" -i ${D}${sysconfdir}/cloud/cloud.cfg - - ln -s ${libdir}/${BPN}/uncloud-init ${D}${sysconfdir}/cloud/uncloud-init - ln -s ${libdir}/${BPN}/write-ssh-key-fingerprints ${D}${sysconfdir}/cloud/write-ssh-key-fingerprints -} - -inherit setuptools3 update-rc.d - -PACKAGES += "${PN}-systemd" - -FILES_${PN} += "${sysconfdir}/* \ - ${datadir}/*" - -FILES_${PN}-systemd += "${systemd_unitdir}/*" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${BPN} = "cloud-init" - -RDEPENDS_${PN} = "sysklogd \ - python3 \ - " diff --git a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb index cb58e9df..23e326bb 100644 --- a/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb +++ b/meta-openstack/recipes-extended/guest-images/cirros_0.3.2.bb @@ -2,7 +2,7 @@ SUMMARY = "An image containing the cirros cloud guest" DESCRIPTION = "CirrOS a tiny cloud guest" HOMEPAGE = "https://launchpad.net/cirros" -LICENSE="GPLv2" +LICENSE="GPL-2.0-only" SRC_URI = "http://download.cirros-cloud.net/${PV}/${PN}-${PV}-x86_64-disk.img" @@ -19,4 +19,4 @@ do_install() { } PACKAGES = "cirros-guest-image" -FILES_cirros-guest-image = "${ROOT_HOME}/images/*" +FILES:cirros-guest-image = "${ROOT_HOME}/images/*" diff --git a/meta-openstack/recipes-extended/images/openstack-image-aio.bb b/meta-openstack/recipes-extended/images/openstack-image-aio.bb index 2fbb85e2..f01d0ed5 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-aio.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-aio.bb @@ -27,7 +27,7 @@ inherit identity inherit monitor # check for 5G of free space, so we use 5G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" +IMAGE_ROOTFS_EXTRA_SPACE += "+ 5000000" POST_KEYSTONE_SETUP_COMMAND = "/etc/keystone/hybrid-backend-setup" diff --git a/meta-openstack/recipes-extended/images/openstack-image-compute.bb b/meta-openstack/recipes-extended/images/openstack-image-compute.bb index 897efc42..a725e2e9 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-compute.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-compute.bb @@ -19,6 +19,6 @@ inherit monitor # Ensure extra space for guest images, and rabbit MQ has a hard coded # check for 2G of free space, so we use 3G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 3000000" +IMAGE_ROOTFS_EXTRA_SPACE:append = " + 3000000" # ROOTFS_POSTPROCESS_COMMAND += "remove_packaging_data_files ; " diff --git a/meta-openstack/recipes-extended/images/openstack-image-controller.bb b/meta-openstack/recipes-extended/images/openstack-image-controller.bb index 6f324d84..96dc80c4 100644 --- a/meta-openstack/recipes-extended/images/openstack-image-controller.bb +++ b/meta-openstack/recipes-extended/images/openstack-image-controller.bb @@ -24,5 +24,5 @@ inherit monitor # Ensure extra space for guest images, and rabbit MQ has a hard coded # check for 2G of free space, so we use 5G as a starting point. -IMAGE_ROOTFS_EXTRA_SPACE_append += "+ 5000000" +IMAGE_ROOTFS_EXTRA_SPACE:append = " + 5000000" diff --git a/meta-openstack/recipes-extended/iptables/iptables_openstack.inc b/meta-openstack/recipes-extended/iptables/iptables_openstack.inc index 2a53557a..b26605d7 100644 --- a/meta-openstack/recipes-extended/iptables/iptables_openstack.inc +++ b/meta-openstack/recipes-extended/iptables/iptables_openstack.inc @@ -1,3 +1,3 @@ -RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ +RRECOMMENDS:${PN} += "kernel-module-xt-conntrack \ kernel-module-xt-redirect \ " diff --git a/meta-openstack/recipes-extended/libpam/libpam_openstack.inc b/meta-openstack/recipes-extended/libpam/libpam_openstack.inc index ec858a7f..6ebb4a33 100644 --- a/meta-openstack/recipes-extended/libpam/libpam_openstack.inc +++ b/meta-openstack/recipes-extended/libpam/libpam_openstack.inc @@ -1,4 +1,4 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +FILESEXTRAPATHS:prepend := "${THISDIR}/files:" SRC_URI += "file://common-account" SRC_URI += "file://common-auth" @@ -9,7 +9,7 @@ SRC_URI += "file://common-session-noninteractive" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd" -do_install_append() { +do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then install -m 755 -d ${D}/etc/pam.d/ install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/ diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_5.%.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend index 025ee4ee..025ee4ee 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_5.%.bbappend +++ b/meta-openstack/recipes-extended/libvirt/libvirt_10.%.bbappend diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc b/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc index 0b0f0114..7d8a4603 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc +++ b/meta-openstack/recipes-extended/libvirt/libvirt_openstack.inc @@ -5,9 +5,9 @@ PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ inherit useradd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN}_append = " ;--system libvirt" +GROUPADD_PARAM:${PN}:append = " ;--system libvirt" -do_install_append() { +do_install:append() { sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf } diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc index 33b1f61c..73cc86a8 100644 --- a/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc +++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_openstack.inc @@ -1,3 +1,3 @@ -do_install_append() { +do_install:append() { sed -i '2i port=`grep "^server.port" /etc/lighttpd.conf`; if [ -z $port ]; then echo "server port not configured, not running lighttpd..."; exit 0; fi' ${D}/etc/init.d/lighttpd } diff --git a/meta-openstack/recipes-extended/novnc/novnc_git.bb b/meta-openstack/recipes-extended/novnc/novnc_git.bb index ee20e3b9..82dcd4b3 100644 --- a/meta-openstack/recipes-extended/novnc/novnc_git.bb +++ b/meta-openstack/recipes-extended/novnc/novnc_git.bb @@ -1,52 +1,33 @@ DESCRIPTION = "HTML5 VNC client" HOMEPAGE = "https://github.com/kanaka/noVNC" SECTION = "web" +LICENSE = "MPL-2.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b428e7772bf00c07fb7b863b80358adf" -PR = "r0" +SRCREV = "9142f8f0f7b4a53447f5cfec3a797cbf0d6204a9" +PV = "1.2.0+git${SRCPV}" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=ac06308a999996ffc2d24d81b3a39f1b" - -SRCREV = "8f12ca7a5a64144fe548cada332d5d19ef26a1fe" -PV = "0.4+git${SRCPV}" - -SRC_URI = "git://github.com/kanaka/noVNC.git" +SRC_URI = "git://github.com/kanaka/noVNC.git;branch=master;protocol=https" S = "${WORKDIR}/git" -RDEPENDS_${PN} += "python-numpy" -RDEPENDS_${PN} += "python-novnc" -RDEPENDS_${PN} += "python-websockify" - do_compile() { : } +RDEPENDS:${PN} += " \ + bash \ +" + do_install() { - install -m 755 -d ${D}${bindir}/novnc - install -m 755 -d ${D}${datadir}/novnc/include - - install -m 644 ${S}/vnc.html ${D}${datadir}/novnc - install -m 644 ${S}/vnc_auto.html ${D}${datadir}/novnc - install -m 644 ${S}/images/favicon.ico ${D}${datadir}/novnc - install -m 644 ${S}/include/base64.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/des.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/display.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/input.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/logo.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/base.css ${D}${datadir}/novnc/include - install -m 644 ${S}/include/blue.css ${D}${datadir}/novnc/include - install -m 644 ${S}/include/black.css ${D}${datadir}/novnc/include - install -m 644 ${S}/include/playback.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/rfb.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/ui.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/util.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/websock.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/webutil.js ${D}${datadir}/novnc/include - install -m 644 ${S}/include/jsunzip.js ${D}${datadir}/novnc/include - - sed -i -e 's:#!/usr/bin/env bash:#!/bin/sh:' ${S}/utils/launch.sh - - install -m 755 ${S}/utils/launch.sh ${D}${bindir}/novnc-launch.sh + install -m 755 -d ${D}${datadir}/novnc + + cp -R --no-dereference --preserve=mode,links ${S}/* ${D}${datadir}/novnc + + install -m 444 ${S}/vnc.html ${D}${datadir}/novnc/index.html + install -m 444 ${S}/vnc_lite.html ${D}${datadir}/novnc/vnc_auto.html + + install -m 755 -d ${D}${bindir} + install ${S}/utils/launch.sh ${D}${bindir}/novnc_server } diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb index e659c317..40172ca8 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-benchmarking.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ tempest \ rally-api \ rally-setup \ diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb index e884af06..0f009e6c 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-compute.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ cloud-init \ postgresql \ qemu \ @@ -28,7 +28,7 @@ RDEPENDS_${PN} = " \ ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-agent', '', d)} \ " -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ kernel-module-kvm \ kernel-module-kvm-intel \ kernel-module-kvm-amd \ diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb index 80947688..851e3fa4 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-controller.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " postgresql \ +RDEPENDS:${PN} = " postgresql \ postgresql-client \ python-psycopg2 \ rabbitmq-server \ @@ -55,7 +55,7 @@ RDEPENDS_${PN} = " postgresql \ ${@bb.utils.contains('OPENSTACK_EXTRA_FEATURES', 'monitoring', 'packagegroup-monitoring-core', '', d)} \ " -RRECOMMENDS_${PN} = " \ +RRECOMMENDS:${PN} = " \ kernel-module-fuse \ cloud-init \ kernel-module-softdog \ diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb index fecbdc62..4806b2b6 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-debug.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ packagegroup-core-tools-debug \ " diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb index 9273916c..0d561e01 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-extras.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ vim \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xterm', '', d)} \ " diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb index 749a99fb..17d662cc 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-cloud-network.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda inherit packagegroup -RDEPENDS_${PN} = " \ +RDEPENDS:${PN} = " \ neutron-plugin-openvswitch \ neutron-dhcp-agent \ neutron-l3-agent \ diff --git a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb index 4bf657b2..6c703709 100644 --- a/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb +++ b/meta-openstack/recipes-extended/packagegroups/packagegroup-dummy-monitoring.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Dummy packagegroup to provide virtual/monitoring" -LICENSE = "GPLv2" +LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6" inherit packagegroup @@ -13,8 +13,8 @@ PACKAGES = "\ ${SRCNAME}-agent \ " -RDEPENDS_${SRCNAME}-core += "\ +RDEPENDS:${SRCNAME}-core += "\ " -RDEPENDS_${SRCNAME}-agent += "\ +RDEPENDS:${SRCNAME}-agent += "\ " diff --git a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb index 9db46859..3a486b4f 100644 --- a/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb +++ b/meta-openstack/recipes-extended/qpid/qpid-python_0.20.bb @@ -12,4 +12,5 @@ SRC_URI[sha256sum] = "3ca55a5aa11fbbd4e26cb4cdafc9658489c159acadceac60c89d4bfb5c S = "${WORKDIR}/qpid-${PV}/python" -inherit distutils3 +inherit setuptools3 + diff --git a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb index 933f5efd..9d8bfc68 100644 --- a/meta-openstack/recipes-extended/qpid/qpid_0.20.bb +++ b/meta-openstack/recipes-extended/qpid/qpid_0.20.bb @@ -4,7 +4,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7ab4c208aa62d92d7a03cc8e0a89c12b" SECTION = "mq" DEPENDS = "boost perl-native python3 util-linux cyrus-sasl" -RDEPENDS_${PN} = "cyrus-sasl-bin" +RDEPENDS:${PN} = "cyrus-sasl-bin" PR = "r0" SRC_URI = "http://archive.apache.org/dist/${PN}/${PV}/qpid-cpp-0.20.tar.gz \ @@ -32,28 +32,28 @@ EXTRA_OEMAKE += " CPPFLAGS=-Wno-unused-function \ pythondir=${PYTHON_SITEPACKAGES_DIR} \ " -do_install_append() { +do_install:append() { install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/qpidd ${D}${sysconfdir}/init.d/qpidd } PACKAGES += "qmfgen qmfgen-python qmfgen-python-dbg" -FILES_qmfgen = "${bindir}/qmf-gen" +FILES:qmfgen = "${bindir}/qmf-gen" -FILES_qmfgen-python = "${PYTHON_SITEPACKAGES_DIR}/*" +FILES:qmfgen-python = "${PYTHON_SITEPACKAGES_DIR}/*" -FILES_qmfgen-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/*" +FILES:qmfgen-python-dbg += "${PYTHON_SITEPACKAGES_DIR}/.debug/*" -FILES_${PN} += "${libdir}/${PN}/tests/test_store.so" +FILES:${PN} += "${libdir}/${PN}/tests/test_store.so" -FILES_${PN}-dev += "${libdir}/${PN}/tests/test_store.so " +FILES:${PN}-dev += "${libdir}/${PN}/tests/test_store.so " -FILES_${PN}-dbg += "${libdir}/${PN}/${PN}/tests/.debug/* \ +FILES:${PN}-dbg += "${libdir}/${PN}/${PN}/tests/.debug/* \ ${libdir}/${PN}/tests/.debug/* \ ${libdir}/${PN}/daemon/.debug/*" -FILES_${PN}-doc += "${datadir}/qpidc/*" +FILES:${PN}-doc += "${datadir}/qpidc/*" INITSCRIPT_NAME = "qpidd" INITSCRIPT_PARAMS = "defaults" diff --git a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb index 7f003fd6..7816003c 100644 --- a/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb +++ b/meta-openstack/recipes-extended/rabbitmq/rabbitmq-server_3.2.4.bb @@ -26,7 +26,7 @@ DEPENDS = " \ coreutils-native\ " -RDEPENDS_${PN} = "erlang erlang-modules" +RDEPENDS:${PN} = "erlang erlang-modules" do_compile() { oe_runmake @@ -68,18 +68,18 @@ do_install() { inherit useradd update-rc.d systemd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system rabbitmq" -USERADD_PARAM_${PN} = "--system --create-home --home /var/lib/rabbitmq \ +GROUPADD_PARAM:${PN} = "--system rabbitmq" +USERADD_PARAM:${PN} = "--system --create-home --home /var/lib/rabbitmq \ -g rabbitmq rabbitmq" INITSCRIPT_NAME = "rabbitmq-server" INITSCRIPT_PARAMS = "defaults" -SYSTEMD_SERVICE_${PN} = "rabbitmq-server.service" +SYSTEMD_SERVICE:${PN} = "rabbitmq-server.service" -FILES_${PN} += " ${libdir}/rabbitmq/lib/${PN}-${PV}/* \ +FILES:${PN} += " ${libdir}/rabbitmq/lib/${PN}-${PV}/* \ ${localstatedir}/* \ " -FILES_${PN}-doc += "LICENSE* INSTALL" -INSANE_SKIP_${PN} = "unsafe-references-in-scripts" +FILES:${PN}-doc += "LICENSE* INSTALL" +INSANE_SKIP:${PN} = "unsafe-references-in-scripts" diff --git a/meta-openstack/recipes-extended/syslog/syslog-user.inc b/meta-openstack/recipes-extended/syslog/syslog-user.inc index 57aba008..5c28ce40 100644 --- a/meta-openstack/recipes-extended/syslog/syslog-user.inc +++ b/meta-openstack/recipes-extended/syslog/syslog-user.inc @@ -5,6 +5,6 @@ inherit useradd USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system syslog" -USERADD_PARAM_${PN} = "--system --home /var/log -g syslog syslog" +GROUPADD_PARAM:${PN} = "--system syslog" +USERADD_PARAM:${PN} = "--system --home /var/log -g syslog syslog" diff --git a/meta-openstack/recipes-extended/tempest/tempest_git.bb b/meta-openstack/recipes-extended/tempest/tempest_git.bb index 48a286ce..4854516c 100644 --- a/meta-openstack/recipes-extended/tempest/tempest_git.bb +++ b/meta-openstack/recipes-extended/tempest/tempest_git.bb @@ -9,7 +9,7 @@ SRCNAME = "tempest" inherit setuptools3 identity hosts -SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master \ +SRC_URI = "git://github.com/openstack/${SRCNAME}.git;branch=master;protocol=https \ file://tempest.conf \ file://logging.conf \ " @@ -61,7 +61,7 @@ python () { d.setVarFlags("USERCREATE_PARAM_%s-setup-admin" % d.getVar('SRCNAME',True), flags) } -do_install_append() { +do_install:append() { TEMPLATE_CONF_DIR=${S}${sysconfdir}/ TEMPEST_CONF_DIR=${D}${sysconfdir}/${SRCNAME} @@ -106,18 +106,18 @@ PACKAGES =+ "${SRCNAME}-tests \ ${SRCNAME}-setup-admin \ " -FILES_${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tests/*" +FILES:${SRCNAME}-tests = "${sysconfdir}/${SRCNAME}/tests/*" -FILES_${PN} = "${libdir}/* \ +FILES:${PN} = "${libdir}/* \ ${sysconfdir}/* \ ${bindir}/* \ " -ALLOW_EMPTY_${SRCNAME}-setup = "1" -ALLOW_EMPTY_${SRCNAME}-setup-altdemo = "1" -ALLOW_EMPTY_${SRCNAME}-setup-admin = "1" +ALLOW_EMPTY:${SRCNAME}-setup = "1" +ALLOW_EMPTY:${SRCNAME}-setup-altdemo = "1" +ALLOW_EMPTY:${SRCNAME}-setup-admin = "1" -RDEPENDS_${PN} += " \ +RDEPENDS:${PN} += " \ ${SRCNAME}-tests \ ${SRCNAME}-setup \ ${SRCNAME}-setup-altdemo \ diff --git a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb index bf6b30f2..62e0df42 100644 --- a/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb +++ b/meta-openstack/recipes-extended/uwsgi/uwsgi_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=33ab1ce13e2312dddfad07f97f66321f" SRCNAME = "uwsgi" -SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0 \ +SRC_URI = "git://github.com/unbit/uwsgi.git;branch=uwsgi-2.0;protocol=https \ file://Add-explicit-breaks-to-avoid-implicit-passthrough.patch \ file://more-Add-explicit-breaks-to-avoid-implicit-passthrough.patch \ " @@ -26,8 +26,8 @@ DEPENDS += " \ yajl \ " -# RDEPENDS_default: -RDEPENDS_${PN} += " \ +# RDEPENDS:default: +RDEPENDS:${PN} += " \ " CLEANBROKEN = "1" |