summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend2
-rw-r--r--meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend2
-rw-r--r--meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend2
-rw-r--r--meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend2
-rw-r--r--meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend2
-rw-r--r--meta-openstack/recipes-httpd/apache2/apache2_2.4.10.bbappend2
-rw-r--r--meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend1
-rw-r--r--meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend1
-rw-r--r--meta-openstack/recipes-kernel/linux/linux-yocto_3.4.bbappend1
-rw-r--r--meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend2
-rw-r--r--meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend1
11 files changed, 0 insertions, 18 deletions
diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend b/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend
index ad7e232..bfc543a 100644
--- a/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend
+++ b/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend
@@ -1,5 +1,3 @@
1PRINC = "1"
2
3FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
4 2
5SRC_URI += "file://mcs-sshd" 3SRC_URI += "file://mcs-sshd"
diff --git a/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend b/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend
index a24bc7f..53f0c20 100644
--- a/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend
+++ b/meta-openstack/recipes-core/base-files/base-files_3.0.14.bbappend
@@ -1,5 +1,3 @@
1PRINC = "1"
2
3FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
4 2
5SRC_URI += "file://nsswitch.conf" 3SRC_URI += "file://nsswitch.conf"
diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend b/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend
index 7b4d5df..2a53557 100644
--- a/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend
+++ b/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend
@@ -1,5 +1,3 @@
1INC := "${@int(PRINC) + 1}"
2
3RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ 1RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \
4 kernel-module-xt-redirect \ 2 kernel-module-xt-redirect \
5 " 3 "
diff --git a/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend b/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend
index dc32cc9..0e93ace 100644
--- a/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend
+++ b/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend
@@ -1,5 +1,3 @@
1PRINC = "1"
2
3FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
4 2
5SRC_URI += "file://common-account" 3SRC_URI += "file://common-account"
diff --git a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend
index 50fab9f..33b1f61 100644
--- a/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend
+++ b/meta-openstack/recipes-extended/lighttpd/lighttpd_1.4.35.bbappend
@@ -1,5 +1,3 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() { 1do_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 2 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} 3}
diff --git a/meta-openstack/recipes-httpd/apache2/apache2_2.4.10.bbappend b/meta-openstack/recipes-httpd/apache2/apache2_2.4.10.bbappend
index 7aca867..7af8143 100644
--- a/meta-openstack/recipes-httpd/apache2/apache2_2.4.10.bbappend
+++ b/meta-openstack/recipes-httpd/apache2/apache2_2.4.10.bbappend
@@ -1,5 +1,3 @@
1INC := "${@int(PRINC) + 1}"
2
3do_install_append() { 1do_install_append() {
4 sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf 2 sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf
5 3
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend
index 2d7c60f..955716b 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_3.10.bbappend
@@ -1,5 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 1}"
3 2
4SRC_URI += "file://iscsi-tcp.scc \ 3SRC_URI += "file://iscsi-tcp.scc \
5 file://enable-iscsi-tcp.cfg \ 4 file://enable-iscsi-tcp.cfg \
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend
index 28d4622..843546c 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_3.14.bbappend
@@ -1,5 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 1}"
3 2
4SRC_URI += "file://enable-veth.cfg \ 3SRC_URI += "file://enable-veth.cfg \
5 file://enable-iscsi-tcp.cfg \ 4 file://enable-iscsi-tcp.cfg \
diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_3.4.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_3.4.bbappend
index 6df4c0f..5afa757 100644
--- a/meta-openstack/recipes-kernel/linux/linux-yocto_3.4.bbappend
+++ b/meta-openstack/recipes-kernel/linux/linux-yocto_3.4.bbappend
@@ -1,5 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 1}"
3 2
4SRC_URI += "file://iptables-nat.scc \ 3SRC_URI += "file://iptables-nat.scc \
5 file://enable-veth.cfg \ 4 file://enable-veth.cfg \
diff --git a/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend b/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend
index 3f9fc7d..296e275 100644
--- a/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend
+++ b/meta-openstack/recipes-support/openldap/openldap_2.4.39.bbappend
@@ -1,5 +1,3 @@
1PRINC = "2"
2
3DEPEND_${PN} += "cyrus-sasl" 1DEPEND_${PN} += "cyrus-sasl"
4RDEPEND_${PN} += "libsasl2-modules" 2RDEPEND_${PN} += "libsasl2-modules"
5 3
diff --git a/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend b/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend
index 26984ca..2e61fde 100644
--- a/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend
+++ b/meta-openstack/recipes-support/postgresql/postgresql_9.2.4.bbappend
@@ -1,5 +1,4 @@
1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" 1FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2PRINC := "${@int(PRINC) + 1}"
3 2
4SRC_URI += "file://postgresql \ 3SRC_URI += "file://postgresql \
5 file://postgresql-init" 4 file://postgresql-init"