[yocto] [][meta-selinux] libpam: Upgrade recipe with wildcard.

flihp at twobit.us flihp at twobit.us
Sun Aug 2 08:52:45 PDT 2015


From: Philip Tricca <flihp at twobit.us>

The DESTDIR prefix patch is now upstream and no longer necessary.

Signed-off-by: Philip Tricca <flihp at twobit.us>
---
 .../pam/libpam/sepermit-add-DESTDIR-prefix.patch   | 31 ----------------------
 recipes-extended/pam/libpam_1.%.bbappend           |  8 ++++++
 recipes-extended/pam/libpam_1.1.6.bbappend         | 10 -------
 3 files changed, 8 insertions(+), 41 deletions(-)
 delete mode 100644 recipes-extended/pam/libpam/sepermit-add-DESTDIR-prefix.patch
 create mode 100644 recipes-extended/pam/libpam_1.%.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 <Xin.Ouyang at windriver.com>
----
- 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.%.bbappend b/recipes-extended/pam/libpam_1.%.bbappend
new file mode 100644
index 0000000..100a376
--- /dev/null
+++ b/recipes-extended/pam/libpam_1.%.bbappend
@@ -0,0 +1,8 @@
+#FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESPATH_append := ":${@base_set_filespath(['${THISDIR}/${PN}'], d)}"
+
+PR .= ".4"
+
+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')}"
-- 
2.1.4




More information about the yocto mailing list