From 5abfe148ef915d28535d43dabe38cc44ec2620f9 Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Fri, 4 Jan 2013 18:32:45 +0800 Subject: packages: inherit enable-selinux Signed-off-by: Xin Ouyang --- recipes-core/dbus/dbus_1.5.12.bbappend | 6 ++---- recipes-devtools/prelink/prelink_git.bbappend | 7 ++----- recipes-extended/pam/libpam_1.1.6.bbappend | 9 +++------ recipes-extended/parted/parted_3.1.bbappend | 6 ++---- recipes-extended/tar/tar_1.26.bbappend | 6 ++---- 5 files changed, 11 insertions(+), 23 deletions(-) diff --git a/recipes-core/dbus/dbus_1.5.12.bbappend b/recipes-core/dbus/dbus_1.5.12.bbappend index 70be093..366fdf5 100644 --- a/recipes-core/dbus/dbus_1.5.12.bbappend +++ b/recipes-core/dbus/dbus_1.5.12.bbappend @@ -1,5 +1,3 @@ -PR .= ".1" +PR .= ".2" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--enable-selinux', '--disable-selinux', d)}" +inherit enable-selinux diff --git a/recipes-devtools/prelink/prelink_git.bbappend b/recipes-devtools/prelink/prelink_git.bbappend index 29eaee7..366fdf5 100644 --- a/recipes-devtools/prelink/prelink_git.bbappend +++ b/recipes-devtools/prelink/prelink_git.bbappend @@ -1,6 +1,3 @@ -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--enable-selinux', '--disable-selinux', d)}" - -PR .= ".1" +PR .= ".2" +inherit enable-selinux diff --git a/recipes-extended/pam/libpam_1.1.6.bbappend b/recipes-extended/pam/libpam_1.1.6.bbappend index 678dc91..71acecc 100644 --- a/recipes-extended/pam/libpam_1.1.6.bbappend +++ b/recipes-extended/pam/libpam_1.1.6.bbappend @@ -3,11 +3,8 @@ FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}" SRC_URI += "file://sepermit-add-DESTDIR-prefix.patch" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" +PR .= ".4" -RDEPENDS_${PN}-runtime += "${@base_contains('DISTRO_FEATURES', 'selinux', 'pam-plugin-selinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '', '--disable-selinux', d)}" - -PR .= ".3" +inherit enable-selinux +RDEPENDS_${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}" diff --git a/recipes-extended/parted/parted_3.1.bbappend b/recipes-extended/parted/parted_3.1.bbappend index 70be093..366fdf5 100644 --- a/recipes-extended/parted/parted_3.1.bbappend +++ b/recipes-extended/parted/parted_3.1.bbappend @@ -1,5 +1,3 @@ -PR .= ".1" +PR .= ".2" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--enable-selinux', '--disable-selinux', d)}" +inherit enable-selinux diff --git a/recipes-extended/tar/tar_1.26.bbappend b/recipes-extended/tar/tar_1.26.bbappend index 2996853..4b971c5 100644 --- a/recipes-extended/tar/tar_1.26.bbappend +++ b/recipes-extended/tar/tar_1.26.bbappend @@ -1,9 +1,7 @@ -PR .= ".1" +PR .= ".2" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI += "file://tar-1.24-xattrs.patch" -DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" - -EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--enable-selinux', '--disable-selinux', d)}" +inherit enable-selinux -- cgit v1.2.3-54-g00ecf