diff options
| -rw-r--r-- | recipes-connectivity/openssh/openssh_6.0p1.bbappend | 6 | ||||
| -rw-r--r-- | recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend | 6 | ||||
| -rw-r--r-- | recipes-core/udev/udev_164.bbappend | 6 | ||||
| -rw-r--r-- | recipes-core/util-linux/util-linux_2.21.2.bbappend | 6 | ||||
| -rw-r--r-- | recipes-extended/at/at_3.1.13.bbappend | 6 | ||||
| -rw-r--r-- | recipes-extended/augeas/augeas_0.10.0.bbappend | 7 | ||||
| -rw-r--r-- | recipes-extended/cronie/cronie_1.4.8.bbappend | 7 | ||||
| -rw-r--r-- | recipes-extended/findutils/findutils_4.2.31.bbappend | 6 | ||||
| -rw-r--r-- | recipes-extended/findutils/findutils_4.4.2.bbappend | 6 | ||||
| -rw-r--r-- | recipes-extended/psmisc/psmisc_22.19.bbappend | 7 | ||||
| -rw-r--r-- | recipes-extended/shadow/shadow_4.1.4.3.bbappend | 8 | ||||
| -rw-r--r-- | recipes-extended/sudo/sudo_1.8.5p2.bbappend | 6 |
12 files changed, 24 insertions, 53 deletions
diff --git a/recipes-connectivity/openssh/openssh_6.0p1.bbappend b/recipes-connectivity/openssh/openssh_6.0p1.bbappend index 103a6ac..698f4ab 100644 --- a/recipes-connectivity/openssh/openssh_6.0p1.bbappend +++ b/recipes-connectivity/openssh/openssh_6.0p1.bbappend @@ -1,7 +1,5 @@ -PR .= ".2" +PR .= ".3" FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" +inherit with-selinux diff --git a/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend b/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend index 396feae..5ad8973 100644 --- a/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend +++ b/recipes-core/glib-2.0/glib-2.0_2.32.4.bbappend @@ -1,5 +1,3 @@ -PR .= ".1" +PR .= ".2" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" +inherit with-selinux diff --git a/recipes-core/udev/udev_164.bbappend b/recipes-core/udev/udev_164.bbappend index a699b52..f42ad45 100644 --- a/recipes-core/udev/udev_164.bbappend +++ b/recipes-core/udev/udev_164.bbappend @@ -1,7 +1,5 @@ -PR .= ".2" +PR .= ".3" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" +inherit with-selinux diff --git a/recipes-core/util-linux/util-linux_2.21.2.bbappend b/recipes-core/util-linux/util-linux_2.21.2.bbappend index b9a09b5..97053c7 100644 --- a/recipes-core/util-linux/util-linux_2.21.2.bbappend +++ b/recipes-core/util-linux/util-linux_2.21.2.bbappend @@ -1,10 +1,8 @@ -PR .= ".1" +PR .= ".2" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://util-linux-selinux.patch \ " -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" +inherit with-selinux diff --git a/recipes-extended/at/at_3.1.13.bbappend b/recipes-extended/at/at_3.1.13.bbappend index 9099bcd..f30abab 100644 --- a/recipes-extended/at/at_3.1.13.bbappend +++ b/recipes-extended/at/at_3.1.13.bbappend @@ -1,9 +1,7 @@ -PR .= ".1" +PR .= ".2" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://at-3.1.13-selinux.patch" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" +inherit with-selinux diff --git a/recipes-extended/augeas/augeas_0.10.0.bbappend b/recipes-extended/augeas/augeas_0.10.0.bbappend index aa6b6cb..5ad8973 100644 --- a/recipes-extended/augeas/augeas_0.10.0.bbappend +++ b/recipes-extended/augeas/augeas_0.10.0.bbappend @@ -1,6 +1,3 @@ -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" - -PR .= ".1" +PR .= ".2" +inherit with-selinux diff --git a/recipes-extended/cronie/cronie_1.4.8.bbappend b/recipes-extended/cronie/cronie_1.4.8.bbappend index 6a106c5..a398bec 100644 --- a/recipes-extended/cronie/cronie_1.4.8.bbappend +++ b/recipes-extended/cronie/cronie_1.4.8.bbappend @@ -1,6 +1,3 @@ -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux audit', '', d)}" +PR .= ".2" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-audit', '--without-audit', d)}" - -PR .= ".1" +inherit with-selinux with-audit diff --git a/recipes-extended/findutils/findutils_4.2.31.bbappend b/recipes-extended/findutils/findutils_4.2.31.bbappend index c44e103..4c9495e 100644 --- a/recipes-extended/findutils/findutils_4.2.31.bbappend +++ b/recipes-extended/findutils/findutils_4.2.31.bbappend @@ -1,9 +1,7 @@ -PR .= ".1" +PR .= ".2" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" SRC_URI += "file://findutils-selinux.patch" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" +inherit with-selinux diff --git a/recipes-extended/findutils/findutils_4.4.2.bbappend b/recipes-extended/findutils/findutils_4.4.2.bbappend index ba56fbe..fa1387c 100644 --- a/recipes-extended/findutils/findutils_4.4.2.bbappend +++ b/recipes-extended/findutils/findutils_4.4.2.bbappend @@ -1,4 +1,4 @@ -PR .= ".4" +PR .= ".5" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" @@ -6,9 +6,7 @@ SRC_URI += "git://git.savannah.gnu.org/gnulib.git;protocol=git;rev=0e0635af0b238 SRC_URI += "file://findutils-with-selinux.patch" SRC_URI += "file://findutils-with-selinux-gnulib.patch" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" +inherit with-selinux do_configure_prepend() { ./import-gnulib.sh -d ${WORKDIR}/git diff --git a/recipes-extended/psmisc/psmisc_22.19.bbappend b/recipes-extended/psmisc/psmisc_22.19.bbappend index aa6b6cb..5ad8973 100644 --- a/recipes-extended/psmisc/psmisc_22.19.bbappend +++ b/recipes-extended/psmisc/psmisc_22.19.bbappend @@ -1,6 +1,3 @@ -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" - -PR .= ".1" +PR .= ".2" +inherit with-selinux diff --git a/recipes-extended/shadow/shadow_4.1.4.3.bbappend b/recipes-extended/shadow/shadow_4.1.4.3.bbappend index 97a806f..c2c3332 100644 --- a/recipes-extended/shadow/shadow_4.1.4.3.bbappend +++ b/recipes-extended/shadow/shadow_4.1.4.3.bbappend @@ -1,9 +1,5 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux audit', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-audit', '--without-audit', d)}" - -PR .= ".2" +PR .= ".3" +inherit with-selinux with-audit diff --git a/recipes-extended/sudo/sudo_1.8.5p2.bbappend b/recipes-extended/sudo/sudo_1.8.5p2.bbappend index 396feae..5ad8973 100644 --- a/recipes-extended/sudo/sudo_1.8.5p2.bbappend +++ b/recipes-extended/sudo/sudo_1.8.5p2.bbappend @@ -1,5 +1,3 @@ -PR .= ".1" +PR .= ".2" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" +inherit with-selinux |