From 2d4fa14e545084acd35cbe19e32807ff96d93859 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Mon, 25 Aug 2014 13:43:48 -0400 Subject: bbappends: resync bbappends to oe-core/meta-oe latest Signed-off-by: Bruce Ashfield --- .../openssh/openssh_6.0p1.bbappend | 13 ------------ .../openssh/openssh_6.6p1.bbappend | 13 ++++++++++++ .../recipes-devtools/qemu/qemu_2.0.0.bbappend | 5 ----- .../recipes-devtools/qemu/qemu_2.1.0.bbappend | 5 +++++ .../recipes-extended/libpam/libpam_1.1.5.bbappend | 23 ---------------------- .../recipes-extended/libpam/libpam_1.1.6.bbappend | 23 ++++++++++++++++++++++ .../iproute2/iproute2_3.14.0.bbappend | 2 -- .../iproute2/iproute2_3.15.0.bbappend | 2 ++ recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend | 16 --------------- recipes-connectivity/dhcp/dhcp_4.3.bbappend | 16 +++++++++++++++ 10 files changed, 59 insertions(+), 59 deletions(-) delete mode 100644 meta-openstack/recipes-connectivity/openssh/openssh_6.0p1.bbappend create mode 100644 meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend delete mode 100644 meta-openstack/recipes-devtools/qemu/qemu_2.0.0.bbappend create mode 100644 meta-openstack/recipes-devtools/qemu/qemu_2.1.0.bbappend delete mode 100644 meta-openstack/recipes-extended/libpam/libpam_1.1.5.bbappend create mode 100644 meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend delete mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend create mode 100644 meta-openstack/recipes-support/iproute2/iproute2_3.15.0.bbappend delete mode 100644 recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend create mode 100644 recipes-connectivity/dhcp/dhcp_4.3.bbappend diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/meta-openstack/recipes-connectivity/openssh/openssh_6.0p1.bbappend deleted file mode 100644 index ad7e232..0000000 --- a/meta-openstack/recipes-connectivity/openssh/openssh_6.0p1.bbappend +++ /dev/null @@ -1,13 +0,0 @@ -PRINC = "1" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://mcs-sshd" -SRC_URI += "file://mcs-sshd_config" - -do_install_append() { - if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then - install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd - install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config - fi -} diff --git a/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend b/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend new file mode 100644 index 0000000..ad7e232 --- /dev/null +++ b/meta-openstack/recipes-connectivity/openssh/openssh_6.6p1.bbappend @@ -0,0 +1,13 @@ +PRINC = "1" + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://mcs-sshd" +SRC_URI += "file://mcs-sshd_config" + +do_install_append() { + if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then + install -D -m 644 ${WORKDIR}/mcs-sshd ${D}/etc/pam.d/sshd + install -D -m 644 ${WORKDIR}/mcs-sshd_config ${D}/etc/ssh/sshd_config + fi +} diff --git a/meta-openstack/recipes-devtools/qemu/qemu_2.0.0.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_2.0.0.bbappend deleted file mode 100644 index f100c28..0000000 --- a/meta-openstack/recipes-devtools/qemu/qemu_2.0.0.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice," - -PACKAGECONFIG ?= "spice virtfs attr cap-ng" -PACKAGECONFIG_class-native = "" -PACKAGECONFIG_class-nativesdk = "" \ No newline at end of file diff --git a/meta-openstack/recipes-devtools/qemu/qemu_2.1.0.bbappend b/meta-openstack/recipes-devtools/qemu/qemu_2.1.0.bbappend new file mode 100644 index 0000000..1c8c682 --- /dev/null +++ b/meta-openstack/recipes-devtools/qemu/qemu_2.1.0.bbappend @@ -0,0 +1,5 @@ +PACKAGECONFIG[spice] = "--enable-spice,--disable-spice,spice," + +PACKAGECONFIG ?= "fdt spice virtfs attr cap-ng" +PACKAGECONFIG_class-native = "fdt" +PACKAGECONFIG_class-nativesdk = "fdt" diff --git a/meta-openstack/recipes-extended/libpam/libpam_1.1.5.bbappend b/meta-openstack/recipes-extended/libpam/libpam_1.1.5.bbappend deleted file mode 100644 index dc32cc9..0000000 --- a/meta-openstack/recipes-extended/libpam/libpam_1.1.5.bbappend +++ /dev/null @@ -1,23 +0,0 @@ -PRINC = "1" - -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://common-account" -SRC_URI += "file://common-auth" -SRC_URI += "file://common-password" -SRC_URI += "file://common-session" -SRC_URI += "file://common-session-noninteractive" - -PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" -PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd" - -do_install_append() { - if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then - install -m 755 -d ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-auth ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-password ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-session ${D}/etc/pam.d/ - install -m 644 ${WORKDIR}/common-session-noninteractive ${D}/etc/pam.d/ - fi -} diff --git a/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend b/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend new file mode 100644 index 0000000..dc32cc9 --- /dev/null +++ b/meta-openstack/recipes-extended/libpam/libpam_1.1.6.bbappend @@ -0,0 +1,23 @@ +PRINC = "1" + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://common-account" +SRC_URI += "file://common-auth" +SRC_URI += "file://common-password" +SRC_URI += "file://common-session" +SRC_URI += "file://common-session-noninteractive" + +PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'OpenLDAP', '', d)}" +PACKAGECONFIG[OpenLDAP] = ",,,pam-plugin-mkhomedir nss-pam-ldapd" + +do_install_append() { + if ${@base_contains('DISTRO_FEATURES', 'OpenLDAP', 'true', 'false', d)}; then + install -m 755 -d ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-account ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-auth ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-password ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-session ${D}/etc/pam.d/ + install -m 644 ${WORKDIR}/common-session-noninteractive ${D}/etc/pam.d/ + fi +} diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend deleted file mode 100644 index 34ad5b8..0000000 --- a/meta-openstack/recipes-support/iproute2/iproute2_3.14.0.bbappend +++ /dev/null @@ -1,2 +0,0 @@ -RRECOMMENDS_${PN} += "kernel-module-veth \ - " diff --git a/meta-openstack/recipes-support/iproute2/iproute2_3.15.0.bbappend b/meta-openstack/recipes-support/iproute2/iproute2_3.15.0.bbappend new file mode 100644 index 0000000..34ad5b8 --- /dev/null +++ b/meta-openstack/recipes-support/iproute2/iproute2_3.15.0.bbappend @@ -0,0 +1,2 @@ +RRECOMMENDS_${PN} += "kernel-module-veth \ + " diff --git a/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend b/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend deleted file mode 100644 index f5fb44a..0000000 --- a/recipes-connectivity/dhcp/dhcp_4.2.3-P2.bbappend +++ /dev/null @@ -1,16 +0,0 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/files:" - -SRC_URI += "file://dhclient-exit-hooks \ - " - -do_install_append () { - install -m 0644 ${WORKDIR}/dhclient-exit-hooks ${D}${sysconfdir}/dhcp/dhclient-exit-hooks - sed 's%/etc/dhclient-exit-hooks%/etc/dhcp/dhclient-exit-hooks%g' -i ${D}${base_sbindir}/dhclient-script - - sed 's%request .*%\noption classless-static-routes code 121 = array of unsigned integer 8;\n\nrequest &%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf - sed 's%netbios-name-servers,.*netbios-scope;%netbios-name-servers, netbios-scope, classless-static-routes;\n%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf - -} - -FILES_dhcp-client += "${sysconfdir}/dhcp/dhclient-exit-hooks \ - " diff --git a/recipes-connectivity/dhcp/dhcp_4.3.bbappend b/recipes-connectivity/dhcp/dhcp_4.3.bbappend new file mode 100644 index 0000000..f5fb44a --- /dev/null +++ b/recipes-connectivity/dhcp/dhcp_4.3.bbappend @@ -0,0 +1,16 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + +SRC_URI += "file://dhclient-exit-hooks \ + " + +do_install_append () { + install -m 0644 ${WORKDIR}/dhclient-exit-hooks ${D}${sysconfdir}/dhcp/dhclient-exit-hooks + sed 's%/etc/dhclient-exit-hooks%/etc/dhcp/dhclient-exit-hooks%g' -i ${D}${base_sbindir}/dhclient-script + + sed 's%request .*%\noption classless-static-routes code 121 = array of unsigned integer 8;\n\nrequest &%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf + sed 's%netbios-name-servers,.*netbios-scope;%netbios-name-servers, netbios-scope, classless-static-routes;\n%g' -i ${D}${sysconfdir}/dhcp/dhclient.conf + +} + +FILES_dhcp-client += "${sysconfdir}/dhcp/dhclient-exit-hooks \ + " -- cgit v1.2.3-54-g00ecf