summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Ashfield <bruce.ashfield@windriver.com>2014-08-25 12:24:29 -0400
committerBruce Ashfield <bruce.ashfield@windriver.com>2014-08-29 10:22:30 -0400
commit527a2d88fd63779ef26be206eefe2ae2fb31f913 (patch)
treecfe2123536741b3bd81a56cb81b627b31be1da3d
parent4d4176d8ab960f4636a497a0cf7e7c9cbe50b868 (diff)
downloadmeta-cloud-services-527a2d88fd63779ef26be206eefe2ae2fb31f913.tar.gz
recipes-dangling: remove all dangling bbappends
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
-rw-r--r--meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend15
-rw-r--r--meta-openstack/recipes-dangling/apache2/apache2_2.4.2.bbappend5
-rw-r--r--meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend15
-rw-r--r--meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend15
-rw-r--r--meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend9
-rw-r--r--meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend9
-rw-r--r--meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend2
-rw-r--r--meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend2
-rw-r--r--meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend2
-rw-r--r--meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend2
-rw-r--r--meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend2
-rw-r--r--meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend5
-rw-r--r--meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend5
-rw-r--r--meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend4
-rw-r--r--meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend4
-rw-r--r--meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend13
-rw-r--r--meta-openstack/recipes-dangling/libvirt/libvirt_1.2.2.bbappend13
-rw-r--r--meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend5
-rw-r--r--meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend5
-rw-r--r--meta-openstack/recipes-dangling/open-iscsi/open-iscsi-user_2.0-871.bbappend37
-rw-r--r--meta-openstack/recipes-dangling/postgresql/postgresql/postgresql92
-rw-r--r--meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init43
-rw-r--r--meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend35
-rw-r--r--meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend4
-rw-r--r--meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend4
-rw-r--r--meta-openstack/recipes-dangling/python/python-setuptools_1.4.bbappend4
-rw-r--r--meta-openstack/recipes-dangling/qemu/qemu_1.7.0.bbappend5
27 files changed, 0 insertions, 356 deletions
diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend
deleted file mode 100644
index 7aca867..0000000
--- a/meta-openstack/recipes-dangling/apache2/apache2_2.4.10.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
5
6 # default layout for htdocsdir in 2.4.7 is different, create the following for
7 # backward compatibility reasons
8
9 mkdir -p ${D}${datadir}/${BPN}/default-site
10 ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
11
12 sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2
13}
14
15FILES_${PN} += "${datadir}/${BPN}/default-site"
diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.2.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.2.bbappend
deleted file mode 100644
index 664de2c..0000000
--- a/meta-openstack/recipes-dangling/apache2/apache2_2.4.2.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
5}
diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend
deleted file mode 100644
index 7aca867..0000000
--- a/meta-openstack/recipes-dangling/apache2/apache2_2.4.7.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
5
6 # default layout for htdocsdir in 2.4.7 is different, create the following for
7 # backward compatibility reasons
8
9 mkdir -p ${D}${datadir}/${BPN}/default-site
10 ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
11
12 sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2
13}
14
15FILES_${PN} += "${datadir}/${BPN}/default-site"
diff --git a/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend b/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend
deleted file mode 100644
index 7aca867..0000000
--- a/meta-openstack/recipes-dangling/apache2/apache2_2.4.9.bbappend
+++ /dev/null
@@ -1,15 +0,0 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
5
6 # default layout for htdocsdir in 2.4.7 is different, create the following for
7 # backward compatibility reasons
8
9 mkdir -p ${D}${datadir}/${BPN}/default-site
10 ln -sf ../htdocs ${D}${datadir}/${BPN}/default-site/htdocs
11
12 sed -i '30i if [ ! -e /var/log/apache2 ]; then ln -sf /var/apache2/logs/ /var/log/apache2; fi' ${D}/etc/init.d/apache2
13}
14
15FILES_${PN} += "${datadir}/${BPN}/default-site"
diff --git a/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend
deleted file mode 100644
index 52eab54..0000000
--- a/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.55.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
1do_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-dangling/dnsmasq/dnsmasq_2.63.bbappend b/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend
deleted file mode 100644
index 52eab54..0000000
--- a/meta-openstack/recipes-dangling/dnsmasq/dnsmasq_2.63.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
1do_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-dangling/iproute2/iproute2_3.10.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend
deleted file mode 100644
index 34ad5b8..0000000
--- a/meta-openstack/recipes-dangling/iproute2/iproute2_3.10.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
1RRECOMMENDS_${PN} += "kernel-module-veth \
2 "
diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend
deleted file mode 100644
index 34ad5b8..0000000
--- a/meta-openstack/recipes-dangling/iproute2/iproute2_3.11.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
1RRECOMMENDS_${PN} += "kernel-module-veth \
2 "
diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend
deleted file mode 100644
index 34ad5b8..0000000
--- a/meta-openstack/recipes-dangling/iproute2/iproute2_3.12.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
1RRECOMMENDS_${PN} += "kernel-module-veth \
2 "
diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend
deleted file mode 100644
index 34ad5b8..0000000
--- a/meta-openstack/recipes-dangling/iproute2/iproute2_3.2.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
1RRECOMMENDS_${PN} += "kernel-module-veth \
2 "
diff --git a/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend b/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend
deleted file mode 100644
index 34ad5b8..0000000
--- a/meta-openstack/recipes-dangling/iproute2/iproute2_3.9.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
1RRECOMMENDS_${PN} += "kernel-module-veth \
2 "
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
deleted file mode 100644
index 7b4d5df..0000000
--- a/meta-openstack/recipes-dangling/iptables/iptables_1.4.12.2.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
1INC := "${@int(PRINC) + 1}"
2
3RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \
4 kernel-module-xt-redirect \
5 "
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
deleted file mode 100644
index 7b4d5df..0000000
--- a/meta-openstack/recipes-dangling/iptables/iptables_1.4.19.1.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
1INC := "${@int(PRINC) + 1}"
2
3RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \
4 kernel-module-xt-redirect \
5 "
diff --git a/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend
deleted file mode 100644
index 3a6634e..0000000
--- a/meta-openstack/recipes-dangling/libvirt/libvirt_1.0.3.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
1PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \
2 python numactl sanlock ebtables \
3 ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
4 "
diff --git a/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend
deleted file mode 100644
index 3a6634e..0000000
--- a/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.1.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
1PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \
2 python numactl sanlock ebtables \
3 ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
4 "
diff --git a/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend
deleted file mode 100644
index eb7a921..0000000
--- a/meta-openstack/recipes-dangling/libvirt/libvirt_1.1.2.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
1PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \
2 python numactl sanlock ebtables \
3 ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
4 "
5
6inherit useradd
7USERADD_PACKAGES = "${PN}"
8GROUPADD_PARAM_${PN} = "--system libvirt"
9
10do_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-dangling/libvirt/libvirt_1.2.2.bbappend b/meta-openstack/recipes-dangling/libvirt/libvirt_1.2.2.bbappend
deleted file mode 100644
index 195633b..0000000
--- a/meta-openstack/recipes-dangling/libvirt/libvirt_1.2.2.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
1PACKAGECONFIG ?= "qemu lxc test remote macvtap libvirtd udev yajl \
2 python sanlock ebtables \
3 ${@base_contains('DISTRO_FEATURES', 'selinux', 'selinux', '', d)} \
4 "
5
6inherit useradd
7USERADD_PACKAGES = "${PN}"
8GROUPADD_PARAM_${PN} = "--system libvirt"
9
10do_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-dangling/lighttpd/lighttpd_1.4.30.bbappend b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend
deleted file mode 100644
index 50fab9f..0000000
--- a/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.30.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 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
5}
diff --git a/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend b/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend
deleted file mode 100644
index 50fab9f..0000000
--- a/meta-openstack/recipes-dangling/lighttpd/lighttpd_1.4.33.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() {
4 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
5}
diff --git a/meta-openstack/recipes-dangling/open-iscsi/open-iscsi-user_2.0-871.bbappend b/meta-openstack/recipes-dangling/open-iscsi/open-iscsi-user_2.0-871.bbappend
deleted file mode 100644
index a994cb0..0000000
--- a/meta-openstack/recipes-dangling/open-iscsi/open-iscsi-user_2.0-871.bbappend
+++ /dev/null
@@ -1,37 +0,0 @@
1PRINC := "${@int(PRINC) + 1}"
2
3inherit update-rc.d
4
5do_install () {
6 #oe_runmake DESTDIR="${D}" install_user
7
8 install -d ${D}${sysconfdir}/iscsi/ifaces
9 install -d ${D}${sysconfdir}/init.d
10 install -d ${D}${base_sbindir}
11
12 install -p -m 755 ${S}/usr/iscsid ${S}/usr/iscsiadm \
13 ${S}/utils/iscsi-iname \
14 ${S}/usr/iscsistart ${D}/${base_sbindir}
15
16 install -m 755 ${S}/usr/iscsid ${D}${base_sbindir}
17 install -m 755 ${S}/usr/iscsiadm ${D}${base_sbindir}
18 install -m 755 ${S}/utils/iscsi-iname ${D}${base_sbindir}
19 install -m 755 ${S}/utils/iscsi_discovery ${D}${base_sbindir}
20
21 install -p -m 644 ${S}/etc/iscsid.conf ${D}${sysconfdir}/iscsi/
22 install -p -m 644 ${S}/etc/iface.example ${D}${sysconfdir}/iscsi/ifaces/
23 install -p -m 755 ${S}/etc/initd/initd.debian ${D}${sysconfdir}/init.d/open-iscsi
24}
25
26pkg_postinst_${PN} () {
27 if [ "x$D" != "x" ]; then
28 exit 1
29 fi
30 if [ ! -f /etc/iscsi/initiatorname.iscsi ]; then
31 echo "InitiatorName=$(/sbin/iscsi-iname)" > \
32 /etc/iscsi/initiatorname.iscsi
33 fi
34}
35
36INITSCRIPT_NAME = "open-iscsi"
37INITSCRIPT_PARAMS = "start 30 1 2 3 4 5 . stop 70 0 1 2 3 4 5 6 ."
diff --git a/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql
deleted file mode 100644
index 5a34ec0..0000000
--- a/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql
+++ /dev/null
@@ -1,92 +0,0 @@
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
14DAEMON=/usr/bin/postmaster
15DESC="PostgreSQL RDBMS server"
16
17datadir=`grep ^data_directory /etc/postgresql/postgresql.conf |sed -e "s#^.*= '##; s#'.*##"`
18if [ "$datadir" = "" ] ; then
19 datadir=/etc/postgresql
20else
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
26fi
27
28cd /
29
30start ()
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
47stop ()
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
71case "$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 ;;
90esac
91
92exit 0
diff --git a/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init b/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init
deleted file mode 100644
index c9c3807..0000000
--- a/meta-openstack/recipes-dangling/postgresql/postgresql/postgresql-init
+++ /dev/null
@@ -1,43 +0,0 @@
1#!/bin/sh
2# set -x
3
4PN=postgresql
5CONTROLLER_IP=%CONTROLLER_IP%
6COMPUTE_IP=%COMPUTE_IP%
7DB_USER=%DB_USER%
8DB_PASSWORD=%DB_PASSWORD%
9
10if [ -e /etc/${PN}/PG_VERSION ]; then
11 # the database has already been initialized, return
12 exit 0
13fi
14
15sudo -u postgres initdb -D /etc/${PN}/
16echo "listen_addresses = '*'" >> /etc/${PN}/postgresql.conf
17echo "host all all ${CONTROLLER_IP}/32 trust" >> /etc/${PN}/pg_hba.conf
18echo "host all all ${COMPUTE_IP}/32 trust" >> /etc/${PN}/pg_hba.conf
19/etc/init.d/postgresql start
20
21count=0
22done=0
23while [ $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`
36done
37
38if [ $done -eq 0 ]; then
39 echo "[ERROR] postgres: unable to create admin account"
40 exit 1
41fi
42
43ln -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
deleted file mode 100644
index 98e7207..0000000
--- a/meta-openstack/recipes-dangling/postgresql/postgresql_8.4.7.bbappend
+++ /dev/null
@@ -1,35 +0,0 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 1}"
3
4SRC_URI += "file://postgresql"
5
6inherit useradd update-rc.d identity
7
8do_install_append() {
9 install -d ${D}${sysconfdir}/${PN}
10 chown postgres ${D}${sysconfdir}/${PN}
11
12 install -d ${D}${sysconfdir}/init.d/
13 install -m 0755 ${WORKDIR}/postgresql ${D}${sysconfdir}/init.d/postgresql
14}
15
16USERADD_PACKAGES = "${PN}"
17GROUPADD_PARAM_${PN} = "--system postgres"
18USERADD_PARAM_${PN} = "--system --home /var/lib/postgres -g postgres \
19 --no-create-home --shell /bin/false postgres"
20
21pkg_postinst_${PN} () {
22 if [ "x$D" != "x" ]; then
23 exit 1
24 fi
25
26 sudo -u postgres initdb -D /etc/${PN}/
27 /etc/init.d/postgresql start
28 sudo -u postgres psql -c "CREATE ROLE ${DB_USER} WITH SUPERUSER LOGIN PASSWORD '${DB_PASSWORD}'"
29 ln -s /usr/share/zoneinfo /usr/share/postgresql/timezone
30}
31
32FILES_${PN} += "${localstatedir}/run/${PN}"
33
34INITSCRIPT_NAME = "${PN}"
35INITSCRIPT_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
deleted file mode 100644
index 3c691d3..0000000
--- a/meta-openstack/recipes-dangling/python/python-setuptools_0.6c11.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
1# conflicting file prevention
2do_install_append() {
3 rm -f ${D}${libdir}/python*/site-packages/site.py*
4} \ 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
deleted file mode 100644
index 3c691d3..0000000
--- a/meta-openstack/recipes-dangling/python/python-setuptools_1.1.6.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
1# conflicting file prevention
2do_install_append() {
3 rm -f ${D}${libdir}/python*/site-packages/site.py*
4} \ No newline at end of file
diff --git a/meta-openstack/recipes-dangling/python/python-setuptools_1.4.bbappend b/meta-openstack/recipes-dangling/python/python-setuptools_1.4.bbappend
deleted file mode 100644
index 3c691d3..0000000
--- a/meta-openstack/recipes-dangling/python/python-setuptools_1.4.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
1# conflicting file prevention
2do_install_append() {
3 rm -f ${D}${libdir}/python*/site-packages/site.py*
4} \ No newline at end of file
diff --git a/meta-openstack/recipes-dangling/qemu/qemu_1.7.0.bbappend b/meta-openstack/recipes-dangling/qemu/qemu_1.7.0.bbappend
deleted file mode 100644
index f100c28..0000000
--- a/meta-openstack/recipes-dangling/qemu/qemu_1.7.0.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
1PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice,"
2
3PACKAGECONFIG ?= "spice virtfs attr cap-ng"
4PACKAGECONFIG_class-native = ""
5PACKAGECONFIG_class-nativesdk = "" \ No newline at end of file