diff options
author | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-08-21 15:24:00 +0800 |
---|---|---|
committer | Xin Ouyang <Xin.Ouyang@windriver.com> | 2012-08-21 16:17:41 +0800 |
commit | 2b3fa8a8c36fbc255f20ef62fc7a58977f91713b (patch) | |
tree | 26d92dd3842a0745e0ee0d175e18c372f3d6b23d | |
parent | 4691f62096bc9272206189b84045dbfa95c925ad (diff) | |
download | meta-selinux-2b3fa8a8c36fbc255f20ef62fc7a58977f91713b.tar.gz |
pam-1.1.6: fix wrong path for sepermit module
Fix this error:
===================
| mkdir -p /var/run/sepermit
| mkdir: cannot create directory `/var/run/sepermit': Permission denied
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.6.bbappend | 7 |
2 files changed, 37 insertions, 1 deletions
diff --git a/recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch b/recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch new file mode 100644 index 0000000..d48d386 --- /dev/null +++ b/recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch | |||
@@ -0,0 +1,31 @@ | |||
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.6.bbappend b/recipes-extended/pam/libpam_1.1.6.bbappend index 23ab11d..ea7ba6a 100644 --- a/recipes-extended/pam/libpam_1.1.6.bbappend +++ b/recipes-extended/pam/libpam_1.1.6.bbappend | |||
@@ -1,6 +1,11 @@ | |||
1 | #FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" | ||
2 | FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}" | ||
3 | |||
4 | SRC_URI += "file://sepermit-add-DESTDIR-prefix.patch" | ||
5 | |||
1 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" | 6 | DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" |
2 | 7 | ||
3 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '', '--disable-selinux', d)}" | 8 | EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '', '--disable-selinux', d)}" |
4 | 9 | ||
5 | PR .= ".1" | 10 | PR .= ".2" |
6 | 11 | ||