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 ad7e2327..bfc543aa 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 @@ -PRINC = "1" - FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 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 a24bc7f4..53f0c209 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 @@ -PRINC = "1" - FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 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 7b4d5df6..2a53557a 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 @@ -INC := "${@int(PRINC) + 1}" - RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ kernel-module-xt-redirect \ " 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 dc32cc93..0e93ace1 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 @@ -PRINC = "1" - FILESEXTRAPATHS_prepend := "${THISDIR}/files:" 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 50fab9f6..33b1f61c 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 @@ -INC := "${@int(PRINC) + 1}" - do_install_append() { 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 } 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 7aca867a..7af8143f 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 @@ -INC := "${@int(PRINC) + 1}" - do_install_append() { sed -i -e 's/#ServerName.*$/ServerName 127.0.0.1:80/' ${D}${sysconfdir}/apache2/httpd.conf 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 2d7c60f7..955716b4 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" SRC_URI += "file://iscsi-tcp.scc \ 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 28d4622e..843546c8 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" SRC_URI += "file://enable-veth.cfg \ 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 6df4c0f2..5afa757e 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" SRC_URI += "file://iptables-nat.scc \ 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 3f9fc7d9..296e275b 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 @@ -PRINC = "2" - DEPEND_${PN} += "cyrus-sasl" RDEPEND_${PN} += "libsasl2-modules" 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 26984ca2..2e61fdeb 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 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -PRINC := "${@int(PRINC) + 1}" SRC_URI += "file://postgresql \ file://postgresql-init" |