[oe-commits] org.oe.dev merge of '69a79125da9281a2071776d84dc73c20ae8dbf97'

[oe commit]

merge of '69a79125da9281a2071776d84dc73c20ae8dbf97'
     and '9290de30e8c2f0306df4a03b4cd3c484bbd8ba6b'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 30b35d26d67618622ba1fd8fffabd5be4d9508a4
ViewMTN: http://monotone.openembedded.org/revision/info/30b35d26d67618622ba1fd8fffabd5be4d9508a4
Files:
1
packages/networkmanager/networkmanager.inc
packages/ppp/ppp_2.4.3.bb
packages/pointercal/files/nokia800/pointercal
packages/pointercal/files/nokia800/pointercal.broken
packages/linux/ixp4xx-kernel.inc
packages/meta/slugos-packages.bb
packages/pointercal/pointercal_0.0.bb
packages/redboot-utils/fis_1.0.bb
Diffs:

#
# mt diff -r69a79125da9281a2071776d84dc73c20ae8dbf97 -r30b35d26d67618622ba1fd8fffabd5be4d9508a4
#
# 
# 
# patch "packages/networkmanager/networkmanager.inc"
#  from [d09f3129b2af07e182c0baace78a8a5bd5595f43]
#    to [1fda3eeff5fcb4c7cef4c98029cb884193f091d9]
# 
# patch "packages/ppp/ppp_2.4.3.bb"
#  from [1026e1ac955e35a3de0bc3a078e33248c865739b]
#    to [428359231946bc0fb68ffdb13936715597dd1267]
# 
============================================================
--- packages/networkmanager/networkmanager.inc	d09f3129b2af07e182c0baace78a8a5bd5595f43
+++ packages/networkmanager/networkmanager.inc	1fda3eeff5fcb4c7cef4c98029cb884193f091d9
@@ -54,13 +54,7 @@ FILES_${PN} += "${datadir} \
 FILES_libnmglib += "${libdir}/libnm_glib.so.*"
 
 FILES_${PN} += "${datadir} \
-		${sbindir}/* \
-		${bindir}/* \
-		${sysconfdir} \
 		${libexecdir}"
 
-FILES_${PN}-dev += "${incdir} \
-		   ${libdir}/*.a \
-		   ${libdir}/*.la \
-		   ${libdir}/pkgconfig"
+FILES_${PN}-dev += " ${datadir}/NetworkManager/gdb-cmd "
 
============================================================
--- packages/ppp/ppp_2.4.3.bb	1026e1ac955e35a3de0bc3a078e33248c865739b
+++ packages/ppp/ppp_2.4.3.bb	428359231946bc0fb68ffdb13936715597dd1267
@@ -1,9 +1,9 @@ LICENSE = "BSD GPLv2"
 SECTION = "console/network"
 DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 DEPENDS = "libpcap"
 LICENSE = "BSD GPLv2"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
 	file://makefile.patch;patch=1 \
@@ -28,6 +28,10 @@ EXTRA_OECONF = "--disable-strip"
 EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
 EXTRA_OECONF = "--disable-strip"
 
+do_stage () {
+         make INCDIR=${STAGING_INCDIR} install-devel
+}
+
 do_install_append () {
 	make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
 	mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d


#
# mt diff -r9290de30e8c2f0306df4a03b4cd3c484bbd8ba6b -r30b35d26d67618622ba1fd8fffabd5be4d9508a4
#
# 
# 
# rename "packages/pointercal/files/nokia800/pointercal"
#     to "packages/pointercal/files/nokia800/pointercal.broken"
# 
# patch "packages/linux/ixp4xx-kernel.inc"
#  from [b22efce3723a42731a6940b02489811fb8a36033]
#    to [7fdde9d51b8e3fe0cc0eb9518098902d6281e3da]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [738a66a4cd05dd74381dce0949ddcd547be2497f]
#    to [3e624519aa3c29fb9c243930483b6363f1b191b9]
# 
# patch "packages/pointercal/pointercal_0.0.bb"
#  from [b8790bb4f4ba0f5d19f857367be5e221745356d0]
#    to [a8a3e606c0d9cb9d7156407a1729b9d398ff5545]
# 
# patch "packages/redboot-utils/fis_1.0.bb"
#  from [423fde1a30e871e390b48542349b88efb3a07ac9]
#    to [16fa3c9f589d8b24e84de8555dad50affd97b735]
# 
============================================================
--- packages/linux/ixp4xx-kernel.inc	b22efce3723a42731a6940b02489811fb8a36033
+++ packages/linux/ixp4xx-kernel.inc	7fdde9d51b8e3fe0cc0eb9518098902d6281e3da
@@ -213,6 +213,7 @@ do_configure_prepend() {
 
 # Kernel module dependencies
 
+DEPENDS += "zd1211-firmware"
 RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
 
 
============================================================
--- packages/meta/slugos-packages.bb	738a66a4cd05dd74381dce0949ddcd547be2497f
+++ packages/meta/slugos-packages.bb	3e624519aa3c29fb9c243930483b6363f1b191b9
@@ -5,7 +5,7 @@ LICENSE = "MIT"
 DESCRIPTION = "Packages that are compatible with the SlugOS firmware"
 HOMEPAGE = "http://www.nslu2-linux.org"
 LICENSE = "MIT"
-PR = "r35"
+PR = "r36"
 CONFLICTS = "db3"
 
 COMPATIBLE_MACHINE = "nslu2"
@@ -37,6 +37,7 @@ SLUGOS_PACKAGES = "\
 	binutils \
 	bison \
 	bluez-utils \
+	bluez-hcidump \
 	bogofilter \
 	boost \
 	bridge-utils \
============================================================
--- packages/pointercal/pointercal_0.0.bb	b8790bb4f4ba0f5d19f857367be5e221745356d0
+++ packages/pointercal/pointercal_0.0.bb	a8a3e606c0d9cb9d7156407a1729b9d398ff5545
@@ -1,6 +1,6 @@ SECTION = "base"
 DESCRIPTION = "Touchscreen calibration data"
 SECTION = "base"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "file://pointercal"
 S = "${WORKDIR}"
============================================================
--- packages/redboot-utils/fis_1.0.bb	423fde1a30e871e390b48542349b88efb3a07ac9
+++ packages/redboot-utils/fis_1.0.bb	16fa3c9f589d8b24e84de8555dad50affd97b735
@@ -1,7 +1,7 @@ DESCRIPTION = "Tool to edit the Redboot 
 DESCRIPTION = "Tool to edit the Redboot FIS partition layout from userspace"
-PR = "r4"
+PR = "r5"
 
-SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http"
+SRC_URI = "svn://svn.nslu2-linux.org/svnroot/fis;module=trunk;proto=http;rev=6"
 S="${WORKDIR}/trunk"
 
 export CFLAGS += "--std=c99"