merge of '329df9dc9aeb10de474ddef3143523dd49e8ce6a'

     and '4d580f70318d589b28c525479b598a0fec9dc64b'

10 files changed, 33 insertions, 34 deletions

diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb
index 751f4a4113..ecee0bf91a 100644
--- a/packages/gtk+/gtk+_2.10.14.bb
+++ b/packages/gtk+/gtk+_2.10.14.bb
@@ -1,6 +1,6 @@
 require gtk-2.10.inc
 
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \
            file://no-xwc.patch;patch=1 \
diff --git a/packages/gtk+/gtk-2.10.inc b/packages/gtk+/gtk-2.10.inc
index 4ed214cfd3..463243554c 100644
--- a/packages/gtk+/gtk-2.10.inc
+++ b/packages/gtk+/gtk-2.10.inc
@@ -13,18 +13,20 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
 	${bindir}/gtk-query-immodules-2.0 \
 	${libdir}/lib*.so.* \
 	${datadir}/themes ${sysconfdir} \
-	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so"
+	${libdir}/gtk-2.0/${LIBV}/engines/libpixmap.so \
 FILES_${PN}-dev += " \
         ${datadir}/gtk-2.0/include \
         ${libdir}/gtk-2.0/include \
         ${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
         ${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
         ${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+	${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
         ${bindir}/gdk-pixbuf-csource"
 FILES_${PN}-dbg += " \
         ${libdir}/gtk-2.0/${LIBV}/loaders/.debug/* \
         ${libdir}/gtk-2.0/${LIBV}/immodules/.debug/* \
-        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/*"
+        ${libdir}/gtk-2.0/${LIBV}/engines/.debug/* \
+	${libdir}/gtk-2.0/${LIBV}/printbackends/.debug/*"
 
 
 NEATSTUFF = " ttf-dejavu-sans gdk-pixbuf-loader-png gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-gif gdk-pixbuf-loader-xpm "
diff --git a/packages/gtk-webcore/osb-jscore_20060212.bb b/packages/gtk-webcore/osb-jscore_20070816.bb
index b5aa879a18..b5aa879a18 100644
--- a/packages/gtk-webcore/osb-jscore_20060212.bb
+++ b/packages/gtk-webcore/osb-jscore_20070816.bb
diff --git a/packages/gtk-webcore/osb-nrcit_20060212.bb b/packages/gtk-webcore/osb-nrcit_20070816.bb
index 3bfec98924..3bfec98924 100644
--- a/packages/gtk-webcore/osb-nrcit_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcit_20070816.bb
diff --git a/packages/gtk-webcore/osb-nrcore_20060212.bb b/packages/gtk-webcore/osb-nrcore_20070816.bb
index 991af8d24d..991af8d24d 100644
--- a/packages/gtk-webcore/osb-nrcore_20060212.bb
+++ b/packages/gtk-webcore/osb-nrcore_20070816.bb
diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb
index 90a7259d9f..9a9a4d4df3 100644
--- a/packages/linux/linux-gumstix_2.6.15.bb
+++ b/packages/linux/linux-gumstix_2.6.15.bb
@@ -3,6 +3,8 @@ SECTION = "kernel"
 LICENSE = "GPL"
 PR = "r1"
 
+DEPENDS = "uboot-utils"
+
 COMPATIBLE_MACHINE = "gumstix"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb
index 969fd55f0e..8688725bd7 100644
--- a/packages/linux/linux-x86_2.6.20.bb
+++ b/packages/linux/linux-x86_2.6.20.bb
@@ -1,13 +1,13 @@
 DESCRIPTION = "Linux Kernel for x86 compatible machines"
 SECTION = "kernel"
 LICENSE = "GPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 " 
 
 SRC_URI_append_x86 = "file://i486-defconfig"
-SRC_URI_append_i586-generic = "file://i586-defconfig"
-SRC_URI_append_i686-generic = "file://i686-defconfig"
+SRC_URI_append_i586 = "file://i586-defconfig"
+SRC_URI_append_i686 = "file://i686-defconfig"
 
 
 S = "${WORKDIR}/linux-${PV}"
diff --git a/packages/ntop/ntop-3.0/autotools.patch b/packages/ntop/ntop-3.0/autotools.patch
index e40735c681..07ed6afd62 100644
--- a/packages/ntop/ntop-3.0/autotools.patch
+++ b/packages/ntop/ntop-3.0/autotools.patch
@@ -1,6 +1,16 @@
---- tmp/base/ntop-3.0-r0/ntop-3.0/acinclude.m4	2004-03-09 12:19:57.000000000 -0500
-+++ ntop-3.0/acinclude.m4	2004-03-09 12:19:57.000000000 -0500
-@@ -205,433 +205,3 @@
+--- ntop-3.0/acinclude.m4	2007/03/15 23:08:29	1.1
++++ ntop-3.0/acinclude.m4	2007/03/15 23:08:43
+@@ -34,6 +34,9 @@
+ dnl>    #undef HAVE_<typedef>
+ dnl>
+ 
++LIBTOOL='$host_alias-libtool'
++AC_SUBST(LIBTOOL)dnl
++
+ AC_DEFUN([AC_CHECK_TYPEDEF],[dnl
+ AC_REQUIRE([AC_HEADER_STDC])dnl
+ AC_MSG_CHECKING(for typedef $1)
+@@ -205,433 +208,3 @@
  fi
  # Finished expansion of NTOPCONFIGDEBUG_SETTINGS()
  ])
@@ -434,8 +444,8 @@
 -
 -dnl This is just to silence aclocal about the macro not being used
 -ifelse([AC_DISABLE_FAST_INSTALL])dnl
---- tmp/base/ntop-3.0-r0/ntop-3.0/configure.in	2004-03-21 18:45:04.000000000 -0500
-+++ ntop-3.0/configure.in	2004-05-22 14:20:07.000000000 -0400
+--- ntop-3.0/configure.in	2007/03/15 23:08:29	1.1
++++ ntop-3.0/configure.in	2007/03/15 23:08:34
 @@ -190,7 +190,6 @@
  AC_PROG_INSTALL
  AC_PROG_LN_S
diff --git a/packages/ntop/ntop_3.0.bb b/packages/ntop/ntop_3.0.bb
index 051b5beb91..aa725222e9 100644
--- a/packages/ntop/ntop_3.0.bb
+++ b/packages/ntop/ntop_3.0.bb
@@ -3,6 +3,7 @@ DESCRIPTION = "ntop is network top"
 SECTION = "console/network"
 PRIORITY = "optional"
 DEPENDS = "gdbm zlib libpcap libpng gd"
+PR = "r1"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/ntop/ntop-${PV}.tgz \
            file://${FILESDIR}/autotools.patch;patch=1 \
@@ -25,11 +26,13 @@ EXTRA_OECONF += " --without-ssl \
 FILES_ntop_append = " ${libdir}/ntop/plugins/*.so ${libdir}/libntop-*.so \
                        ${libdir}/libntopreport-*.so"
 FILES_${PN}-dev = "${includedir} ${libdir}/libntop.so ${libdir}/libntopreport.so \
-                   ${libdir}/libntop.a ${libdir}/libntopreport.a ${libdir}/*.la"
+                   ${libdir}/*.a ${libdir}/libntopreport.a ${libdir}/*.la"
+FILES_${PN}-dbg += "${libdir}/ntop/plugins/.debug"
 
-do_configure () {
+do_configure_prepend () {
 	if [ ! -e acinclude.m4 ]; then
 		mv acinclude.m4.ntop acinclude.m4
 	fi
-	autotools_do_configure
+	rm -f libtool
+	cp ${STAGING_BINDIR_NATIVE}/${TARGET_SYS}-libtool libtool
 }
diff --git a/packages/uboot/uboot-utils_1.2.0.bb b/packages/uboot/uboot-utils_1.2.0.bb
index 8a5d7dce3c..89cc6a235d 100644
--- a/packages/uboot/uboot-utils_1.2.0.bb
+++ b/packages/uboot/uboot-utils_1.2.0.bb
@@ -2,22 +2,11 @@ DESCRIPTION = "U-boot bootloader OS env. access tools for PPC"
 SECTION = "bootloaders"
 PRIORITY = "optional"
 LICENSE = "GPL"
-DEPENDS = "mtd-utils"
-PR = "r5"
+PR = "r6"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \
-	 file://fw_env.c.patch;patch=1 \
-	 file://tools-Makefile.patch;patch=1 \
-	 file://env-Makefile.patch;patch=1 \
-	 file://fw_env.config"
+SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2" 
 
 S = "${WORKDIR}/u-boot-${PV}"
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}"
-TARGET_LDFLAGS = ""
-
-UBOOT_MACHINE ?= "${MACHINE}_config"
-
-inherit base
 
 do_configure() {
 	:
@@ -34,10 +23,3 @@ do_stage() {
 	install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/
 }
 
-do_install () {
-	install -d	${D}/sbin
-	install -d	${D}${sysconfdir}
-	install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
-	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv
-	install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv
-}