summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-phosphor/recipes-core/pam/libpam_%.bbappend11
-rw-r--r--meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account (renamed from meta-phosphor/recipes-core/pam/libpam/pam.d/common-account)0
-rw-r--r--meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth (renamed from meta-phosphor/recipes-core/pam/libpam/pam.d/common-auth)0
-rw-r--r--meta-phosphor/recipes-extended/pam/libpam/pam.d/common-password (renamed from meta-phosphor/recipes-core/pam/libpam/pam.d/common-password)0
-rw-r--r--meta-phosphor/recipes-extended/pam/libpam_%.bbappend12
-rw-r--r--meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb (renamed from meta-phosphor/recipes-core/pam/pam-ipmi_git.bb)0
6 files changed, 12 insertions, 11 deletions
diff --git a/meta-phosphor/recipes-core/pam/libpam_%.bbappend b/meta-phosphor/recipes-core/pam/libpam_%.bbappend
deleted file mode 100644
index 65c608bea9..0000000000
--- a/meta-phosphor/recipes-core/pam/libpam_%.bbappend
+++ /dev/null
@@ -1,11 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " file://pam.d/common-password \
- file://pam.d/common-account \
- file://pam.d/common-auth \
- "
-
-RDEPENDS_${PN}-runtime += "${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \
- ${MLPREFIX}pam-plugin-tally2-${libpam_suffix} \
- ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \
- "
diff --git a/meta-phosphor/recipes-core/pam/libpam/pam.d/common-account b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account
index 10cfc73ea9..10cfc73ea9 100644
--- a/meta-phosphor/recipes-core/pam/libpam/pam.d/common-account
+++ b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-account
diff --git a/meta-phosphor/recipes-core/pam/libpam/pam.d/common-auth b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth
index 4ac58fb54d..4ac58fb54d 100644
--- a/meta-phosphor/recipes-core/pam/libpam/pam.d/common-auth
+++ b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-auth
diff --git a/meta-phosphor/recipes-core/pam/libpam/pam.d/common-password b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-password
index f0f051802f..f0f051802f 100644
--- a/meta-phosphor/recipes-core/pam/libpam/pam.d/common-password
+++ b/meta-phosphor/recipes-extended/pam/libpam/pam.d/common-password
diff --git a/meta-phosphor/recipes-extended/pam/libpam_%.bbappend b/meta-phosphor/recipes-extended/pam/libpam_%.bbappend
index 714496a947..f97664f20a 100644
--- a/meta-phosphor/recipes-extended/pam/libpam_%.bbappend
+++ b/meta-phosphor/recipes-extended/pam/libpam_%.bbappend
@@ -1,3 +1,15 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += " file://pam.d/common-password \
+ file://pam.d/common-account \
+ file://pam.d/common-auth \
+ "
+
+RDEPENDS_${PN}-runtime += "${MLPREFIX}pam-plugin-cracklib-${libpam_suffix} \
+ ${MLPREFIX}pam-plugin-tally2-${libpam_suffix} \
+ ${MLPREFIX}pam-plugin-pwhistory-${libpam_suffix} \
+ "
+
do_install_append() {
# The libpam recipe will always add a pam_systemd.so line to
# common-session if systemd is enabled; however systemd only
diff --git a/meta-phosphor/recipes-core/pam/pam-ipmi_git.bb b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb
index 2f17076a74..2f17076a74 100644
--- a/meta-phosphor/recipes-core/pam/pam-ipmi_git.bb
+++ b/meta-phosphor/recipes-extended/pam/pam-ipmi_git.bb