[oe-commits] org.oe.dev merge of '2fb7d0fb7f61a54a4005ff8d5cc52a3df21e2692'

[xora commit]

merge of '2fb7d0fb7f61a54a4005ff8d5cc52a3df21e2692'
     and 'c52428092b0739e47ca366526bbc7fb05db0b368'

Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: b8722b34f06f673d698f22dd82b3b225392cfdfb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=b8722b34f06f673d698f22dd82b3b225392cfdfb
Files:
1
packages/libpcre/libpcre_4.4.bb
packages/networkmanager/networkmanager_svn.bb
Diffs:

#
# mt diff -r2fb7d0fb7f61a54a4005ff8d5cc52a3df21e2692 -rb8722b34f06f673d698f22dd82b3b225392cfdfb
#
# 
# 
# patch "packages/libpcre/libpcre_4.4.bb"
#  from [ca59f09f77b43940632b37e34314a2f4d38349ca]
#    to [984032d4632ad803f48b7e387b39cad745c99917]
# 
============================================================
--- packages/libpcre/libpcre_4.4.bb	ca59f09f77b43940632b37e34314a2f4d38349ca
+++ packages/libpcre/libpcre_4.4.bb	984032d4632ad803f48b7e387b39cad745c99917
@@ -5,7 +5,7 @@ SECTION = "devel"
 themselves still follow Perl syntax and semantics. The header file for \
 the POSIX-style functions is called pcreposix.h."
 SECTION = "devel"
-PR = "r7"
+PR = "r8"
 LICENSE = "BSD"
 SRC_URI = "${SOURCEFORGE_MIRROR}/pcre/pcre-${PV}.tar.bz2"
 S = "${WORKDIR}/pcre-${PV}"
@@ -37,7 +37,9 @@ do_stage () {
 	oe_libinstall -a -so libpcreposix ${STAGING_LIBDIR}
 	install -m 0644 pcre.h ${STAGING_INCDIR}/
 	install -m 0644 pcreposix.h ${STAGING_INCDIR}/
+        install -d ${STAGING_BINDIR_NATIVE}
+	install -m 0755 ${S}/dftables ${STAGING_BINDIR_NATIVE}/
 }
 
-FILES_${PN} = "${libdir}/lib*.so*"
+FILES_${PN} = "${libdir}/lib*.so.*"
 FILES_${PN}-dev += "${bindir}/*"


#
# mt diff -rc52428092b0739e47ca366526bbc7fb05db0b368 -rb8722b34f06f673d698f22dd82b3b225392cfdfb
#
# 
# 
# add_file "packages/networkmanager/networkmanager_svn.bb"
#  content [2f814773de0dcb226ef1e52335e6e32169503ef4]
# 
============================================================
--- packages/networkmanager/networkmanager_svn.bb	2f814773de0dcb226ef1e52335e6e32169503ef4
+++ packages/networkmanager/networkmanager_svn.bb	2f814773de0dcb226ef1e52335e6e32169503ef4
@@ -0,0 +1,66 @@
+DESCRIPTION = "NetworkManager"
+SECTION = "net/misc"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.gnome.org"
+PRIORITY = "optional"
+DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools"
+RDEPENDS = "wpa-supplicant iproute2 dhcdbd"
+PV = "0.6.5+svn${SRCDATE}"
+
+PR = "r0"
+
+SRC_URI="svn://svn.gnome.org/svn/NetworkManager/branches;module=NETWORKMANAGER_0_6_0_RELEASE;proto=http \
+	file://NetworkManager \
+	file://99_networkmanager"
+
+DEFAULT_PREFERENCE = "-1"
+
+EXTRA_OECONF = " \
+		--with-gnome \
+		--with-distro=debian \
+		--without-gcrypt \
+ 		--with-wpa_supplicant=/usr/sbin/wpa_supplicant \
+		--with-dhcdbd=/sbin/dhcdbd \
+		--with-ip=/sbin/ip"
+
+S = "${WORKDIR}/NETWORKMANAGER_0_6_0_RELEASE"
+
+inherit autotools
+
+do_staging () {
+	autotools_stage_includes
+	oe_libinstall -C libnm-util libnm-util ${STAGING_LIBDIR}
+	oe_libinstall gnome/libnm_glib libnm_glib ${STAGING_LIBDIR}
+}
+
+do_install () {
+	oe_libinstall -C libnm-util libnm-util ${D}/usr/lib
+	oe_libinstall -C gnome/libnm_glib libnm_glib ${D}/usr/lib
+
+	oe_runmake -C src DESTDIR="${D}" install
+	install -d ${D}/etc/default/volatiles
+	install -m 0644 ${WORKDIR}/99_networkmanager ${D}/etc/default/volatiles
+	install -d ${D}/etc/init.d/
+	install -m 0755 ${WORKDIR}/NetworkManager ${D}/etc/init.d/
+	install -d ${D}/${datadir}/
+}
+
+pkg_postinst () {
+	/etc/init.d/populate-volatile.sh update
+}
+
+FILES_${PN} += "${datadir} \
+		${libdir}/*.so* \
+		${libdir}/*.la \
+		${sbindir} \
+		${bindir} \
+		${sysconfdir} \
+		${libexecdir}"
+
+FILES_${PN}-dev = "${incdir} \
+		   ${libdir}/*.a \
+		   ${libdir}/pkgconfig"
+
+# The networkmanager package needs to be split into app/lib/dev packages. For
+# now, silence insane.
+INSANE_SKIP_${PN} = "1"