update dbus, systemd, pam

Change-Id: Icdc71c1a93f3cbd1dabd464587a2ec75434cbd19
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/meta-tizen-adaptation/recipes-core/dbus/dbus.inc b/meta-tizen-adaptation/recipes-core/dbus/dbus.inc
index 173871f..c7e1e63 100644 (file)
--- a/meta-tizen-adaptation/recipes-core/dbus/dbus.inc
+++ b/meta-tizen-adaptation/recipes-core/dbus/dbus.inc
@@ -21,8 +21,6 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
            file://fixed-memory-freeing-if-error-during-listing-service.patch \
 "
 
-systemd_unitdir = "/usr/lib/systemd"
-
 inherit useradd autotools pkgconfig gettext update-rc.d
 
 INITSCRIPT_NAME = "dbus-1"

diff --git a/meta-tizen-common-base/recipes-core/systemd/systemd-extraconf.inc b/meta-tizen-common-base/recipes-core/systemd/systemd-extraconf.inc
index 073ef50..9b5c868 100644 (file)
--- a/meta-tizen-common-base/recipes-core/systemd/systemd-extraconf.inc
+++ b/meta-tizen-common-base/recipes-core/systemd/systemd-extraconf.inc
@@ -30,6 +30,11 @@ do_install_append() {
     rm ${D}${sysconfdir}/machine-info
     rm ${D}${sysconfdir}/timezone
 
+    rm -fr ${D}${prefix}/share/factory
+    rm -fr ${D}/lib/systemd/network/80-container-ve.network
+    rm -fr ${D}/lib/systemd/network/80-container-host0.network
+    rm -fr ${D}/lib/systemd/system-preset/90-systemd.preset
+    
     install -m 0644 ${WORKDIR}/systemd-user ${D}${sysconfdir}/pam.d
 }
 
