[oe-commits] org.oe.dev merge of '329df9dc9aeb10de474ddef3143523dd49e8ce6a'

mickeyl commit openembedded-commits at lists.openembedded.org
Sat Aug 18 13:28:04 UTC 2007 

merge of '329df9dc9aeb10de474ddef3143523dd49e8ce6a'
     and '4d580f70318d589b28c525479b598a0fec9dc64b'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 390cade64b375f352a86762181c985d1f37276da
ViewMTN: http://monotone.openembedded.org/revision.psp?id=390cade64b375f352a86762181c985d1f37276da
Files:
1
packages/gtk-webcore/osb-jscore_20060212.bb
packages/gtk-webcore/osb-jscore_20070816.bb
packages/gtk-webcore/osb-nrcit_20060212.bb
packages/gtk-webcore/osb-nrcit_20070816.bb
packages/gtk-webcore/osb-nrcore_20060212.bb
packages/gtk-webcore/osb-nrcore_20070816.bb
packages/gtk+/gtk+_2.10.14.bb
packages/gtk+/gtk-2.10.inc
packages/linux/linux-gumstix_2.6.15.bb
packages/linux/linux-x86_2.6.20.bb
packages/ntop/ntop-3.0/autotools.patch
packages/ntop/ntop_3.0.bb
packages/uboot/uboot-utils_1.2.0.bb
packages/tasks/task-python-everything.bb
Diffs:

#
# mt diff -r329df9dc9aeb10de474ddef3143523dd49e8ce6a -r390cade64b375f352a86762181c985d1f37276da
#
# 
# 
# rename "packages/gtk-webcore/osb-jscore_20060212.bb"
#     to "packages/gtk-webcore/osb-jscore_20070816.bb"
# 
# rename "packages/gtk-webcore/osb-nrcit_20060212.bb"
#     to "packages/gtk-webcore/osb-nrcit_20070816.bb"
# 
# rename "packages/gtk-webcore/osb-nrcore_20060212.bb"
#     to "packages/gtk-webcore/osb-nrcore_20070816.bb"
# 
# patch "packages/gtk+/gtk+_2.10.14.bb"
#  from [890b8af0576d4d673f799884c31f7f008a1bc249]
#    to [b7a85a029e4d690ccbcfaae174f1f1950723c46d]
# 
# patch "packages/gtk+/gtk-2.10.inc"
#  from [0a6a74c0925d707458293e024482eee4d2026915]
#    to [e2ee8270d4b0ff61cd9c2b914dd202d1d7e4c6ce]
# 
# patch "packages/linux/linux-gumstix_2.6.15.bb"
#  from [6445cf5c019443d1dc8406a5fa8b9af7e80fd238]
#    to [5e487b2ff0a5c5204061cf12f89a2cd544260963]
# 
# patch "packages/linux/linux-x86_2.6.20.bb"
#  from [3221d944ae3c2cbf3030007c7cc3d0ac8f0ff3f0]
#    to [3d74ce752eaf5a8499ddde36a0737d0fd00be798]
# 
# patch "packages/ntop/ntop-3.0/autotools.patch"
#  from [39de25577f48a3ec45eba97b4ec210c1ef78327a]
#    to [b7452a78e0098fa3dab03679c8ac195e42a2ead7]
# 
# patch "packages/ntop/ntop_3.0.bb"
#  from [53d18b36169c50e10b8e1e25e0f7e09f8da8772e]
#    to [23e78a4fb233134ddee3b6b6d6cdc953ddf99a70]
# 
# patch "packages/uboot/uboot-utils_1.2.0.bb"
#  from [02c24e2e787364d6abbbb9560250bcd4d9d21e84]
#    to [b72d6934fb848bef58cebbfbbc5593cefebcfca5]
# 
============================================================
--- packages/gtk+/gtk+_2.10.14.bb	890b8af0576d4d673f799884c31f7f008a1bc249
+++ packages/gtk+/gtk+_2.10.14.bb	b7a85a029e4d690ccbcfaae174f1f1950723c46d
@@ -1,6 +1,6 @@ require gtk-2.10.inc
 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 \
