diff options
| author |   Kevin Tian <kevin.tian@intel.com> | 2010-08-14 15:46:00 +0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-08-17 22:56:12 +0100 |
| commit | 7025e6496e89e3a5750aae65b73118d2f6673884 (patch) | |
| tree | bb381760d8f89f1edd8f3c57ecb16167c3059faf | |
| parent | db5c145af18e01d4115ecb2187b56c29ea863114 (diff) | |
| download | openembedded-core-contrib-7025e6496e89e3a5750aae65b73118d2f6673884.tar.gz | |
pam: add missing bits from previous commit
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
| -rw-r--r-- | meta/packages/pam/libpam_1.1.1.bb | 6 | ||||
| -rw-r--r-- | meta/packages/pam/pam_1.1.1.bb | 39 |
2 files changed, 1 insertions, 44 deletions
diff --git a/meta/packages/pam/libpam_1.1.1.bb b/meta/packages/pam/libpam_1.1.1.bb index 12c4172272..536a0f5ce9 100644 --- a/meta/packages/pam/libpam_1.1.1.bb +++ b/meta/packages/pam/libpam_1.1.1.bb @@ -5,7 +5,7 @@ BUGTRACKER = "http://sourceforge.net/projects/pam/support" # /etc/pam.d comes from Debian libpam-runtime in 2009-11 (at that time # libpam-runtime-1.0.1 is GPLv2+), by openembedded LICENSE = "GPLv2+ | BSD" -PR = "r0" +PR = "r1" DEPENDS = "bison flex" RDEPENDS_${PN}-runtime = "libpam pam-plugin-deny pam-plugin-permit pam-plugin-warn pam-plugin-unix" @@ -71,7 +71,3 @@ do_install() { install -d ${D}${sysconfdir}/pam.d/ install -m 0644 ${WORKDIR}/pam.d/* ${D}${sysconfdir}/pam.d/ } - -pkg_postinst_${PN} () { - /etc/init.d/populate-volatile.sh update -} diff --git a/meta/packages/pam/pam_1.1.1.bb b/meta/packages/pam/pam_1.1.1.bb deleted file mode 100644 index ad53a32f76..0000000000 --- a/meta/packages/pam/pam_1.1.1.bb +++ /dev/null @@ -1,39 +0,0 @@ -DESCRIPTION = "Linux-PAM (Pluggable Authentication Modules for Linux), Basically, it is a flexible mechanism for authenticating users" -HOMEPAGE = "http://www.kernel.org/pub/linux/libs/pam/" -BUGTRACKER = "http://sourceforge.net/projects/pam/support" -# PAM allows dual licensed under GPL and BSD -LICENSE = "GPLv2+ | BSD" -PR = "r2" - -SRC_URI = "http://www.kernel.org/pub/linux/libs/pam/library/Linux-PAM-${PV}.tar.bz2 \ - file://disable_crossbinary.patch \ - file://99_pam" - -EXTRA_OECONF = "--with-db-uniquename=_pam \ - --includedir=${includedir}/security \ - --libdir=${base_libdir} \ - --disable-regenerate-docu" -DEPENDS = "bison flex" -CFLAGS_append = " -fPIC " - -S = "${WORKDIR}/Linux-PAM-${PV}" - -inherit autotools pkgconfig gettext - -FILES_${PN}-dbg += "${base_libdir}/security/.debug" -FILES_${PN}-dbg += "${base_libdir}/security/pam_filter/.debug" -FILES_${PN} += "${base_libdir}/security/*.so" -FILES_${PN} += "${base_libdir}/security/pam_filter/upperLOWER" -FILES_${PN} += "${base_libdir}/security/*.so" -FILES_${PN}-dev += "${base_libdir}/security/*.la" -FILES_${PN}-dev += "${base_libdir}/*.la" -FILES_${PN} += "${base_libdir}/*.so*" - -do_install() { - autotools_do_install - - # don't install /var/run when populating rootfs. Do it through volatile - rm -rf ${D}/var - install -d ${D}/etc/default/volatiles - install -m 0644 ${WORKDIR}/99_pam ${D}/etc/default/volatiles -} |