diff options
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 @@ | |||
1 | PRINC = "1" | ||
2 | |||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
4 | 2 | ||
5 | SRC_URI += "file://mcs-sshd" | 3 | SRC_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 @@ | |||
1 | PRINC = "1" | ||
2 | |||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
4 | 2 | ||
5 | SRC_URI += "file://nsswitch.conf" | 3 | SRC_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 @@ | |||
1 | INC := "${@int(PRINC) + 1}" | ||
2 | |||
3 | RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ | 1 | RRECOMMENDS_${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 @@ | |||
1 | PRINC = "1" | ||
2 | |||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
4 | 2 | ||
5 | SRC_URI += "file://common-account" | 3 | SRC_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 @@ | |||
1 | INC := "${@int(PRINC) + 1}" | ||
2 | |||
3 | do_install_append() { | 1 | do_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 @@ | |||
1 | INC := "${@int(PRINC) + 1}" | ||
2 | |||
3 | do_install_append() { | 1 | do_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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | PRINC := "${@int(PRINC) + 1}" | ||
3 | 2 | ||
4 | SRC_URI += "file://iscsi-tcp.scc \ | 3 | SRC_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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | PRINC := "${@int(PRINC) + 1}" | ||
3 | 2 | ||
4 | SRC_URI += "file://enable-veth.cfg \ | 3 | SRC_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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | PRINC := "${@int(PRINC) + 1}" | ||
3 | 2 | ||
4 | SRC_URI += "file://iptables-nat.scc \ | 3 | SRC_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 @@ | |||
1 | PRINC = "2" | ||
2 | |||
3 | DEPEND_${PN} += "cyrus-sasl" | 1 | DEPEND_${PN} += "cyrus-sasl" |
4 | RDEPEND_${PN} += "libsasl2-modules" | 2 | RDEPEND_${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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
2 | PRINC := "${@int(PRINC) + 1}" | ||
3 | 2 | ||
4 | SRC_URI += "file://postgresql \ | 3 | SRC_URI += "file://postgresql \ |
5 | file://postgresql-init" | 4 | file://postgresql-init" |