diff options
author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-09-25 14:34:26 +0800 |
---|---|---|
committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-10-18 11:34:19 +0800 |
commit | 3ea789b1bb5812ce71d779401b1002a1b0eed3af (patch) | |
tree | 3f6a0c79627267ac032e97ee3062075c123c7a5c | |
parent | b6ecdd6b2a860ab3db87b2d91f43440c05bc3d40 (diff) | |
download | meta-selinux-3ea789b1bb5812ce71d779401b1002a1b0eed3af.tar.gz |
libpam: 1.1.5 not need sepermit patch
We should drop sepermit-add-DESTDIR-prefix.patch for version 1.1.5.
Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com>
-rw-r--r-- | recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch | 31 | ||||
-rw-r--r-- | recipes-extended/pam/libpam_1.1.5.bbappend | 6 |
2 files changed, 1 insertions, 36 deletions
diff --git a/recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch b/recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch deleted file mode 100644 index d48d386..0000000 --- a/recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | Subject: [PATCH] libpam: add missing DESTDIR prefix | ||
2 | |||
3 | The DESTDIR prefix is missing, this will cause build failures for | ||
4 | mkdir /var/run/sepermit on the host. | ||
5 | |||
6 | | mkdir -p /var/run/sepermit | ||
7 | | mkdir: cannot create directory `/var/run/sepermit': Permission denied | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Xin Ouyang <Xin.Ouyang@windriver.com> | ||
12 | --- | ||
13 | modules/pam_sepermit/Makefile.am | 2 +- | ||
14 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am | ||
17 | index cfc5594..bc82275 100644 | ||
18 | --- a/modules/pam_sepermit/Makefile.am | ||
19 | +++ b/modules/pam_sepermit/Makefile.am | ||
20 | @@ -35,7 +35,7 @@ if HAVE_LIBSELINUX | ||
21 | securelib_LTLIBRARIES = pam_sepermit.la | ||
22 | |||
23 | install-data-local: | ||
24 | - mkdir -p $(sepermitlockdir) | ||
25 | + mkdir -p $(DESTDIR)$(sepermitlockdir) | ||
26 | endif | ||
27 | if ENABLE_REGENERATE_MAN | ||
28 | noinst_DATA = README pam_sepermit.8 sepermit.conf.5 | ||
29 | -- | ||
30 | 1.7.5.4 | ||
31 | |||
diff --git a/recipes-extended/pam/libpam_1.1.5.bbappend b/recipes-extended/pam/libpam_1.1.5.bbappend index f78551f..bb50a70 100644 --- a/recipes-extended/pam/libpam_1.1.5.bbappend +++ b/recipes-extended/pam/libpam_1.1.5.bbappend | |||
@@ -1,12 +1,8 @@ | |||
1 | FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}" | ||
2 | |||
3 | SRC_URI += "file://sepermit-add-DESTDIR-prefix.patch" | ||
4 | |||
5 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 1 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" |
6 | 2 | ||
7 | RDEPENDS_${PN}-runtime += "${@base_contains('DISTRO_FEATURES', 'selinux', 'pam-plugin-selinux', '', d)}" | 3 | RDEPENDS_${PN}-runtime += "${@base_contains('DISTRO_FEATURES', 'selinux', 'pam-plugin-selinux', '', d)}" |
8 | 4 | ||
9 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '', '--disable-selinux', d)}" | 5 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '', '--disable-selinux', d)}" |
10 | 6 | ||
11 | PR .= ".3" | 7 | PR .= ".4" |
12 | 8 | ||