summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShrikant Bobade <shrikant_bobade@mentor.com>2015-07-30 14:55:04 +0530
committerJoe MacDonald <joe_macdonald@mentor.com>2015-08-07 14:24:15 -0400
commit607fb68d4b0f2949f0c964f7fd97f24ef1f4518d (patch)
tree3f0683b5a9b086bf364eccdc0dd94729e8784bca
parentdee52032cfec3139117fe7d712ec5d7b338a9a35 (diff)
downloadmeta-selinux-607fb68d4b0f2949f0c964f7fd97f24ef1f4518d.tar.gz
libpam: use wildcard for version and cleanup
use wildcard for version: adopting libpam upgrade from 1.1.6 to 1.2.1, cleanup older recipe and remove patch sepermit-add-DESTDIR-prefix.patch since the changes already available with latest source. Signed-off-by: Shrikant Bobade <shrikant_bobade@mentor.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
-rw-r--r--recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch31
-rw-r--r--recipes-extended/pam/libpam_%.bbappend3
-rw-r--r--recipes-extended/pam/libpam_1.1.6.bbappend10
3 files changed, 3 insertions, 41 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 @@
1Subject: [PATCH] libpam: add missing DESTDIR prefix
2
3The DESTDIR prefix is missing, this will cause build failures for
4mkdir /var/run/sepermit on the host.
5
6| mkdir -p /var/run/sepermit
7| mkdir: cannot create directory `/var/run/sepermit': Permission denied
8
9Upstream-Status: Pending
10
11Signed-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
16diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am
17index 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--
301.7.5.4
31
diff --git a/recipes-extended/pam/libpam_%.bbappend b/recipes-extended/pam/libpam_%.bbappend
new file mode 100644
index 0000000..adcf938
--- /dev/null
+++ b/recipes-extended/pam/libpam_%.bbappend
@@ -0,0 +1,3 @@
1inherit enable-selinux
2
3RDEPENDS_${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}"
diff --git a/recipes-extended/pam/libpam_1.1.6.bbappend b/recipes-extended/pam/libpam_1.1.6.bbappend
deleted file mode 100644
index 71acecc..0000000
--- a/recipes-extended/pam/libpam_1.1.6.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
1#FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
2FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}"
3
4SRC_URI += "file://sepermit-add-DESTDIR-prefix.patch"
5
6PR .= ".4"
7
8inherit enable-selinux
9
10RDEPENDS_${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}"