From 3ea789b1bb5812ce71d779401b1002a1b0eed3af Mon Sep 17 00:00:00 2001 From: Xin Ouyang Date: Tue, 25 Sep 2012 14:34:26 +0800 Subject: 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 --- .../pam/libpam/sepermit-add-DESTDIR-prefix.patch | 31 ---------------------- recipes-extended/pam/libpam_1.1.5.bbappend | 6 +---- 2 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch 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_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 @@ -FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}" - -SRC_URI += "file://sepermit-add-DESTDIR-prefix.patch" - DEPENDS += "${@base_contains('DISTRO_FEATURES', 'selinux', 'libselinux', '', d)}" RDEPENDS_${PN}-runtime += "${@base_contains('DISTRO_FEATURES', 'selinux', 'pam-plugin-selinux', '', d)}" EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'selinux', '', '--disable-selinux', d)}" -PR .= ".3" +PR .= ".4" -- cgit v1.2.3-54-g00ecf