From ba2cf4dfc0e3e05bbee01ef27224f8cd228a117f Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Sun, 2 Feb 2014 23:48:06 -0500 Subject: bbappends: move old appends to "dangling" and introduce new appends Syncing to oe-core, and meta-oe master of January 30th 2014. - introduced required new bbappends To keep compatiblity with older versions of oe-core and meta-oe, old bbappends are kept, but they are moved to the "dangling" recipe group. If any bbappend warnings show outside of the dangling recipes, they should be investigated. Signed-off-by: Bruce Ashfield --- .../recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend | 9 +++ .../recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend | 9 +++ .../iproute2/iproute2_3.10.0.bbappend | 2 + .../iproute2/iproute2_3.11.0.bbappend | 2 + .../iproute2/iproute2_3.2.0.bbappend | 2 + .../iproute2/iproute2_3.9.0.bbappend | 2 + .../iptables/iptables_1.4.12.2.bbappend | 5 ++ .../iptables/iptables_1.4.19.1.bbappend | 5 ++ .../libvirt/libvirt_1.0.3.bbappend | 4 + .../libvirt/libvirt_1.1.1.bbappend | 4 + .../libvirt/libvirt_1.1.2.bbappend | 13 +++ .../postgresql/postgresql/postgresql | 92 ++++++++++++++++++++++ .../postgresql/postgresql/postgresql-init | 43 ++++++++++ .../postgresql/postgresql_8.4.7.bbappend | 35 ++++++++ .../python/python-setuptools_0.6c11.bbappend | 4 + .../python/python-setuptools_1.1.6.bbappend | 4 + .../python/python-setuptools_0.6c11.bbappend | 4 - .../python/python-setuptools_1.1.6.bbappend | 4 - .../iptables/iptables_1.4.12.2.bbappend | 5 -- .../iptables/iptables_1.4.19.1.bbappend | 5 -- .../iptables/iptables_1.4.21.bbappend | 5 ++ .../libvirt/libvirt_1.0.3.bbappend | 4 - .../libvirt/libvirt_1.1.1.bbappend | 4 - .../libvirt/libvirt_1.1.2.bbappend | 13 --- .../libvirt/libvirt_1.2.1.bbappend | 13 +++ .../recipes-support/dnsmasq/dnsmasq_2.55.bbappend | 9 --- .../iproute2/iproute2_3.10.0.bbappend | 2 - .../iproute2/iproute2_3.11.0.bbappend | 2 - .../iproute2/iproute2_3.12.0.bbappend | 2 + .../iproute2/iproute2_3.2.0.bbappend | 2 - .../iproute2/iproute2_3.9.0.bbappend | 2 - .../postgresql/postgresql_8.4.7.bbappend | 35 -------- 32 files changed, 255 insertions(+), 91 deletions(-) create mode 100644 meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend create mode 100644 meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend create mode 100644 meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend create mode 100644 meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend create mode 100644 meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend create mode 100644 meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend create mode 100644 meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend create mode 100644 meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend create mode 100644 meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend create mode 100644 meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend create mode 100644 meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend create mode 100644 meta-openstack/recipes-dangling/postgresql/postgresql/postgresql create mode 100644 meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init create mode 100644 meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend create mode 100644 meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend create mode 100644 meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend delete mode 100644 meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend delete mode 100644 meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend delete mode 100644 meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend delete mode 100644 meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend create mode 100644 meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend delete mode 100644 meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend delete mode 100644 meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend delete mode 100644 meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend create mode 100644 meta-openstack/recipes-extended/libvirt/libvirt_1.2.1.bbappend delete mode 100644 meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend create mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend delete mode 100644 meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend (limited to 'meta-openstack') diff --git a/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend new file mode 100644 index 0000000..52eab54 --- /dev/null +++ b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend @@ -0,0 +1,9 @@ +do_install_append() { + cd ${S}/contrib/wrt + oe_runmake + + install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} + + # Remove /var/run as it is created on startup + rm -rf ${D}${localstatedir}/run +} diff --git a/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend new file mode 100644 index 0000000..52eab54 --- /dev/null +++ b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend @@ -0,0 +1,9 @@ +do_install_append() { + cd ${S}/contrib/wrt + oe_runmake + + install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} + + # Remove /var/run as it is created on startup + rm -rf ${D}${localstatedir}/run +} diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend new file mode 100644 index 0000000..34ad5b8 --- /dev/null +++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend @@ -0,0 +1,2 @@ +RRECOMMENDS_${PN} += "kernel-module-veth \ + " diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend new file mode 100644 index 0000000..34ad5b8 --- /dev/null +++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend @@ -0,0 +1,2 @@ +RRECOMMENDS_${PN} += "kernel-module-veth \ + " diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend new file mode 100644 index 0000000..34ad5b8 --- /dev/null +++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend @@ -0,0 +1,2 @@ +RRECOMMENDS_${PN} += "kernel-module-veth \ + " diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend new file mode 100644 index 0000000..34ad5b8 --- /dev/null +++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend @@ -0,0 +1,2 @@ +RRECOMMENDS_${PN} += "kernel-module-veth \ + " diff --git a/meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend b/meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend new file mode 100644 index 0000000..7b4d5df --- /dev/null +++ b/meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend @@ -0,0 +1,5 @@ +INC := "${@int(PRINC) + 1}" + +RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ + kernel-module-xt-redirect \ + " diff --git a/meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend b/meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend new file mode 100644 index 0000000..7b4d5df --- /dev/null +++ b/meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend @@ -0,0 +1,5 @@ +INC := "${@int(PRINC) + 1}" + +RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ + kernel-module-xt-redirect \ + " diff --git a/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend new file mode 100644 index 0000000..3a6634e --- /dev/null +++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend @@ -0,0 +1,4 @@ +PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ + python numactl sanlock ebtables \ + ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + " diff --git a/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend new file mode 100644 index 0000000..3a6634e --- /dev/null +++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend @@ -0,0 +1,4 @@ +PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ + python numactl sanlock ebtables \ + ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + " diff --git a/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend new file mode 100644 index 0000000..eb7a921 --- /dev/null +++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend @@ -0,0 +1,13 @@ +PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ + python numactl sanlock ebtables \ + ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + " + +inherit useradd +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system libvirt" + +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-dangling/postgresql/postgresql/postgresql b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql new file mode 100644 index 0000000..5a34ec0 --- /dev/null +++ b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql @@ -0,0 +1,92 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: postgresql +# Required-Start: $local_fs $remote_fs $network $time +# Required-Stop: $local_fs $remote_fs $network $time +# Should-Start: $syslog +# Should-Stop: $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: PostgreSQL RDBMS server +### END INIT INFO + +DAEMON=/usr/bin/postmaster +DESC="PostgreSQL RDBMS server" + +datadir=`grep ^data_directory /etc/postgresql/postgresql.conf |sed -e "s#^.*= '##; s#'.*##"` +if [ "$datadir" = "" ] ; then + datadir=/etc/postgresql +else + if [ ! -e $datadir/postgresql.conf ] ; then + if [ -e /etc/postgresql/postgresql.conf -a -e $datadir ] ; then + ln -s /etc/postgresql/*.conf $datadir/ + fi + fi +fi + +cd / + +start () +{ + echo -n "Starting postgres server..." + if pidof ${DAEMON} > /dev/null; then + echo "already running." + exit 0 + fi + touch /var/log/postgresql.log + chown postgres /var/log/postgresql.log + sudo -u postgres /usr/bin/pg_ctl start -w -D $datadir -s -l /var/log/postgresql.log + if [ $? -eq 0 ]; then + echo "done." + else + echo "failed." + fi +} + +stop () +{ + echo -n "Stopping postgres server..." + if ! pidof ${DAEMON} >/dev/null; then + echo "not running." + exit 0 + fi + sudo -u postgres /usr/bin/pg_ctl stop -w -D $datadir -m fast -s + if [ $? -eq 0 ]; then + echo "done." + else + if [ -f /etc/postgresql/postmaster.pid -a "$datadir" != "/etc/postgresql" ] ; then + # Special case for transition + sudo -u postgres /usr/bin/pg_ctl stop -w -D /etc/postgresql -m fast -s + fi + if ! pidof ${DAEMON} > /dev/null; then + echo "done." + else + echo "failed." + exit 1 + fi + fi +} + +case "$1" in + start) + start + ;; + stop) + stop + ;; + force-reload) + stop + start + ;; + restart) + stop + start + ;; + *) + echo "Usage: $0 {start|stop|force-reload|restart}" + exit 1 + ;; +esac + +exit 0 diff --git a/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init new file mode 100644 index 0000000..c9c3807 --- /dev/null +++ b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init @@ -0,0 +1,43 @@ +#!/bin/sh +# set -x + +PN=postgresql +CONTROLLER_IP=%CONTROLLER_IP% +COMPUTE_IP=%COMPUTE_IP% +DB_USER=%DB_USER% +DB_PASSWORD=%DB_PASSWORD% + +if [ -e /etc/${PN}/PG_VERSION ]; then + # the database has already been initialized, return + exit 0 +fi + +sudo -u postgres initdb -D /etc/${PN}/ +echo "listen_addresses = '*'" >> /etc/${PN}/postgresql.conf +echo "host all all ${CONTROLLER_IP}/32 trust" >> /etc/${PN}/pg_hba.conf +echo "host all all ${COMPUTE_IP}/32 trust" >> /etc/${PN}/pg_hba.conf +/etc/init.d/postgresql start + +count=0 +done=0 +while [ $count -le 10 ] && [ $done -eq 0 ]; do + sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'" 2> /dev/null + if [ $? -ne 0 ]; then + echo "[INFO] postgres: failed to create account for ${DB_USER}, trying again" + /etc/init.d/postgresql stop + sleep 3 + /etc/init.d/postgresql start + sleep 3 + else + echo "[INFO] postgres: created account for ${DB_USER}, continuing .. " + done=1 + fi + count=`expr $count + 1` +done + +if [ $done -eq 0 ]; then + echo "[ERROR] postgres: unable to create admin account" + exit 1 +fi + +ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone || true diff --git a/meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend b/meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend new file mode 100644 index 0000000..98e7207 --- /dev/null +++ b/meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend @@ -0,0 +1,35 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" +PRINC := "${@int(PRINC) + 1}" + +SRC_URI += "file://postgresql" + +inherit useradd update-rc.d identity + +do_install_append() { + install -d ${D}${sysconfdir}/${PN} + chown postgres ${D}${sysconfdir}/${PN} + + install -d ${D}${sysconfdir}/init.d/ + install -m 0755 ${WORKDIR}/postgresql ${D}${sysconfdir}/init.d/postgresql +} + +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system postgres" +USERADD_PARAM_${PN} = "--system --home /var/lib/postgres -g postgres \ + --no-create-home --shell /bin/false postgres" + +pkg_postinst_${PN} () { + if [ "x$D" != "x" ]; then + exit 1 + fi + + sudo -u postgres initdb -D /etc/${PN}/ + /etc/init.d/postgresql start + sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'" + ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone +} + +FILES_${PN} += "${localstatedir}/run/${PN}" + +INITSCRIPT_NAME = "${PN}" +INITSCRIPT_PARAMS = "defaults" diff --git a/meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend b/meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend new file mode 100644 index 0000000..3c691d3 --- /dev/null +++ b/meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend @@ -0,0 +1,4 @@ +# conflicting file prevention +do_install_append() { + rm -f ${D}${libdir}/python*/site-packages/site.py* +} \ No newline at end of file diff --git a/meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend b/meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend new file mode 100644 index 0000000..3c691d3 --- /dev/null +++ b/meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend @@ -0,0 +1,4 @@ +# conflicting file prevention +do_install_append() { + rm -f ${D}${libdir}/python*/site-packages/site.py* +} \ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend b/meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend deleted file mode 100644 index 3c691d3..0000000 --- a/meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# conflicting file prevention -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/site.py* -} \ No newline at end of file diff --git a/meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend b/meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend deleted file mode 100644 index 3c691d3..0000000 --- a/meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -# conflicting file prevention -do_install_append() { - rm -f ${D}${libdir}/python*/site-packages/site.py* -} \ No newline at end of file diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend b/meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend deleted file mode 100644 index 7b4d5df..0000000 --- a/meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -INC := "${@int(PRINC) + 1}" - -RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ - kernel-module-xt-redirect \ - " diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend b/meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend deleted file mode 100644 index 7b4d5df..0000000 --- a/meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -INC := "${@int(PRINC) + 1}" - -RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ - kernel-module-xt-redirect \ - " diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend b/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend new file mode 100644 index 0000000..7b4d5df --- /dev/null +++ b/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend @@ -0,0 +1,5 @@ +INC := "${@int(PRINC) + 1}" + +RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ + kernel-module-xt-redirect \ + " diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend deleted file mode 100644 index 3a6634e..0000000 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ - python numactl sanlock ebtables \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ - " diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend deleted file mode 100644 index 3a6634e..0000000 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ - python numactl sanlock ebtables \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ - " diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend deleted file mode 100644 index eb7a921..0000000 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ - python numactl sanlock ebtables \ - ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ - " - -inherit useradd -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system libvirt" - -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/libvirt/libvirt_1.2.1.bbappend b/meta-openstack/recipes-extended/libvirt/libvirt_1.2.1.bbappend new file mode 100644 index 0000000..eb7a921 --- /dev/null +++ b/meta-openstack/recipes-extended/libvirt/libvirt_1.2.1.bbappend @@ -0,0 +1,13 @@ +PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ + python numactl sanlock ebtables \ + ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ + " + +inherit useradd +USERADD_PACKAGES = "${PN}" +GROUPADD_PARAM_${PN} = "--system libvirt" + +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-support/dnsmasq/dnsmasq_2.55.bbappend b/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend deleted file mode 100644 index 52eab54..0000000 --- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend +++ /dev/null @@ -1,9 +0,0 @@ -do_install_append() { - cd ${S}/contrib/wrt - oe_runmake - - install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} - - # Remove /var/run as it is created on startup - rm -rf ${D}${localstatedir}/run -} diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend deleted file mode 100644 index 34ad5b8..0000000 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RRECOMMENDS_${PN} += "kernel-module-veth \ - " diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend deleted file mode 100644 index 34ad5b8..0000000 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RRECOMMENDS_${PN} += "kernel-module-veth \ - " diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend new file mode 100644 index 0000000..34ad5b8 --- /dev/null +++ b/meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend @@ -0,0 +1,2 @@ +RRECOMMENDS_${PN} += "kernel-module-veth \ + " diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend deleted file mode 100644 index 34ad5b8..0000000 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RRECOMMENDS_${PN} += "kernel-module-veth \ - " diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend deleted file mode 100644 index 34ad5b8..0000000 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RRECOMMENDS_${PN} += "kernel-module-veth \ - " diff --git a/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend b/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend deleted file mode 100644 index 98e7207..0000000 --- a/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend +++ /dev/null @@ -1,35 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" - -SRC_URI += "file://postgresql" - -inherit useradd update-rc.d identity - -do_install_append() { - install -d ${D}${sysconfdir}/${PN} - chown postgres ${D}${sysconfdir}/${PN} - - install -d ${D}${sysconfdir}/init.d/ - install -m 0755 ${WORKDIR}/postgresql ${D}${sysconfdir}/init.d/postgresql -} - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM_${PN} = "--system postgres" -USERADD_PARAM_${PN} = "--system --home /var/lib/postgres -g postgres \ - --no-create-home --shell /bin/false postgres" - -pkg_postinst_${PN} () { - if [ "x$D" != "x" ]; then - exit 1 - fi - - sudo -u postgres initdb -D /etc/${PN}/ - /etc/init.d/postgresql start - sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'" - ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone -} - -FILES_${PN} += "${localstatedir}/run/${PN}" - -INITSCRIPT_NAME = "${PN}" -INITSCRIPT_PARAMS = "defaults" -- cgit v1.2.3-54-g00ecf