[oe-commits] org.oe.dev merge of 'ed07fd1cf78a54a3b29bc5b123624acb39c4f70a'

[koen commit]

merge of 'ed07fd1cf78a54a3b29bc5b123624acb39c4f70a'
     and 'ff89d5794df8f2290ca5cb41d093b3f3083d36c5'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: aad166147796a0cf7be319e6fa3878b8cffc981e
ViewMTN: http://monotone.openembedded.org/revision/info/aad166147796a0cf7be319e6fa3878b8cffc981e
Files:
1
packages/dbus/dbus-native_1.2.1.bb
packages/pam/libpam-1.0.2
packages/pam/libpam-1.0.2/pam-nodocs.patch
packages/pam/libpam_1.0.2.bb
packages/pam/libpam_0.79.bb
Diffs:

#
# mt diff -red07fd1cf78a54a3b29bc5b123624acb39c4f70a -raad166147796a0cf7be319e6fa3878b8cffc981e
#
#
#
# patch "packages/dbus/dbus-native_1.2.1.bb"
#  from [2114edd07cd338b88adcbbc685b2938ea8411281]
#    to [099386860248fda8e5c5df17ad7d835ed3618baf]
#
============================================================
--- packages/dbus/dbus-native_1.2.1.bb	2114edd07cd338b88adcbbc685b2938ea8411281
+++ packages/dbus/dbus-native_1.2.1.bb	099386860248fda8e5c5df17ad7d835ed3618baf
@@ -1,6 +1,6 @@ require dbus.inc
 require dbus.inc
-RRECOMMENDS = ""
-RDEPENDS = ""
+RRECOMMENDS_${PN} = ""
+RDEPENDS_${PN} = ""
 inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"


#
# mt diff -rff89d5794df8f2290ca5cb41d093b3f3083d36c5 -raad166147796a0cf7be319e6fa3878b8cffc981e
#
#
#
# add_dir "packages/pam/libpam-1.0.2"
# 
# add_file "packages/pam/libpam-1.0.2/pam-nodocs.patch"
#  content [47bb8dad1a07a52ac4565705d050f4ace51a60a1]
# 
# add_file "packages/pam/libpam_1.0.2.bb"
#  content [bf3f3b447dc791ca6e119aebe444b37b2a6057be]
# 
# patch "packages/pam/libpam_0.79.bb"
#  from [8e899f208b58ffb636a8af01ad239e862889e00d]
#    to [28bd41cb467d9c126f9124ded0798fc561c47756]
#
============================================================
--- packages/pam/libpam-1.0.2/pam-nodocs.patch	47bb8dad1a07a52ac4565705d050f4ace51a60a1
+++ packages/pam/libpam-1.0.2/pam-nodocs.patch	47bb8dad1a07a52ac4565705d050f4ace51a60a1
@@ -0,0 +1,35 @@
+--- /tmp/Makefile.am	2008-09-05 15:16:21.000000000 +0200
++++ Linux-PAM-1.0.2/Makefile.am	2008-09-05 15:16:56.153198000 +0200
+@@ -5,9 +5,9 @@
+ AUTOMAKE_OPTIONS = 1.9 gnu dist-bzip2 check-news
+ 
+ if STATIC_MODULES
+-SUBDIRS = modules libpam libpamc libpam_misc tests po conf doc examples xtests
++SUBDIRS = modules libpam libpamc libpam_misc tests po conf examples xtests
+ else
+-SUBDIRS = libpam tests libpamc libpam_misc modules po conf doc examples xtests
++SUBDIRS = libpam tests libpamc libpam_misc modules po conf examples xtests
+ endif
+ 
+ CLEANFILES = *~
+@@ -28,19 +28,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-release: dist releasedocs
+-
+-release-docs: releasedocs
+-
+-releasedocs:
+-	rm -rf Linux-PAM-$(VERSION)
+-	mkdir -p Linux-PAM-$(VERSION)/doc
+-	make -C doc releasedocs
+-	tar zfc Linux-PAM-$(VERSION)-docs.tar.gz \
+-		Linux-PAM-$(VERSION)/doc
+-	tar jfc Linux-PAM-$(VERSION)-docs.tar.bz2 \
+-		Linux-PAM-$(VERSION)/doc
+-	rm -rf Linux-PAM-$(VERSION)
++release: dist 
+ 
+ xtests:
+ 	make -C xtests xtests
============================================================
--- packages/pam/libpam_1.0.2.bb	bf3f3b447dc791ca6e119aebe444b37b2a6057be
+++ packages/pam/libpam_1.0.2.bb	bf3f3b447dc791ca6e119aebe444b37b2a6057be
@@ -0,0 +1,40 @@
+DESCRIPTION = "\
+PAM authentication library for Linux.  \
+Linux-PAM (Pluggable Authentication Modules for Linux) is a \
+library that enables the local system administrator to choose \
+how individual applications authenticate users. For an \
+overview of the Linux-PAM library see the Linux-PAM System \
+Administrators' Guide."
+HOMEPAGE = "http://kernel.org/pub/linux/libs/pam"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "GPLv2"
+
+# The project is actually called Linux-PAM but that gives
+# a bad OE package name because of the upper case characters
+pn = "Linux-PAM"
+p = "${pn}-${PV}"
+S = "${WORKDIR}/${p}"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/pam/library/${p}.tar.bz2 \
+           file://pam-nodocs.patch;patch=1 "
+
+inherit autotools
+
+LEAD_SONAME = "libpam.so.*"
+
+python populate_packages_prepend () {
+        pam_libdir    = bb.data.expand('${libdir}/security', d)
+	pam_libdirdebug = bb.data.expand('${libdir}/security/.debug', d)
+        pam_filterdir = bb.data.expand('${libdir}/security/pam_filter', d)
+	do_split_packages(d, pam_libdir, '^pam(.*)\.so$', 'pam-plugin%s', 'PAM plugin for %s', extra_depends='')
+        do_split_packages(d, pam_libdir, '^pam(.*)\.la$', 'pam-plugin%s-dev', 'PAM plugin for %s dev', extra_depends='')
+	do_split_packages(d, pam_libdirdebug, '^pam(.*)\.so$', 'pam-plugin%s-dbg', 'PAM plugin for %s debugging symbols', extra_depends='')
+	do_split_packages(d, pam_filterdir, '^(.*)$', 'pam-filter-%s', 'PAM filter for %s', extra_depends='')
+}
+
+
+do_stage() {
+	autotools_stage_all
+}
+
============================================================
--- packages/pam/libpam_0.79.bb	8e899f208b58ffb636a8af01ad239e862889e00d
+++ packages/pam/libpam_0.79.bb	28bd41cb467d9c126f9124ded0798fc561c47756
@@ -52,11 +52,7 @@ do_stage() {
 FILES_${PN} += "/usr/lib/security/pam_*.so /usr/lib/security/pam_filter/*"
 
 do_stage() {
-	autotools_stage_includes
-	for lib in libpam libpamc libpam_misc
-	do
-		oe_libinstall -so -C "$lib" "$lib" ${STAGING_LIBDIR}
-	done
+	autotools_stage_all
 }
 
 # An attempt to build on uclibc will fail, causing annoyance,