From 7eeab1b65c3413645d4259643c13bc791b5a7f98 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 14 Apr 2015 23:39:48 -0400 Subject: cloud-init: update to 0.7.6 Signed-off-by: Bruce Ashfield --- .../cloud-init/cloud-init_0.7.4.bb | 53 ---------------------- .../cloud-init/cloud-init_0.7.6.bb | 53 ++++++++++++++++++++++ 2 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb create mode 100644 meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb diff --git a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.bb deleted file mode 100644 index 6237900..0000000 --- a/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.4.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] = "65053a7b2917ad1c26dc0a4d144b59c0" -SRC_URI[sha256sum] = "34152e0168c2ffc06284b4fe01ff43f856219228ddb995d5afe4f9a77420d779" - -S = "${WORKDIR}/${BPN}-${PV}" - -DISTUTILS_INSTALL_ARGS_append = " ${@base_contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}" -DISTUTILS_INSTALL_ARGS_append = " ${@base_contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}" - -MANAGE_HOSTS ?= "False" -HOSTNAME ?= "" - -do_install_prepend() { - sed -e 's:/usr/lib/${BPN}:${libdir}/${BPN}:' -i ${S}/setup.py -} - -do_install_append() { - install -m 0755 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg - if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then - 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 - fi - 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 setuptools update-rc.d openstackchef - -CHEF_SERVICES_CONF_FILES := " \ - ${sysconfdir}/cloud/cloud.cfg \ - " - -FILES_${PN} += "${sysconfdir}/* \ - ${datadir}/*" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${BPN} = "cloud-init" - -RDEPENDS_${PN} = "sysklogd \ - python \ - " 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 new file mode 100644 index 0000000..3a5c420 --- /dev/null +++ b/meta-openstack/recipes-extended/cloud-init/cloud-init_0.7.6.bb @@ -0,0 +1,53 @@ +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 = " ${@base_contains('DISTRO_FEATURES', 'sysvinit', '--init-system=sysvinit_deb', '', d)}" +DISTUTILS_INSTALL_ARGS_append = " ${@base_contains('DISTRO_FEATURES', 'systemd', '--init-system=systemd', '', d)}" + +MANAGE_HOSTS ?= "False" +HOSTNAME ?= "" + +do_install_prepend() { + sed -e 's:/usr/lib/${BPN}:${libdir}/${BPN}:' -i ${S}/setup.py +} + +do_install_append() { + install -m 0755 ${WORKDIR}/cloud.cfg ${D}${sysconfdir}/cloud/cloud.cfg + if [ -z "${OPENSTACKCHEF_ENABLED}" ]; then + 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 + fi + 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 setuptools update-rc.d openstackchef + +CHEF_SERVICES_CONF_FILES := " \ + ${sysconfdir}/cloud/cloud.cfg \ + " + +FILES_${PN} += "${sysconfdir}/* \ + ${datadir}/*" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${BPN} = "cloud-init" + +RDEPENDS_${PN} = "sysklogd \ + python \ + " -- cgit v1.2.3-54-g00ecf