diff options
author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2013-01-04 18:33:43 +0800 |
---|---|---|
committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2013-01-05 13:39:56 +0800 |
commit | 5d6c4f736f556444356d807001ef64d401cb19e6 (patch) | |
tree | 71d2431c5a3b22d8f282136076d32ded074e790c | |
parent | 383acf125ad98a0d62ca7ba5217ceaf15a55b163 (diff) | |
download | meta-selinux-5d6c4f736f556444356d807001ef64d401cb19e6.tar.gz |
packages: inherit with-selinux
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
-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 @@ | |||
1 | PR .= ".2" | 1 | PR .= ".3" |
2 | 2 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
4 | 4 | ||
5 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 5 | inherit with-selinux |
6 | |||
7 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
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 @@ | |||
1 | PR .= ".1" | 1 | PR .= ".2" |
2 | 2 | ||
3 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 3 | inherit with-selinux |
4 | |||
5 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
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 @@ | |||
1 | PR .= ".2" | 1 | PR .= ".3" |
2 | 2 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
4 | 4 | ||
5 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 5 | inherit with-selinux |
6 | |||
7 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
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 @@ | |||
1 | PR .= ".1" | 1 | PR .= ".2" |
2 | 2 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
4 | 4 | ||
5 | SRC_URI += "file://util-linux-selinux.patch \ | 5 | SRC_URI += "file://util-linux-selinux.patch \ |
6 | " | 6 | " |
7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | ||
8 | |||
9 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
10 | 7 | ||
8 | 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 @@ | |||
1 | PR .= ".1" | 1 | PR .= ".2" |
2 | 2 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" |
4 | 4 | ||
5 | SRC_URI += "file://at-3.1.13-selinux.patch" | 5 | SRC_URI += "file://at-3.1.13-selinux.patch" |
6 | 6 | ||
7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 7 | inherit with-selinux |
8 | |||
9 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
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 @@ | |||
1 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 1 | PR .= ".2" |
2 | |||
3 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
4 | |||
5 | PR .= ".1" | ||
6 | 2 | ||
3 | 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 @@ | |||
1 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux audit', '', d)}" | 1 | PR .= ".2" |
2 | 2 | ||
3 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | 3 | inherit with-selinux with-audit |
4 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-audit', '--without-audit', d)}" | ||
5 | |||
6 | PR .= ".1" | ||
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 @@ | |||
1 | PR .= ".1" | 1 | PR .= ".2" |
2 | 2 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" |
4 | 4 | ||
5 | SRC_URI += "file://findutils-selinux.patch" | 5 | SRC_URI += "file://findutils-selinux.patch" |
6 | 6 | ||
7 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 7 | inherit with-selinux |
8 | |||
9 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
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 @@ | |||
1 | PR .= ".4" | 1 | PR .= ".5" |
2 | 2 | ||
3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" | 3 | FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}-${PV}:" |
4 | 4 | ||
@@ -6,9 +6,7 @@ SRC_URI += "git://git.savannah.gnu.org/gnulib.git;protocol=git;rev=0e0635af0b238 | |||
6 | SRC_URI += "file://findutils-with-selinux.patch" | 6 | SRC_URI += "file://findutils-with-selinux.patch" |
7 | SRC_URI += "file://findutils-with-selinux-gnulib.patch" | 7 | SRC_URI += "file://findutils-with-selinux-gnulib.patch" |
8 | 8 | ||
9 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 9 | inherit with-selinux |
10 | |||
11 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
12 | 10 | ||
13 | do_configure_prepend() { | 11 | do_configure_prepend() { |
14 | ./import-gnulib.sh -d ${WORKDIR}/git | 12 | ./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 @@ | |||
1 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 1 | PR .= ".2" |
2 | |||
3 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
4 | |||
5 | PR .= ".1" | ||
6 | 2 | ||
3 | 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 @@ | |||
1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" | 1 | FILESEXTRAPATHS_prepend := "${THISDIR}/files:" |
2 | 2 | ||
3 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux audit', '', d)}" | 3 | PR .= ".3" |
4 | |||
5 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||
6 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-audit', '--without-audit', d)}" | ||
7 | |||
8 | PR .= ".2" | ||
9 | 4 | ||
5 | 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 @@ | |||
1 | PR .= ".1" | 1 | PR .= ".2" |
2 | 2 | ||
3 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 3 | inherit with-selinux |
4 | |||
5 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '--with-selinux', '--without-selinux', d)}" | ||