diff options
author | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-02-02 23:48:06 -0500 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@windriver.com> | 2014-02-02 23:48:06 -0500 |
commit | ba2cf4dfc0e3e05bbee01ef27224f8cd228a117f (patch) | |
tree | ebca9514044ed7e777f2b20247d24684c21f4a33 /meta-openstack | |
parent | 8f1c167d0a7dc568a9dfc835073af7eb5de59a91 (diff) | |
download | meta-cloud-services-ba2cf4dfc0e3e05bbee01ef27224f8cd228a117f.tar.gz |
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 <bruce.ashfield@windriver.com>
Diffstat (limited to 'meta-openstack')
-rw-r--r-- | meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend (renamed from meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend | 9 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend (renamed from meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend (renamed from meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend (renamed from meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend (renamed from meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend (renamed from meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend (renamed from meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend (renamed from meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend (renamed from meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend (renamed from meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/postgresql/postgresql/postgresql | 92 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init | 43 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend (renamed from meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend (renamed from meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend (renamed from meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend) | 0 | ||||
-rw-r--r-- | meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend | 5 | ||||
-rw-r--r-- | meta-openstack/recipes-extended/libvirt/libvirt_1.2.1.bbappend | 13 | ||||
-rw-r--r-- | meta-openstack/recipes-support/iproute2/iproute2_3.12.0.bbappend | 2 |
19 files changed, 164 insertions, 0 deletions
diff --git a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend index 52eab54..52eab54 100644 --- a/meta-openstack/recipes-support/dnsmasq/dnsmasq_2.55.bbappend +++ b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend | |||
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 @@ | |||
1 | do_install_append() { | ||
2 | cd ${S}/contrib/wrt | ||
3 | oe_runmake | ||
4 | |||
5 | install -m 0755 ${S}/contrib/wrt/dhcp_release ${D}${bindir} | ||
6 | |||
7 | # Remove /var/run as it is created on startup | ||
8 | rm -rf ${D}${localstatedir}/run | ||
9 | } | ||
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend index 34ad5b8..34ad5b8 100644 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.10.0.bbappend +++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend | |||
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend index 34ad5b8..34ad5b8 100644 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.11.0.bbappend +++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend | |||
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend index 34ad5b8..34ad5b8 100644 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.2.0.bbappend +++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend | |||
diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend index 34ad5b8..34ad5b8 100644 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.9.0.bbappend +++ b/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend | |||
diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend b/meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend index 7b4d5df..7b4d5df 100644 --- a/meta-openstack/recipes-extended/iptables/iptables_1.4.12.2.bbappend +++ b/meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend | |||
diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend b/meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend index 7b4d5df..7b4d5df 100644 --- a/meta-openstack/recipes-extended/iptables/iptables_1.4.19.1.bbappend +++ b/meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend | |||
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend index 3a6634e..3a6634e 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.0.3.bbappend +++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend | |||
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend index 3a6634e..3a6634e 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.1.bbappend +++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend | |||
diff --git a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend index eb7a921..eb7a921 100644 --- a/meta-openstack/recipes-extended/libvirt/libvirt_1.1.2.bbappend +++ b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend | |||
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 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | ### BEGIN INIT INFO | ||
4 | # Provides: postgresql | ||
5 | # Required-Start: $local_fs $remote_fs $network $time | ||
6 | # Required-Stop: $local_fs $remote_fs $network $time | ||
7 | # Should-Start: $syslog | ||
8 | # Should-Stop: $syslog | ||
9 | # Default-Start: 2 3 4 5 | ||
10 | # Default-Stop: 0 1 6 | ||
11 | # Short-Description: PostgreSQL RDBMS server | ||
12 | ### END INIT INFO | ||
13 | |||
14 | DAEMON=/usr/bin/postmaster | ||
15 | DESC="PostgreSQL RDBMS server" | ||
16 | |||
17 | datadir=`grep ^data_directory /etc/postgresql/postgresql.conf |sed -e "s#^.*= '##; s#'.*##"` | ||
18 | if [ "$datadir" = "" ] ; then | ||
19 | datadir=/etc/postgresql | ||
20 | else | ||
21 | if [ ! -e $datadir/postgresql.conf ] ; then | ||
22 | if [ -e /etc/postgresql/postgresql.conf -a -e $datadir ] ; then | ||
23 | ln -s /etc/postgresql/*.conf $datadir/ | ||
24 | fi | ||
25 | fi | ||
26 | fi | ||
27 | |||
28 | cd / | ||
29 | |||
30 | start () | ||
31 | { | ||
32 | echo -n "Starting postgres server..." | ||
33 | if pidof ${DAEMON} > /dev/null; then | ||
34 | echo "already running." | ||
35 | exit 0 | ||
36 | fi | ||
37 | touch /var/log/postgresql.log | ||
38 | chown postgres /var/log/postgresql.log | ||
39 | sudo -u postgres /usr/bin/pg_ctl start -w -D $datadir -s -l /var/log/postgresql.log | ||
40 | if [ $? -eq 0 ]; then | ||
41 | echo "done." | ||
42 | else | ||
43 | echo "failed." | ||
44 | fi | ||
45 | } | ||
46 | |||
47 | stop () | ||
48 | { | ||
49 | echo -n "Stopping postgres server..." | ||
50 | if ! pidof ${DAEMON} >/dev/null; then | ||
51 | echo "not running." | ||
52 | exit 0 | ||
53 | fi | ||
54 | sudo -u postgres /usr/bin/pg_ctl stop -w -D $datadir -m fast -s | ||
55 | if [ $? -eq 0 ]; then | ||
56 | echo "done." | ||
57 | else | ||
58 | if [ -f /etc/postgresql/postmaster.pid -a "$datadir" != "/etc/postgresql" ] ; then | ||
59 | # Special case for transition | ||
60 | sudo -u postgres /usr/bin/pg_ctl stop -w -D /etc/postgresql -m fast -s | ||
61 | fi | ||
62 | if ! pidof ${DAEMON} > /dev/null; then | ||
63 | echo "done." | ||
64 | else | ||
65 | echo "failed." | ||
66 | exit 1 | ||
67 | fi | ||
68 | fi | ||
69 | } | ||
70 | |||
71 | case "$1" in | ||
72 | start) | ||
73 | start | ||
74 | ;; | ||
75 | stop) | ||
76 | stop | ||
77 | ;; | ||
78 | force-reload) | ||
79 | stop | ||
80 | start | ||
81 | ;; | ||
82 | restart) | ||
83 | stop | ||
84 | start | ||
85 | ;; | ||
86 | *) | ||
87 | echo "Usage: $0 {start|stop|force-reload|restart}" | ||
88 | exit 1 | ||
89 | ;; | ||
90 | esac | ||
91 | |||
92 | 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 @@ | |||
1 | #!/bin/sh | ||
2 | # set -x | ||
3 | |||
4 | PN=postgresql | ||
5 | CONTROLLER_IP=%CONTROLLER_IP% | ||
6 | COMPUTE_IP=%COMPUTE_IP% | ||
7 | DB_USER=%DB_USER% | ||
8 | DB_PASSWORD=%DB_PASSWORD% | ||
9 | |||
10 | if [ -e /etc/${PN}/PG_VERSION ]; then | ||
11 | # the database has already been initialized, return | ||
12 | exit 0 | ||
13 | fi | ||
14 | |||
15 | sudo -u postgres initdb -D /etc/${PN}/ | ||
16 | echo "listen_addresses = '*'" >> /etc/${PN}/postgresql.conf | ||
17 | echo "host all all ${CONTROLLER_IP}/32 trust" >> /etc/${PN}/pg_hba.conf | ||
18 | echo "host all all ${COMPUTE_IP}/32 trust" >> /etc/${PN}/pg_hba.conf | ||
19 | /etc/init.d/postgresql start | ||
20 | |||
21 | count=0 | ||
22 | done=0 | ||
23 | while [ $count -le 10 ] && [ $done -eq 0 ]; do | ||
24 | sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'" 2> /dev/null | ||
25 | if [ $? -ne 0 ]; then | ||
26 | echo "[INFO] postgres: failed to create account for ${DB_USER}, trying again" | ||
27 | /etc/init.d/postgresql stop | ||
28 | sleep 3 | ||
29 | /etc/init.d/postgresql start | ||
30 | sleep 3 | ||
31 | else | ||
32 | echo "[INFO] postgres: created account for ${DB_USER}, continuing .. " | ||
33 | done=1 | ||
34 | fi | ||
35 | count=`expr $count + 1` | ||
36 | done | ||
37 | |||
38 | if [ $done -eq 0 ]; then | ||
39 | echo "[ERROR] postgres: unable to create admin account" | ||
40 | exit 1 | ||
41 | fi | ||
42 | |||
43 | ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone || true | ||
diff --git a/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend b/meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend index 98e7207..98e7207 100644 --- a/meta-openstack/recipes-support/postgresql/postgresql_8.4.7.bbappend +++ b/meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend | |||
diff --git a/meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend b/meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend index 3c691d3..3c691d3 100644 --- a/meta-openstack/recipes-devtools/python/python-setuptools_0.6c11.bbappend +++ b/meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend | |||
diff --git a/meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend b/meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend index 3c691d3..3c691d3 100644 --- a/meta-openstack/recipes-devtools/python/python-setuptools_1.1.6.bbappend +++ b/meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend | |||
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 @@ | |||
1 | INC := "${@int(PRINC) + 1}" | ||
2 | |||
3 | RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ | ||
4 | kernel-module-xt-redirect \ | ||
5 | " | ||
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 @@ | |||
1 | PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \ | ||
2 | python numactl sanlock ebtables \ | ||
3 | ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \ | ||
4 | " | ||
5 | |||
6 | inherit useradd | ||
7 | USERADD_PACKAGES = "${PN}" | ||
8 | GROUPADD_PARAM_${PN} = "--system libvirt" | ||
9 | |||
10 | do_install_append() { | ||
11 | sed -e "s:^#unix_sock_group =:unix_sock_group =:g" -i ${D}/etc/libvirt/libvirtd.conf | ||
12 | sed -e "s:^#unix_sock_rw_perms =:unix_sock_rw_perms =:g" -i ${D}/etc/libvirt/libvirtd.conf | ||
13 | } | ||
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 @@ | |||
1 | RRECOMMENDS_${PN} += "kernel-module-veth \ | ||
2 | " | ||