@@ -37,8 +42,8 @@ pkg_preinst_${PN}() {
     #!/bin/sh -e
 
     # Rename configuration files that changed their names
-    $D${prefix}/bin/mv -n ${sysconfdir}/systemd/systemd-logind.conf ${sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
-    $D${prefix}/bin/mv -n ${sysconfdir}/systemd/systemd-journald.conf ${sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
+    mv -n $D${sysconfdir}/systemd/systemd-logind.conf $D${sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
+    mv -n $D${sysconfdir}/systemd/systemd-journald.conf $D${sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
 }
 
 systemd-dbg_files += "${systemd_unitdir}/.debug"
@@ -54,6 +59,5 @@ FILES_${PN}-locale-it += "${prefix}/lib/systemd/catalog/systemd.it.catalog"
 FILES_${PN}-locale-ru += "${prefix}/lib/systemd/catalog/systemd.ru.catalog"
 FILES_${PN}-locale    += "${prefix}/lib/systemd/catalog/systemd.catalog"
   
-  
-  
+systemd_files += "${prefix}/lib/systemd/network"
   
\ No newline at end of file

diff --git a/meta-tizen-common-base/recipes-core/systemd/systemd.inc b/meta-tizen-common-base/recipes-core/systemd/systemd.inc
index 8b20877..585feaa 100644 (file)
--- a/meta-tizen-common-base/recipes-core/systemd/systemd.inc
+++ b/meta-tizen-common-base/recipes-core/systemd/systemd.inc
@@ -2,7 +2,7 @@ DESCRIPTION = "A System and Service Manager"
 HOMEPAGE = "http://www.freedesktop.org/wiki/Software/systemd"
 SECTION = "Base/Startup"
 LICENSE = "LGPL-2.0+ and MIT and GPL-2.0+"
-PV = "212"
+PV = "216"
 
 SRC_URI = ""
 
@@ -30,7 +30,7 @@ RPROVIDES_systemd += "/bin/systemctl"
 # the PROVIDES rules is ignore "/sbin/shutdown  "
 PROVIDES += "/sbin/shutdown"
 RPROVIDES_systemd += "/sbin/shutdown"
-# the PROVIDES rules is ignore "udev = 212"
+# the PROVIDES rules is ignore "udev = 216"
 PROVIDES += "udev"
 RPROVIDES_systemd += "udev"
 
@@ -41,7 +41,7 @@ PROVIDES += "libgudev-dev"
 
 #PROVIDES by systemd-dev
 PROVIDES += "systemd-dev"
-# the PROVIDES rules is ignore "libudev-dev = 212"
+# the PROVIDES rules is ignore "libudev-dev = 216"
 PROVIDES += "libudev-dev"
 RPROVIDES_systemd-dev += "libudev-dev"
 
@@ -142,7 +142,7 @@ do_compile() {
   
   
 }
-EXTRA_OECONF += " --enable-compat-libs --enable-bootchart --libexecdir=${prefix}/lib --docdir=${prefix}/share/doc/packages/systemd --disable-static --with-sysvinit-path= --with-sysvrcnd-path= --with-smack-run-label=System --with-rootprefix=/ --with-rootlibdir=//lib cc_cv_CFLAGS__flto=no"
+EXTRA_OECONF += " --disable-kdbus --enable-compat-libs --enable-bootchart --disable-sysusers --disable-firstboot --disable-timesyncd --disable-resolved --disable-networkd --libexecdir=${prefix}/lib --docdir=${prefix}/share/doc/packages/systemd --disable-static --with-sysvinit-path= --with-sysvrcnd-path= --with-smack-run-label=System --with-rootprefix=/ --with-rootlibdir=//lib cc_cv_CFLAGS__flto=no"
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -217,8 +217,6 @@ EOF
  touch ${D}${sysconfdir}/machine-id
  touch ${D}${sysconfdir}/machine-info
  touch ${D}${sysconfdir}/timezone
- #mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d
- #touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf
  
  mkdir -p ${D}//lib/systemd/system-preset/
  mkdir -p ${D}//lib/systemd/user-preset/
@@ -255,6 +253,11 @@ EOF
  rm -fr ${D}${sysconfdir}/modprobe.d
  rm -fr ${D}${localstatedir}
  
+ # Exclude ELF binaries
+ rm -f ${D}///lib/systemd/system-generators/systemd-debug-generator
+ rm -f ${D}/${prefix}/lib/systemd/system-generators/systemd-hibernate-resume-generator
+ 
+ # end of install
  
 }
 
@@ -267,8 +270,8 @@ pkg_preinst_${PN}() {
     getent group floppy >/dev/null 2>&1 || /usr/sbin/groupadd -r -g 19 floppy >/dev/null 2>&1 || :
     systemctl stop systemd-udevd-control.socket systemd-udevd-kernel.socket systemd-udevd.service >/dev/null 2>&1 || :
     # Rename configuration files that changed their names
-    mv -n ${sysconfdir}/systemd/systemd-logind.conf ${sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
-    mv -n ${sysconfdir}/systemd/systemd-journald.conf ${sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
+    mv -n $D${sysconfdir}/systemd/systemd-logind.conf $D${sysconfdir}/systemd/logind.conf >/dev/null 2>&1 || :
+    mv -n $D${sysconfdir}/systemd/systemd-journald.conf $D${sysconfdir}/systemd/journald.conf >/dev/null 2>&1 || :
 
 }
 
@@ -303,7 +306,7 @@ pkg_prerm_${PN}() {
                     remote-fs.target \
                     systemd-readahead-replay.service \
                     systemd-readahead-collect.service >/dev/null 2>&1 || :
-            rm -f ${sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
+            rm -f $D${sysconfdir}/systemd/system/default.target >/dev/null 2>&1 || :
     fi
 
 }
@@ -348,10 +351,10 @@ libsystemd_files += "/lib/libsystemd-id128.so.*"
 libsystemd_files += "/lib/libsystemd-journal.so.*"
 libsystemd_files += "/lib/libsystemd-login.so.*"
 libsystemd_files += "${prefix}/lib/libnss_myhostname.so.2"
+libsystemd_files += "${prefix}/lib/libnss_mymachines.so.2"
 MANIFESTFILES_lib${PN} = "systemd.manifest"
 
 systemd_files = ""
-systemd_files += "${sysconfdir}/systemd/bootchart.conf"
 systemd_files += "${sysconfdir}/pam.d/systemd-user"
 systemd_files += "${prefix}/bin/bootctl"
 systemd_files += "${prefix}/bin/busctl"
@@ -362,10 +365,9 @@ systemd_files += "${prefix}/lib/kernel"
 systemd_files += "${prefix}/lib/kernel/install.d"
 systemd_files += "${prefix}/lib/kernel/install.d/50-depmod.install"
 systemd_files += "${prefix}/lib/kernel/install.d/90-loaderentry.install"
-systemd_files += "/lib/systemd/system-generators/systemd-efi-boot-generator"
 systemd_files += "${prefix}/bin/hostnamectl"
 systemd_files += "${prefix}/bin/localectl"
-systemd_files += "${prefix}/bin/systemd-coredumpctl"
+systemd_files += "${prefix}/bin/coredumpctl"
 systemd_files += "${prefix}/bin/timedatectl"
 systemd_files += "${sysconfdir}/systemd"
 systemd_files += "${sysconfdir}/systemd/system"
@@ -401,12 +403,13 @@ systemd_files += "${sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf"
 systemd_files += "${sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf"
 systemd_files += "${sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf"
 systemd_files += "${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf"
+systemd_files += "${sysconfdir}/systemd/bootchart.conf"
+systemd_files += "${sysconfdir}/systemd/coredump.conf"
 systemd_files += "${sysconfdir}/systemd/system.conf"
 systemd_files += "${sysconfdir}/systemd/user.conf"
 systemd_files += "${sysconfdir}/systemd/logind.conf"
 systemd_files += "${sysconfdir}/systemd/journald.conf"
 systemd_files += "${sysconfdir}/udev/udev.conf"
-systemd_files += "${sysconfdir}/rpm/macros.systemd"
 systemd_files += "${sysconfdir}/xdg/systemd"
 systemd_files += "${prefix}/bin/systemd"
 systemd_files += "/bin/systemctl"
@@ -427,12 +430,14 @@ systemd_files += "${prefix}/bin/systemd-delta"
 systemd_files += "${prefix}/bin/systemd-detect-virt"
 systemd_files += "/bin/systemd-inhibit"
 systemd_files += "/bin/udevadm"
+systemd_files += "/bin/systemd-escape"
+systemd_files += "${prefix}/bin/systemd-path"
 systemd_files += "${prefix}/lib/sysctl.d/*.conf"
 systemd_files += "/lib/systemd/systemd"
 systemd_files += "${systemd_unitdir}/system"
 systemd_files += "${systemd_unitdir}/system/basic.target.wants"
 systemd_files += "${prefix}/lib/systemd/user"
-systemd_files += "${prefix}/lib/systemd/network"
+systemd_files += "/lib/systemd/network"
 systemd_files += "${prefix}/lib/systemd/user/basic.target"
 systemd_files += "${prefix}/lib/systemd/user/bluetooth.target"
 systemd_files += "${prefix}/lib/systemd/user/exit.target"
@@ -445,12 +450,13 @@ systemd_files += "${prefix}/lib/systemd/user/paths.target"
 systemd_files += "${prefix}/lib/systemd/user/smartcard.target"
 systemd_files += "${prefix}/lib/systemd/user/timers.target"
 systemd_files += "${prefix}/lib/systemd/user/busnames.target"
-systemd_files += "${prefix}/lib/systemd/network/80-container-host0.network"
-systemd_files += "${prefix}/lib/systemd/network/99-default.link"
+systemd_files += "/lib/systemd/network/80-container-host0.network"
+systemd_files += "/lib/systemd/network/99-default.link"
 systemd_files += "/lib/systemd/systemd-*"
 systemd_files += "${prefix}/lib/systemd/catalog"
 systemd_files += "${prefix}/lib/systemd/catalog/systemd.catalog"
 systemd_files += "/lib/udev"
+systemd_files += "/lib/systemd/system-generators/systemd-efi-boot-generator"
 systemd_files += "/lib/systemd/system-generators/systemd-getty-generator"
 systemd_files += "/lib/systemd/system-generators/systemd-fstab-generator"
 systemd_files += "/lib/systemd/system-generators/systemd-system-update-generator"
@@ -461,6 +467,9 @@ systemd_files += "${prefix}/lib/tmpfiles.d/tmp.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/legacy.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/pamconsole-tmp.conf"
 systemd_files += "${prefix}/lib/tmpfiles.d/systemd-nologin.conf"
+systemd_files += "${prefix}/lib/tmpfiles.d/etc.conf"
+systemd_files += "${prefix}/lib/tmpfiles.d/systemd-remote.conf"
+systemd_files += "${prefix}/lib/tmpfiles.d/var.conf"
 systemd_files += "${prefix}/sbin/init"
 systemd_files += "${prefix}/sbin/reboot"
 systemd_files += "${prefix}/sbin/halt"
@@ -484,10 +493,7 @@ systemd_files += "${prefix}/share/polkit-1/actions/org.freedesktop.hostname1.pol
 systemd_files += "${prefix}/share/polkit-1/actions/org.freedesktop.login1.policy"
 systemd_files += "${prefix}/share/polkit-1/actions/org.freedesktop.locale1.policy"
 systemd_files += "${prefix}/share/polkit-1/actions/org.freedesktop.timedate1.policy"
-systemd_files += "${prefix}/share/pkgconfig/systemd.pc"
-systemd_files += "${prefix}/share/pkgconfig/udev.pc"
 CONFFILES_${PN} = ""
-CONFFILES_${PN} += "${sysconfdir}/systemd/bootchart.conf"
 CONFFILES_${PN} += "${sysconfdir}/pam.d/systemd-user"
 MANIFESTFILES_${PN} = "systemd.manifest"
 DIRFILES_${PN} = ""
@@ -521,7 +527,7 @@ DIRFILES_${PN} += "${prefix}/share/systemd"
 DIRFILES_${PN} += "${prefix}/lib/systemd/ntp-units.d"
 DIRFILES_${PN} += "${systemd_unitdir}/system/basic.target.wants"
 DIRFILES_${PN} += "${prefix}/lib/systemd/user"
-DIRFILES_${PN} += "${prefix}/lib/systemd/network"
+DIRFILES_${PN} += "/lib/systemd/network"
 DIRFILES_${PN} += "${prefix}/lib/systemd/catalog"
 DIRFILES_${PN} += "${prefix}/share/polkit-1"
 DIRFILES_${PN} += "${prefix}/share/polkit-1/actions"
@@ -545,12 +551,12 @@ systemd-dev_files += "${prefix}/lib/libsystemd-id128.so"
 systemd-dev_files += "${prefix}/lib/libsystemd-journal.so"
 systemd-dev_files += "${prefix}/lib/libsystemd-login.so"
 systemd-dev_files += "${prefix}/include/systemd"
+systemd-dev_files += "${prefix}/include/systemd/_sd-common.h"
 systemd-dev_files += "${prefix}/include/systemd/sd-daemon.h"
-systemd-dev_files += "${prefix}/include/systemd/sd-login.h"
-systemd-dev_files += "${prefix}/include/systemd/sd-journal.h"
 systemd-dev_files += "${prefix}/include/systemd/sd-id128.h"
+systemd-dev_files += "${prefix}/include/systemd/sd-journal.h"
+systemd-dev_files += "${prefix}/include/systemd/sd-login.h"
 systemd-dev_files += "${prefix}/include/systemd/sd-messages.h"
-systemd-dev_files += "${prefix}/include/systemd/_sd-common.h"
 systemd-dev_files += "${prefix}/include/libudev.h"
 systemd-dev_files += "${prefix}/lib/pkgconfig/libudev.pc"
 systemd-dev_files += "${prefix}/lib/pkgconfig/libsystemd.pc"
@@ -558,6 +564,11 @@ systemd-dev_files += "${prefix}/lib/pkgconfig/libsystemd-daemon.pc"
 systemd-dev_files += "${prefix}/lib/pkgconfig/libsystemd-id128.pc"
 systemd-dev_files += "${prefix}/lib/pkgconfig/libsystemd-journal.pc"
 systemd-dev_files += "${prefix}/lib/pkgconfig/libsystemd-login.pc"
+systemd-dev_files += "${prefix}/share/pkgconfig/systemd.pc"
+systemd-dev_files += "${prefix}/share/pkgconfig/udev.pc"
+systemd-dev_files += "${sysconfdir}/rpm/macros.systemd"
+CONFFILES_${PN}-dev = ""
+CONFFILES_${PN}-dev += "${sysconfdir}/rpm/macros.systemd"
 MANIFESTFILES_${PN}-dev = "systemd.manifest"
 DIRFILES_${PN}-dev = ""
 DIRFILES_${PN}-dev += "${prefix}/include/systemd"
@@ -565,7 +576,7 @@ DIRFILES_${PN}-dev += "${prefix}/include/systemd"
 systemd-docs_files = ""
 
 libgudev_files = ""
-libgudev_files += "/lib/libgudev-1.0.so.*"
+libgudev_files += "${prefix}/lib/libgudev-1.0.so.*"
 MANIFESTFILES_libgudev = "systemd.manifest"
 
 systemd-analyze_files = ""

diff --git a/meta-tizen-common-base/recipes-core/systemd/systemd_git.bb b/meta-tizen-common-base/recipes-core/systemd/systemd_git.bb
index 9eb76b9..5cff973 100644 (file)
--- a/meta-tizen-common-base/recipes-core/systemd/systemd_git.bb
+++ b/meta-tizen-common-base/recipes-core/systemd/systemd_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/systemd;tag=f1a985d567a9094ef916d59d8e528810bdbffc0a;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/systemd;tag=c9f3992581011a5dde3b1b03819bedb3d2579076;nobranch=1"
 
 BBCLASSEXTEND += " native "
 

diff --git a/meta-tizen-common-base/recipes-extended/pam/pam-extraconf.inc b/meta-tizen-common-base/recipes-extended/pam/pam-extraconf.inc
index 49a5423..a069b21 100644 (file)
--- a/meta-tizen-common-base/recipes-extended/pam/pam-extraconf.inc
+++ b/meta-tizen-common-base/recipes-extended/pam/pam-extraconf.inc
@@ -21,22 +21,18 @@ RPROVIDES_${PN}-modules-extra += "pam-plugin-rootok"
 RPROVIDES_${PN}-modules-extra += "pam-plugin-keyinit"
 RPROVIDES_${PN}-modules-extra += "pam-plugin-loginuid"
 
-EXTRA_OECONF = " --libdir=${prefix}/lib --includedir=${prefix}/include/security --enable-isadir=../..${prefix}/lib/security --disable-audit --with-db-uniquename=_pam --with-libiconv-prefix=/usr --enable-read-both-confs "
-EXTRA_OECONF += "--disable-nis \
-                 --disable-regenerate-docu \
-                 --disable-prelude"
+inherit pkgconfig
+
+EXTRA_OECONF += " --libdir=${base_libdir} \
+                "
+
+EXTRA_OECONF += " --disable-nis \
+                  --disable-regenerate-docu \
+                  --disable-prelude \
+                "
 
 PACKAGECONFIG[audit] = "--enable-audit,--disable-audit,audit,"
 
-do_compile() {
-    cd ${S}
-    LANG=C
-    export LANG
-    unset DISPLAY
-    LD_AS_NEEDED=1; export LD_AS_NEEDED ;
-    autotools_do_configure
-    make  CFLAGS="$CFLAGS -lfl -lcrypt"
-}
 
 do_install_append() {
     install -m 0644 ${WORKDIR}/system-auth ${D}${sysconfdir}/pam.d
@@ -45,47 +41,59 @@ do_install_append() {
 pam_files += "${prefix}/sbin/*"
 pam_files += "/var/log"
 
-pam-dbg_files += "${prefix}/lib/security/.debug/*"
-pam-dbg_files += "${prefix}/lib/security/pam_filter/.debug/*"
+pam-dbg_files += "${base_libdir}/security/.debug/*"
+pam-dbg_files += "${base_libdir}/security/pam_filter/.debug/*"
 
 FILES_${PN}-dbg += "${pam-dbg_files}"
 
 pam-dev_files += "${prefix}/include/*"
-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"
+pam-dev_files += "${base_libdir}/security/pam_unix_acct.so"
+pam-dev_files += "${base_libdir}/security/pam_unix_auth.so"
+pam-dev_files += "${base_libdir}/security/pam_unix_passwd.so"
+pam-dev_files += "${base_libdir}/security/pam_unix_session.so"
 
 pam-modules-extra_files = ""
 pam-modules-extra_files += "pam.manifest"
-pam-modules-extra_files += "${prefix}/lib/security/pam_access.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_debug.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_echo.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_exec.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_faildelay.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_filter.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_ftp.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_group.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_issue.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_listfile.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_localuser.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_mail.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_motd.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_pwhistory.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_rhosts.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_shells.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_stress.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_tally.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_time.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_timestamp.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_umask.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_unix_acct.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_unix_auth.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_unix_passwd.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_unix_session.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_warn.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_smack.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_cracklib.so"
+pam-modules-extra_files += "${base_libdir}/security/*.so"
+
+
+do_install() {
+ export RPM_BUILD_ROOT=${D}
+ cd ${S}
+ LANG=C
+ export LANG
+ unset DISPLAY
+ rm -rf ${D}
+ mkdir -p ${D}
+ 
+ 
+   oe_runmake \
+         DESTDIR=${D} \
+         INSTALL_ROOT=${D} \
+         BINDIR=${prefix}/bin \
+   install  
+   rm -f ${D}${infodir}/dir 
+   find ${D} -regex ".*\.la$" | xargs rm -f -- 
+   find ${D} -regex ".*\.a$" | xargs rm -f --
+ 
+ # RPM uses docs from source tree
+ rm -rf ${D}${prefix}/share/doc/Linux-PAM
+ # Included in setup package
+ rm -f ${D}${sysconfdir}/environment
+ 
+ for phase in auth acct passwd session ; do
+     ln -sf pam_unix.so ${D}${base_libdir}/security/pam_unix_${phase}.so
+ done
+ 
+ # Install default pam configuration files
+ install -d -m 0755 ${D}${sysconfdir}/pam.d
+ install -m 0644 ${S}/packaging/system-auth ${D}${sysconfdir}/pam.d/
+ install -m 0644 ${S}/packaging/other ${D}${sysconfdir}/pam.d/
+ 
+ #find_lang Linux-PAM
+ 
+ 
+}
 
 do_install_append() {
     mkdir -p $D/var/log

diff --git a/meta-tizen-common-base/recipes-extended/pam/pam.inc b/meta-tizen-common-base/recipes-extended/pam/pam.inc
index d03de6b..a6fea89 100644 (file)
--- a/meta-tizen-common-base/recipes-extended/pam/pam.inc
+++ b/meta-tizen-common-base/recipes-extended/pam/pam.inc
@@ -47,7 +47,6 @@ DEPENDS += "flex"
 inherit gettext
 DEPENDS += "zlib"
 DEPENDS += "db"
-inherit pkgconfig
 DEPENDS_append_class-native = " automake-native"
 DEPENDS_append_class-target = " automake-native"
 DEPENDS += "smack"
@@ -89,7 +88,7 @@ do_compile() {
   
   
 }
-EXTRA_OECONF += " --libdir=${prefix}/lib --includedir=${prefix}/include/security --enable-isadir=../..${prefix}/lib/security --disable-audit --with-db-uniquename=_pam --with-libiconv-prefix=/usr --enable-read-both-confs "
+EXTRA_OECONF += " --libdir=${base_libdir} --includedir=${prefix}/include/security --enable-isadir=../..${base_libdir}/security --disable-audit --with-db-uniquename=_pam --with-libiconv-prefix=${prefix} --enable-read-both-confs "
 
 do_install() {
  export RPM_BUILD_ROOT=${D}
@@ -116,7 +115,7 @@ do_install() {
  rm -f ${D}${sysconfdir}/environment
  
  for phase in auth acct passwd session ; do
-     ln -sf pam_unix.so ${D}${prefix}/lib/security/pam_unix_${phase}.so
+       ln -sf pam_unix.so ${D}${base_libdir}/security/pam_unix_${phase}.so
  done
  
  # Install default pam configuration files
@@ -133,11 +132,11 @@ pkg_postinst_${PN}() {
     #!/bin/sh -e
 
     [ "x$D" == "x" ] && ldconfig
-    if [ ! -a /var/log/faillog ] ; then
-        /usr/bin/install -m 600 /dev/null /var/log/faillog
+    if [ ! -a ${localstatedir}/log/faillog ] ; then
+       install -m 600 /dev/null ${localstatedir}/log/faillog
     fi
-    if [ ! -a /var/log/tallylog ] ; then
-        /usr/bin/install -m 600 /dev/null /var/log/tallylog
+    if [ ! -a ${localstatedir}/log/tallylog ] ; then
+       install -m 600 /dev/null ${localstatedir}/log/tallylog
     fi
 
 }
@@ -155,41 +154,41 @@ PACKAGES += " pam "
 PACKAGES += " pam-docs "
 
 pam-modules-extra_files = ""
-pam-modules-extra_files += "${prefix}/lib/security/pam_access.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_debug.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_echo.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_exec.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_faildelay.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_filter.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_ftp.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_group.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_issue.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_listfile.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_localuser.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_mail.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_motd.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_pwhistory.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_rhosts.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_shells.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_stress.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_tally.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_time.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_timestamp.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_umask.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_unix_acct.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_unix_auth.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_unix_passwd.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_unix_session.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_warn.so"
-pam-modules-extra_files += "${prefix}/lib/security/pam_smack.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_access.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_debug.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_echo.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_exec.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_faildelay.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_filter.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_ftp.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_group.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_issue.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_listfile.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_localuser.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_mail.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_motd.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_pwhistory.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_rhosts.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_shells.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_stress.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_tally.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_time.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_timestamp.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_umask.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_unix_acct.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_unix_auth.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_unix_passwd.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_unix_session.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_warn.so"
+pam-modules-extra_files += "${base_libdir}/security/pam_smack.so"
 MANIFESTFILES_${PN}-modules-extra = "pam.manifest"
 
 pam-dev_files = ""
 pam-dev_files += "${prefix}/include/security/*"
-pam-dev_files += "${prefix}/lib/libpam.so"
-pam-dev_files += "${prefix}/lib/libpam_misc.so"
-pam-dev_files += "${prefix}/lib/libpamc.so"
-pam-dev_files += "${prefix}/lib/security/pam_tally2.so"
+pam-dev_files += "${base_libdir}/libpam.so"
+pam-dev_files += "${base_libdir}/libpam_misc.so"
+pam-dev_files += "${base_libdir}/libpamc.so"
+pam-dev_files += "${base_libdir}/security/pam_tally2.so"
 MANIFESTFILES_${PN}-dev = "pam.manifest"
 
 pam_files = ""
@@ -200,26 +199,26 @@ pam_files += "/sbin/unix_chkpwd"
 pam_files += "/sbin/unix_update"
 pam_files += "/sbin/mkhomedir_helper"
 pam_files += "${sysconfdir}/security/limits.conf"
-pam_files += "${prefix}/lib/libpam.so.*"
-pam_files += "${prefix}/lib/libpam_misc.so.*"
-pam_files += "${prefix}/lib/libpamc.so.*"
-pam_files += "${prefix}/lib/security/pam_deny.so"
-pam_files += "${prefix}/lib/security/pam_env.so"
-pam_files += "${prefix}/lib/security/pam_keyinit.so"
-pam_files += "${prefix}/lib/security/pam_limits.so"
-pam_files += "${prefix}/lib/security/pam_loginuid.so"
-pam_files += "${prefix}/lib/security/pam_namespace.so"
-pam_files += "${prefix}/lib/security/pam_nologin.so"
-pam_files += "${prefix}/lib/security/pam_permit.so"
-pam_files += "${prefix}/lib/security/pam_lastlog.so"
-pam_files += "${prefix}/lib/security/pam_rootok.so"
-pam_files += "${prefix}/lib/security/pam_securetty.so"
-pam_files += "${prefix}/lib/security/pam_succeed_if.so"
-pam_files += "${prefix}/lib/security/pam_unix.so"
-pam_files += "${prefix}/lib/security/pam_wheel.so"
-pam_files += "${prefix}/lib/security/pam_xauth.so"
-pam_files += "${prefix}/lib/security/pam_filter"
-pam_files += "${prefix}/lib/security/pam_mkhomedir.so"
+pam_files += "${base_libdir}/libpam.so.*"
+pam_files += "${base_libdir}/libpam_misc.so.*"
+pam_files += "${base_libdir}/libpamc.so.*"
+pam_files += "${base_libdir}/security/pam_deny.so"
+pam_files += "${base_libdir}/security/pam_env.so"
+pam_files += "${base_libdir}/security/pam_keyinit.so"
+pam_files += "${base_libdir}/security/pam_limits.so"
+pam_files += "${base_libdir}/security/pam_loginuid.so"
+pam_files += "${base_libdir}/security/pam_namespace.so"
+pam_files += "${base_libdir}/security/pam_nologin.so"
+pam_files += "${base_libdir}/security/pam_permit.so"
+pam_files += "${base_libdir}/security/pam_lastlog.so"
+pam_files += "${base_libdir}/security/pam_rootok.so"
+pam_files += "${base_libdir}/security/pam_securetty.so"
+pam_files += "${base_libdir}/security/pam_succeed_if.so"
+pam_files += "${base_libdir}/security/pam_unix.so"
+pam_files += "${base_libdir}/security/pam_wheel.so"
+pam_files += "${base_libdir}/security/pam_xauth.so"
+pam_files += "${base_libdir}/security/pam_filter"
+pam_files += "${base_libdir}/security/pam_mkhomedir.so"
 pam_files += "${sysconfdir}/security"
 pam_files += "${sysconfdir}/security/access.conf"
 pam_files += "${sysconfdir}/security/group.conf"

diff --git a/meta-tizen-common-base/recipes-extended/pam/pam_git.bb b/meta-tizen-common-base/recipes-extended/pam/pam_git.bb
index 227b714..3b97e8f 100644 (file)
--- a/meta-tizen-common-base/recipes-extended/pam/pam_git.bb
+++ b/meta-tizen-common-base/recipes-extended/pam/pam_git.bb
@@ -4,7 +4,7 @@ PRIORITY = "10"
 
 LIC_FILES_CHKSUM ??= "file://${COMMON_LICENSE_DIR}/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
 
-SRC_URI += "git://review.tizen.org/platform/upstream/pam;tag=8e4294bb11020f6ba798fb1fdc460beaf0a47c31;nobranch=1"
+SRC_URI += "git://review.tizen.org/platform/upstream/pam;tag=523d88f2bf88a131d6b4a334e85d2666d505dc48;nobranch=1"
 
 BBCLASSEXTEND += " native "