From 68c61187820fd30d32c93c92ac0de48885c4caef Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Tue, 27 May 2014 14:13:04 +0200 Subject: [PATCH] meta-tizen: Fix pam for systemd build Change-Id: I6402da351bfd1f11e615a47ca35f46ca24169570 (From meta-tizen rev: 552a70f47700c8feb190bc277421b3ed224ffc8d) Signed-off-by: Ronan Le Martret Signed-off-by: Patrick Ohly --- meta-tizen/recipes-tizen/pam/libpam-extraconf.inc | 32 ++++++++++++++--------- meta-tizen/recipes-tizen/pam/libpam.inc | 5 +--- 2 files changed, 20 insertions(+), 17 deletions(-) diff --git a/meta-tizen/recipes-tizen/pam/libpam-extraconf.inc b/meta-tizen/recipes-tizen/pam/libpam-extraconf.inc index eacf9cc..24b043a 100644 --- a/meta-tizen/recipes-tizen/pam/libpam-extraconf.inc +++ b/meta-tizen/recipes-tizen/pam/libpam-extraconf.inc @@ -1,19 +1,8 @@ -#EXTRA_OECONF = "--with-db-uniquename=_pam \ -# --includedir=${includedir}/security \ -# --libdir=${base_libdir} \ -# --disable-nis \ -# --disable-regenerate-docu \ -# --disable-prelude" - EXTRA_OECONF = "--with-db-uniquename=_pam \ --disable-nis \ --disable-regenerate-docu \ --disable-prelude" -#CFLAGS_append = " -fPIC " - -#inherit autotools gettext pkgconfig - PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit," pam-dev_files += "${prefix}/include/*" @@ -25,10 +14,27 @@ pam-dbg_files += "${prefix}/lib/security/pam_filter/.debug/*" FILES_${PN}-dbg += "${pam-dbg_files}" - INSANE_SKIP_${PN} = "pam-modules-extra" pam-dev_files += "${prefix}/lib/security/pam_unix_acct.so" pam-dev_files += "${prefix}/lib/security/pam_unix_auth.so" pam-dev_files += "${prefix}/lib/security/pam_unix_passwd.so" -pam-dev_files += "${prefix}/lib/security/pam_unix_session.so" \ No newline at end of file +pam-dev_files += "${prefix}/lib/security/pam_unix_session.so" + +do_install_append() { +mkdir -p ${D}${prefix}/include/security + +for i in _pam_compat.h \ + _pam_macros.h \ + _pam_types.h \ + pam_appl.h \ + pam_client.h \ + pam_ext.h \ + pam_filter.h \ + pam_misc.h \ + pam_modules.h \ + pam_modutil.h ;do + cp ${D}${prefix}/include/${i} ${D}${prefix}/include/security/ +done + +} \ No newline at end of file diff --git a/meta-tizen/recipes-tizen/pam/libpam.inc b/meta-tizen/recipes-tizen/pam/libpam.inc index b7fb456..97b0a38 100644 --- a/meta-tizen/recipes-tizen/pam/libpam.inc +++ b/meta-tizen/recipes-tizen/pam/libpam.inc @@ -50,7 +50,7 @@ DEPENDS = "" #DEPENDS of pam DEPENDS += "flex" DEPENDS_append_class-native = " gcc" -DEPENDS_append_class-target = " gcc-cross" +DEPENDS_append_class-target = " gcc" DEPENDS += "zlib" DEPENDS += "db" #Replace "DEPENDS" on gettext by "inherit gettext" @@ -161,9 +161,6 @@ do_install() { install -m 0644 ${S}/packaging/system-auth ${D}${sysconfdir}/pam.d/ install -m 0644 ${S}/packaging/other ${D}${sysconfdir}/pam.d/ - /usr/share/spec2yocto/macro/lib/find-lang.sh ${D} Linux-PAM - - } PACKAGES += " pam-modules-extra " -- 2.7.4