From d4182f50f19d183630e0f908ff953c4f9402cabe Mon Sep 17 00:00:00 2001 From: Armin Kuster Date: Fri, 20 Apr 2018 07:34:55 -0700 Subject: Refactor to conform to YP Compat requirements This prevents the signature from being modified Signed-off-by: Armin Kuster Signed-off-by: Bruce Ashfield --- recipes-core/busybox/busybox_%.bbappend | 11 +---------- recipes-core/busybox/busybox_virtualization.inc | 10 ++++++++++ .../iptables/iptables-meta-virtualization.inc | 19 +++++++++++++++++++ recipes-extended/iptables/iptables_1.%.bbappend | 20 +------------------- 4 files changed, 31 insertions(+), 29 deletions(-) create mode 100644 recipes-core/busybox/busybox_virtualization.inc create mode 100644 recipes-extended/iptables/iptables-meta-virtualization.inc diff --git a/recipes-core/busybox/busybox_%.bbappend b/recipes-core/busybox/busybox_%.bbappend index 8369a031..617caccb 100644 --- a/recipes-core/busybox/busybox_%.bbappend +++ b/recipes-core/busybox/busybox_%.bbappend @@ -1,10 +1 @@ -FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" - -SRC_URI += " \ - file://lspci.cfg \ - file://lsusb.cfg \ - file://mdev.cfg \ - file://mount-cifs.cfg \ - file://ps-extras.cfg \ - file://getopt.cfg \ - " +require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}_virtualization.inc', '', d)} diff --git a/recipes-core/busybox/busybox_virtualization.inc b/recipes-core/busybox/busybox_virtualization.inc new file mode 100644 index 00000000..d9c4e677 --- /dev/null +++ b/recipes-core/busybox/busybox_virtualization.inc @@ -0,0 +1,10 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/busybox:" + +SRC_URI += " \ + file://lspci.cfg \ + file://lsusb.cfg \ + file://mdev.cfg \ + file://mount-cifs.cfg \ + file://ps-extras.cfg \ + file://getopt.cfg \ + " diff --git a/recipes-extended/iptables/iptables-meta-virtualization.inc b/recipes-extended/iptables/iptables-meta-virtualization.inc new file mode 100644 index 00000000..8fd521c9 --- /dev/null +++ b/recipes-extended/iptables/iptables-meta-virtualization.inc @@ -0,0 +1,19 @@ +RRECOMMENDS_${PN} += "kernel-module-ip6-tables \ + kernel-module-ip-tables \ + kernel-module-ip6table-filter \ + kernel-module-iptable-filter \ + kernel-module-ip6table-raw \ + kernel-module-iptable-raw \ + kernel-module-ip6table-nat \ + kernel-module-iptable-nat \ + kernel-module-ip6table-mangle \ + kernel-module-iptable-magle \ + kernel-module-ip6table-security \ + kernel-module-iptable-security \ + kernel-module-ipt-reject \ + kernel-module-iptable-mangle \ + kernel-module-xt-checksum \ + kernel-module-xt-conntrack \ + kernel-module-xt-state \ + kernel-module-xt-tcpudp \ + " diff --git a/recipes-extended/iptables/iptables_1.%.bbappend b/recipes-extended/iptables/iptables_1.%.bbappend index 8fd521c9..9a15e60c 100644 --- a/recipes-extended/iptables/iptables_1.%.bbappend +++ b/recipes-extended/iptables/iptables_1.%.bbappend @@ -1,19 +1 @@ -RRECOMMENDS_${PN} += "kernel-module-ip6-tables \ - kernel-module-ip-tables \ - kernel-module-ip6table-filter \ - kernel-module-iptable-filter \ - kernel-module-ip6table-raw \ - kernel-module-iptable-raw \ - kernel-module-ip6table-nat \ - kernel-module-iptable-nat \ - kernel-module-ip6table-mangle \ - kernel-module-iptable-magle \ - kernel-module-ip6table-security \ - kernel-module-iptable-security \ - kernel-module-ipt-reject \ - kernel-module-iptable-mangle \ - kernel-module-xt-checksum \ - kernel-module-xt-conntrack \ - kernel-module-xt-state \ - kernel-module-xt-tcpudp \ - " +require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}-meta-virtualization.inc', '', d)} -- cgit v1.2.3-54-g00ecf