============================================================
--- packages/gtk+/gtk-2.10.inc	0a6a74c0925d707458293e024482eee4d2026915
+++ packages/gtk+/gtk-2.10.inc	e2ee8270d4b0ff61cd9c2b914dd202d1d7e4c6ce
@@ -13,18 +13,20 @@ FILES_${PN} = "${bindir}/gdk-pixbuf-quer
 	${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 "
============================================================
--- packages/linux/linux-gumstix_2.6.15.bb	6445cf5c019443d1dc8406a5fa8b9af7e80fd238
+++ packages/linux/linux-gumstix_2.6.15.bb	5e487b2ff0a5c5204061cf12f89a2cd544260963
@@ -1,8 +1,10 @@ PR = "r1"
 DESCRIPTION = "Linux Kernel for the Gumstix"
 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 \
============================================================
--- packages/linux/linux-x86_2.6.20.bb	3221d944ae3c2cbf3030007c7cc3d0ac8f0ff3f0
+++ packages/linux/linux-x86_2.6.20.bb	3d74ce752eaf5a8499ddde36a0737d0fd00be798
@@ -1,13 +1,13 @@ LICENSE = "GPL"
 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}"
============================================================
--- packages/ntop/ntop-3.0/autotools.patch	39de25577f48a3ec45eba97b4ec210c1ef78327a
+++ packages/ntop/ntop-3.0/autotools.patch	b7452a78e0098fa3dab03679c8ac195e42a2ead7
@@ -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
============================================================
--- packages/ntop/ntop_3.0.bb	53d18b36169c50e10b8e1e25e0f7e09f8da8772e
+++ packages/ntop/ntop_3.0.bb	23e78a4fb233134ddee3b6b6d6cdc953ddf99a70
@@ -1,8 +1,9 @@ DEPENDS = "gdbm zlib libpcap libpng gd"
 LICENSE = "GPL"
 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 @@ FILES_${PN}-dev = "${includedir} ${libdi
 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
 }
============================================================
--- packages/uboot/uboot-utils_1.2.0.bb	02c24e2e787364d6abbbb9560250bcd4d9d21e84
+++ packages/uboot/uboot-utils_1.2.0.bb	b72d6934fb848bef58cebbfbbc5593cefebcfca5
@@ -1,24 +1,13 @@ LICENSE = "GPL"
 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
-}


#
# mt diff -r4d580f70318d589b28c525479b598a0fec9dc64b -r390cade64b375f352a86762181c985d1f37276da
#
# 
# 
# patch "packages/tasks/task-python-everything.bb"
#  from [3e98f2dd27cca9f4768b4faf85221eb01df5b725]
#    to [044dc0062bdb3542a527f6a025623d195f62d5fd]
# 
============================================================
--- packages/tasks/task-python-everything.bb	3e98f2dd27cca9f4768b4faf85221eb01df5b725
+++ packages/tasks/task-python-everything.bb	044dc0062bdb3542a527f6a025623d195f62d5fd
@@ -1,12 +1,10 @@ LICENSE = "MIT"
 DESCRIPTION= "Everything Python"
 HOMEPAGE = "http://www.vanille.de/projects/python.spy"
 LICENSE = "MIT"
-PR = "ml15"
+PR = "ml16"
 
 RDEPENDS = "\
 		python-ao 		\
-		python-pybluez		\
-		python-cairo		\
 		python-cheetah		\
 		python-constraint	\
 		python-crypto		\
@@ -40,6 +38,7 @@ RDEPENDS = "\
 		python-ogg		\
 		python-pexpect		\
 		python-pybluez		\
+		python-pycairo		\
 		python-pychecker	\
 		python-pycodes		\
 		python-pyephem		\

More information about the Openembedded-commits mailing list