From 607fb68d4b0f2949f0c964f7fd97f24ef1f4518d Mon Sep 17 00:00:00 2001 From: Shrikant Bobade Date: Thu, 30 Jul 2015 14:55:04 +0530 Subject: 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 Signed-off-by: Joe MacDonald --- .../pam/libpam/sepermit-add-DESTDIR-prefix.patch | 31 ---------------------- recipes-extended/pam/libpam_%.bbappend | 3 +++ recipes-extended/pam/libpam_1.1.6.bbappend | 10 ------- 3 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch create mode 100644 recipes-extended/pam/libpam_%.bbappend delete mode 100644 recipes-extended/pam/libpam_1.1.6.bbappend 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 @@ -Subject: [PATCH] libpam: add missing DESTDIR prefix - -The DESTDIR prefix is missing, this will cause build failures for -mkdir /var/run/sepermit on the host. - -| mkdir -p /var/run/sepermit -| mkdir: cannot create directory `/var/run/sepermit': Permission denied - -Upstream-Status: Pending - -Signed-off-by: Xin Ouyang ---- - modules/pam_sepermit/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/modules/pam_sepermit/Makefile.am b/modules/pam_sepermit/Makefile.am -index cfc5594..bc82275 100644 ---- a/modules/pam_sepermit/Makefile.am -+++ b/modules/pam_sepermit/Makefile.am -@@ -35,7 +35,7 @@ if HAVE_LIBSELINUX - securelib_LTLIBRARIES = pam_sepermit.la - - install-data-local: -- mkdir -p $(sepermitlockdir) -+ mkdir -p $(DESTDIR)$(sepermitlockdir) - endif - if ENABLE_REGENERATE_MAN - noinst_DATA = README pam_sepermit.8 sepermit.conf.5 --- -1.7.5.4 - 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 @@ +inherit enable-selinux + +RDEPENDS_${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 @@ -#FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}" - -SRC_URI += "file://sepermit-add-DESTDIR-prefix.patch" - -PR .= ".4" - -inherit enable-selinux - -RDEPENDS_${PN}-runtime += "${@target_selinux(d, 'pam-plugin-selinux')}" -- cgit v1.2.3-54-g00ecf