merged Bruce
On 16-12-23 10:36 AM, Mark Asselstine wrote:
Signed-off-by: Mark Asselstine <[email protected]> --- meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend | 3 --- meta-openstack/recipes-extended/iptables/iptables_1.6.%.bbappend | 3 +++ meta-openstack/recipes-graphics/xorg-app/xterm_320.bbappend | 1 - meta-openstack/recipes-graphics/xorg-app/xterm_325.bbappend | 1 + .../recipes-support/bash-completion/bash-completion_2.%.bbappend | 1 + .../recipes-support/bash-completion/bash-completion_2.1.bbappend | 1 - meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend | 1 - meta-openstack/recipes-support/libbsd/libbsd_0.8.%.bbappend | 1 + 8 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend create mode 100644 meta-openstack/recipes-extended/iptables/iptables_1.6.%.bbappend delete mode 100644 meta-openstack/recipes-graphics/xorg-app/xterm_320.bbappend create mode 100644 meta-openstack/recipes-graphics/xorg-app/xterm_325.bbappend create mode 100644 meta-openstack/recipes-support/bash-completion/bash-completion_2.%.bbappend delete mode 100644 meta-openstack/recipes-support/bash-completion/bash-completion_2.1.bbappend delete mode 100644 meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend create mode 100644 meta-openstack/recipes-support/libbsd/libbsd_0.8.%.bbappend diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend b/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend deleted file mode 100644 index 2a53557..0000000 --- a/meta-openstack/recipes-extended/iptables/iptables_1.4.21.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ - kernel-module-xt-redirect \ - " diff --git a/meta-openstack/recipes-extended/iptables/iptables_1.6.%.bbappend b/meta-openstack/recipes-extended/iptables/iptables_1.6.%.bbappend new file mode 100644 index 0000000..2a53557 --- /dev/null +++ b/meta-openstack/recipes-extended/iptables/iptables_1.6.%.bbappend @@ -0,0 +1,3 @@ +RRECOMMENDS_${PN} += "kernel-module-xt-conntrack \ + kernel-module-xt-redirect \ + " diff --git a/meta-openstack/recipes-graphics/xorg-app/xterm_320.bbappend b/meta-openstack/recipes-graphics/xorg-app/xterm_320.bbappend deleted file mode 100644 index bb8c310..0000000 --- a/meta-openstack/recipes-graphics/xorg-app/xterm_320.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS += "freetype-native" diff --git a/meta-openstack/recipes-graphics/xorg-app/xterm_325.bbappend b/meta-openstack/recipes-graphics/xorg-app/xterm_325.bbappend new file mode 100644 index 0000000..bb8c310 --- /dev/null +++ b/meta-openstack/recipes-graphics/xorg-app/xterm_325.bbappend @@ -0,0 +1 @@ +DEPENDS += "freetype-native" diff --git a/meta-openstack/recipes-support/bash-completion/bash-completion_2.%.bbappend b/meta-openstack/recipes-support/bash-completion/bash-completion_2.%.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/bash-completion/bash-completion_2.%.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/bash-completion/bash-completion_2.1.bbappend b/meta-openstack/recipes-support/bash-completion/bash-completion_2.1.bbappend deleted file mode 100644 index 7447c56..0000000 --- a/meta-openstack/recipes-support/bash-completion/bash-completion_2.1.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend b/meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend deleted file mode 100644 index 7447c56..0000000 --- a/meta-openstack/recipes-support/libbsd/libbsd_0.7.0.bbappend +++ /dev/null @@ -1 +0,0 @@ -inherit autotools-brokensep diff --git a/meta-openstack/recipes-support/libbsd/libbsd_0.8.%.bbappend b/meta-openstack/recipes-support/libbsd/libbsd_0.8.%.bbappend new file mode 100644 index 0000000..7447c56 --- /dev/null +++ b/meta-openstack/recipes-support/libbsd/libbsd_0.8.%.bbappend @@ -0,0 +1 @@ +inherit autotools-brokensep
-- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
