[oe-commits] org.oe.dev merge of '57cc0ea5ac2c9fcb954fde9648313ceb7c4c1289'

thebohemian commit oe at amethyst.openembedded.net
Thu May 15 15:04:45 UTC 2008


merge of '57cc0ea5ac2c9fcb954fde9648313ceb7c4c1289'
     and '5a2c2dc85911ec398a156e49ad35c17c5534442f'

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: 0892eadc56b6091d6a37c303fe91fd0517a1b73b
ViewMTN: http://monotone.openembedded.org/revision/info/0892eadc56b6091d6a37c303fe91fd0517a1b73b
Files:
1
packages/gammu/files
packages/gammu/files/ldflags-again.patch
packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch
packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch
packages/gammu/gammu_1.17.0.bb
packages/gammu/gammu_1.20.0.bb
packages/gif2png
packages/nonworking/gif2png
packages/guile/guile-native_1.6.4.bb
packages/nonworking/guile/guile-native_1.6.4.bb
packages/linux/linux-ixp4xx/defconfig-2.6.24.4
packages/linux/linux-ixp4xx/defconfig-2.6.24.7
packages/linux/linux-ixp4xx_2.6.24.4.bb
packages/linux/linux-ixp4xx_2.6.24.7.bb
packages/python/python-gammu_0.24.bb
packages/python/python-gammu_0.26.bb
packages/chicken
packages/dsplink
packages/gpsdrive/gpsdrive-2.10pre4
packages/i2c-tools
packages/nonworking/guile
classes/oestats-client.bbclass
packages/chicken/chicken.inc
packages/chicken/chicken_2.6.bb
packages/dsplink/dsplink_1.50.bb
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch
packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop
packages/gpsdrive/gpsdrive_2.10pre4.bb
packages/i2c-tools/i2c-tools_3.0.1.bb
packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch
packages/perl/libwww-perl-native_5.808.bb
packages/perl/libwww-perl_5.808.bb
conf/checksums.ini
conf/distro/angstrom-2008.1.conf
conf/distro/include/angstrom-glibc.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/include/ixp4xx.inc
packages/libopie/libopie2_1.2.3.bb
packages/linux/linux-omap2_git.bb
packages/linux/linux_2.6.23+2.6.24-rc5.bb
packages/linux/linux_2.6.25.bb
packages/openssl/openssl-native_0.9.7m.bb
packages/openssl/openssl-native_0.9.8g.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
packages/tasks/task-sdk-opie.bb
packages/docbook-utils/docbook-utils-native_0.6.13.bb
packages/docbook-utils/docbook-utils_0.6.13.bb
conf/distro/include/preferred-om-2008-versions.inc
Diffs:

#
# mt diff -r57cc0ea5ac2c9fcb954fde9648313ceb7c4c1289 -r0892eadc56b6091d6a37c303fe91fd0517a1b73b
#
#
#
# delete "packages/gammu/files"
# 
# delete "packages/gammu/files/ldflags-again.patch"
# 
# delete "packages/linux/linux-omap2-git/beagleboard/0001-This-patch-adds-RTC-support-to-the-omap3-based-beagl.patch"
# 
# delete "packages/linux/linux-omap2-git/beagleboard/l2-cache-check.patch"
# 
# rename "packages/gammu/gammu_1.17.0.bb"
#     to "packages/gammu/gammu_1.20.0.bb"
# 
# rename "packages/gif2png"
#     to "packages/nonworking/gif2png"
# 
# rename "packages/guile/guile-native_1.6.4.bb"
#     to "packages/nonworking/guile/guile-native_1.6.4.bb"
# 
# rename "packages/linux/linux-ixp4xx/defconfig-2.6.24.4"
#     to "packages/linux/linux-ixp4xx/defconfig-2.6.24.7"
# 
# rename "packages/linux/linux-ixp4xx_2.6.24.4.bb"
#     to "packages/linux/linux-ixp4xx_2.6.24.7.bb"
# 
# rename "packages/python/python-gammu_0.24.bb"
#     to "packages/python/python-gammu_0.26.bb"
# 
# add_dir "packages/chicken"
# 
# add_dir "packages/dsplink"
# 
# add_dir "packages/gpsdrive/gpsdrive-2.10pre4"
# 
# add_dir "packages/i2c-tools"
# 
# add_dir "packages/nonworking/guile"
# 
# add_file "classes/oestats-client.bbclass"
#  content [c9260fde7f5ef0dc89229f308c6ec355d98efd23]
# 
# add_file "packages/chicken/chicken.inc"
#  content [5d99d31fa3390d5586a80a2fed735130d600d502]
# 
# add_file "packages/chicken/chicken_2.6.bb"
#  content [a33aea68545716afa153f3351466a014672c3ba4]
# 
# add_file "packages/dsplink/dsplink_1.50.bb"
#  content [47c29a6b30d8694d6b081b8ce1e895ffb63957c8]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch"
#  content [f7d05fac53703548b59b528f752366847140744e]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch"
#  content [47e014d89d9957ea970e01aced2dc553d3722236]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch"
#  content [b9c3b9e051b269ab097c36a70c58b6d218e0d55d]
# 
# add_file "packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive_2.10pre4.desktop"
#  content [cddc5f1f7eb5adf78aaad3610fccaddcf0616dfc]
# 
# add_file "packages/gpsdrive/gpsdrive_2.10pre4.bb"
#  content [9e4cea32b63aa093d54c9b1039cfa8dd87790322]
# 
# add_file "packages/i2c-tools/i2c-tools_3.0.1.bb"
#  content [353aa093f4a9d6c3e69ffdeeb19a926b07da9c3f]
# 
# add_file "packages/linux/linux-omap2-git/beagleboard/0001-board-omap3beagle-fix-merge-damage-in-RTC-code.patch"
#  content [600d062218a1b4266905f44c26ab670c0c53f7a4]
# 
# add_file "packages/perl/libwww-perl-native_5.808.bb"
#  content [66723b8808de2c5758435a88b9640bc8777d89be]
# 
# add_file "packages/perl/libwww-perl_5.808.bb"
#  content [c76a162b7e6844022d4b9826386bfeed71c6328e]
# 
# patch "conf/checksums.ini"
#  from [1880ebcf6a764f594aaaa832b25560a16dbda166]
#    to [bdcb5c89ad7d32329348e2884110c90db3d76581]
# 
# patch "conf/distro/angstrom-2008.1.conf"
#  from [947d891b5c7e5a12292a5157cb870e8fae548110]
#    to [dface09802ce45bdb21c822c2e46b480f3369810]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [586f7087f5d3251e88bcbb32dc31647dc11d7375]
#    to [c49fa1468b1a41c309505f099d320a78a592a8b8]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [0de6a073afe8a3d541762cc8093453d321a3d50d]
#    to [2cff5a66720adf7279a2d1efa08468aa48d8a0d0]
# 
# patch "conf/machine/include/ixp4xx.inc"
#  from [bd7fbb0b318d8a61b9e28aa61714a6c764716a15]
#    to [88a1dc083e8c2c9f9fd1ad8f4174c0eeb1895cd4]
# 
# patch "packages/gammu/gammu_1.20.0.bb"
#  from [32f447033fd0c855eefaac567bda64e17b60b004]
#    to [565916b05a1055592b343f5c80c15354710f6049]
# 
# patch "packages/libopie/libopie2_1.2.3.bb"
#  from [63a7fc0db1279bd05e64e2b06c6e583e83ec1cca]
#    to [60741c8fec6e800e5b344bbf504b3b86e331304b]
# 
# patch "packages/linux/linux-ixp4xx_2.6.24.7.bb"
#  from [133c666836fae4cf596ebc6965901fe764a1b2b1]
#    to [53fcbed2f4b090668fac77808b2582e41e9afdfe]
# 
# patch "packages/linux/linux-omap2_git.bb"
#  from [3b6da60c8cd98f8fc757ec97487827f45027fb50]
#    to [ff28a88cc78eaf1d0a39ca0bedaa3aeb4c0f30fb]
# 
# patch "packages/linux/linux_2.6.23+2.6.24-rc5.bb"
#  from [801134850169bd093cb2c9401f2e93bbd3acc903]
#    to [9e64614b2b4500887ff09f7ff53ffccb90a7ff0a]
# 
# patch "packages/linux/linux_2.6.25.bb"
#  from [ed037c79f846e5b7c53db483560819488aadcdcf]
#    to [908bd7f32af38ac35b5fed1ed57e60c950bcb8c9]
# 
# patch "packages/openssl/openssl-native_0.9.7m.bb"
#  from [e28e67ce3cebe3a10688393468c808ca63a894ea]
#    to [a7e810d1f91585491c6c3f0f1404c6fef062ee5c]
# 
# patch "packages/openssl/openssl-native_0.9.8g.bb"
#  from [98c454369b291116cbce2058d162de0078064399]
#    to [2ca0e07e42caa326c5ec3f9611fdd2def25638a8]
# 
# patch "packages/qte/qte-common_2.3.10.inc"
#  from [0aac8dfbf78ecb980a8817d0ceef6220a54f4724]
#    to [24ec02846781efe4c104691900ce390e594e64bb]
# 
# patch "packages/qte/qte-mt_2.3.10.bb"
#  from [4241677b274551c8db9002c2c4aebecaf5272154]
#    to [9de7ec362919755e02c79a584fd115bdf5a9f152]
# 
# patch "packages/tasks/task-sdk-opie.bb"
#  from [5d932ba8c6873f9b29c041d35ac20b75943111d8]
#    to [0916e818e16c9cceb4a29cf6ab8829cdcffe3885]
#
============================================================
--- classes/oestats-client.bbclass	c9260fde7f5ef0dc89229f308c6ec355d98efd23
+++ classes/oestats-client.bbclass	c9260fde7f5ef0dc89229f308c6ec355d98efd23
@@ -0,0 +1,108 @@
+# Integration with the oestats build statistics server, see:
+#
+# http://opensource.bolloretelecom.eu/projects/oestats
+#
+# To make use of this class, add to your local.conf:
+#
+# INHERIT += "oestats-client"
+# OESTATS_SERVER = "some.server.org:8000"
+# OESTATS_BUILDER = "some title"
+
+def oestats_revision(dir):
+	import re
+	try:
+		f = file("%s/_MTN/revision" % dir)
+		m = re.search(r"old_revision \[(.*)\]", f.read())
+		return m.group(1)
+	except:
+		return
+
+def oestats_send(server, action, vars = {}):
+	import httplib, urllib
+
+	params = urllib.urlencode(vars)
+	headers = {"Content-type": "application/x-www-form-urlencoded",
+		"Accept": "text/plain"}
+	conn = httplib.HTTPConnection(server)
+	conn.request("POST", action, params, headers)
+	response = conn.getresponse()
+	conn.close()
+	return response
+
+def oestats_start(server, builder, d):
+	import bb
+	import os.path
+
+	# collect information about revisions
+	path_bb = bb.data.getVar('BBPATH', d, 1)
+	for p in (path_bb or "").split(':'):
+		revision = oestats_revision(p)
+		if revision:
+			break
+
+	# send report
+	response = oestats_send(server, "/builds/start/", {
+		'builder': builder,
+		'revision': revision,
+		'machine': bb.data.getVar( 'MACHINE', d, True ),
+		'distro': bb.data.getVar( 'DISTRO', d, True ),
+	})
+	id = response.read()
+
+	# save the build id
+	bb.note("Stats id: %s" % id)
+	f = file(bb.data.getVar('TMPDIR', d, True)+"/oestats.id", 'w')
+	f.write(id)
+
+def oestats_stop(server, d, status):
+	import bb
+
+	# retrieve build id
+	f = file(bb.data.getVar('TMPDIR',d,True)+"/oestats.id", 'r')
+	id = f.read()
+
+	# send report
+	response = oestats_send(server, "/builds/stop/%s/" % id, {
+		'status': status,
+	})
+
+def oestats_task(server, d, task, status):
+	import bb
+
+	# retrieve build id
+	f = file(bb.data.getVar('TMPDIR',d,True)+"/oestats.id", 'r')
+	id = f.read()
+
+	# send report
+	response = oestats_send(server, "/builds/task/%s/" % id, {
+		'package': bb.data.getVar('PN', d, True),
+		'version': bb.data.getVar('PV', d, True),
+		'revision': bb.data.getVar('PR', d, True),
+		'task': task,
+		'status': status,
+	})
+
+addhandler oestats_eventhandler
+python oestats_eventhandler () {
+	from bb.event import getName
+	import bb
+
+	if e.data is None or getName(e) == "MsgNote":
+		return NotHandled
+
+	server = bb.data.getVar('OESTATS_SERVER', e.data, True)
+	builder = bb.data.getVar('OESTATS_BUILDER', e.data, True)
+	if not server or not builder:
+		return NotHandled
+
+	if getName(e) == 'BuildStarted':
+		oestats_start(server, builder, e.data)
+	elif getName(e) == 'BuildCompleted':
+		oestats_stop(server, e.data, 'Completed')
+	elif getName(e) == 'TaskSucceeded':
+		oestats_task(server, e.data, e.task, 'Succeeded')
+	elif getName(e) == 'TaskFailed':
+		oestats_task(server, e.data, e.task, 'Failed')
+
+	return NotHandled
+}
============================================================
--- packages/chicken/chicken.inc	5d99d31fa3390d5586a80a2fed735130d600d502
+++ packages/chicken/chicken.inc	5d99d31fa3390d5586a80a2fed735130d600d502
@@ -0,0 +1,19 @@
+DESCRIPTION = "A compiler that translates Scheme source files to C, and an interpreter"
+HOMEPAGE = "http://www.call-with-current-continuation.org/"
+SECTION = "interpreters"
+PRIORITY = "optional"
+LICENSE = "BSD"
+
+SRC_URI = "http://www.call-with-current-continuation.org/chicken-${PV}.tar.gz" 
+
+inherit autotools
+
+do_install_append() {
+    install -d ${D}${docdir}/${P}
+    mv ${D}/${datadir}/chicken/doc ${D}${docdir}/${P}
+}
+
+do_stage() {
+    autotools_stage_all
+}
+
============================================================
--- packages/chicken/chicken_2.6.bb	a33aea68545716afa153f3351466a014672c3ba4
+++ packages/chicken/chicken_2.6.bb	a33aea68545716afa153f3351466a014672c3ba4
@@ -0,0 +1 @@
+require chicken.inc
============================================================
--- packages/dsplink/dsplink_1.50.bb	47c29a6b30d8694d6b081b8ce1e895ffb63957c8
+++ packages/dsplink/dsplink_1.50.bb	47c29a6b30d8694d6b081b8ce1e895ffb63957c8
@@ -0,0 +1,26 @@
+DESCRIPTION = "DSP Link for TI ARM/DSP processors"
+
+DEPENDS = "virtual/kernel"
+
+PR = "r0"
+
+# Get dsplink tarball from TI website, place in sources and calculate
+# md5sum
+# https://www-a.ti.com/downloads/sds_support/targetcontent/link/index.html
+SRC_URI ="http://install.tarball.in.source.dir/dsplink_1_50.tar.gz \
+"
+
+S = "${WORKDIR}/dsplink_1_50/dsplink"
+
+# Needed for buildscripts
+export DSPLINK = "${S}"
+
+do_configure () {
+}
+
+do_compile () {
+sh ${S}/etc/host/scripts/Linux/buildmodule.sh
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}" 
+
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch	f7d05fac53703548b59b528f752366847140744e
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-2.10pre4-openstreetmap-download.patch	f7d05fac53703548b59b528f752366847140744e
@@ -0,0 +1,128 @@
+diff -ur gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl gpsdrive-2.10pre4/scripts/gpsfetchmap.pl
+--- gpsdrive-2.10pre4.orig/scripts/gpsfetchmap.pl	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/scripts/gpsfetchmap.pl	2008-01-04 19:01:35.000000000 +0100
+@@ -35,6 +35,7 @@
+ modified (Jul 2005) by Jaroslaw Zachwieja <grok\@filippa.org.uk>
+ modified (Dec 2005) by David Pollard <david dot pollard\@optusnet.com.au>
+ modified (Jul 2007) by Maciek Kaliszewski <mkalkal\@interia.pl>
++modified (Jan 2008) by Gernot Hillier <gernot\@hillier.de> (added Openstreetmap support)
+ Version svn-$Version
+ ";
+ 
+@@ -176,6 +177,25 @@
+       15812 => 3 ,
+       7906  => 2,
+       3953 => 1
++    },
++    openstreetmap_tah => {
++      256*576000 =>  1,
++      128*576000 =>  2,
++       64*576000 =>  3,
++       32*576000 =>  4,
++       16*576000 =>  5,
++        8*576000 =>  6,
++        4*576000 =>  7,
++        2*576000 =>  8,
++          576000 =>  9,
++          288000 => 10,
++          144000 => 11,
++           72000 => 12,
++           36000 => 13,
++           18000 => 14,
++           9000  => 15,
++            4500 => 16,
++            2250 => 17
+     }
+ };
+ 
+@@ -331,7 +351,6 @@
+     exit();
+ }
+ 
+-
+ # Verify that we have the options that we need 
+ pod2usage(1) if (&error_check);
+ 
+@@ -417,6 +436,13 @@
+     print "+-----------------------------------------------------------+\n";
+     print "| Landsat Maps are Copyright, .....   |\n";
+     print "| They are free for non commercial use.                     |\n";
++}elsif ( $mapserver eq 'openstreetmap_tah' ){
++    print "+-----------------------------------------------------------+\n";
++    print "| OpenStreetmap Maps are Copyright by the OpenStreetmap     |\n";
++    print "| project.                                                  |\n";
++    print "| They are free for use under the terms of the              |\n";
++    print "| Creative Commons \"Attribution-Share Alike 2.0 Generic\"    |\n";
++    print "| license. See http://www.openstreetmap.org for details.    |\n";
+ } elsif ( ! $force) {
+     print "You are violating the map servers copyright!\n";
+     print "Are you sure you want to continue? [y|n] ";
+@@ -700,6 +726,11 @@
+     {
+ 	($url,$mapscale)=googlemap_url($lati,$long,$scale);
+     } 
++    elsif ( $mapserver eq 'openstreetmap_tah') 
++    {	
++	$filename=~s/\.gif/.png/;
++	($url,$mapscale)=openstreetmap_tah_url($lati,$long,$scale);
++    } 
+     else 
+     {
+ 	print "Unknown map sever :", $mapserver, "\n"; 
+@@ -935,6 +966,37 @@
+     return ($url,$mapscale);
+ }
+ 
++#############################################################################
++sub openstreetmap_tah_url($$$){
++    my $lati = shift;
++    my $long = shift;
++    my $scale = shift;
++
++    my $mapscale = $scale;
++    my $zoom = undef;
++    for my $s ( sort keys %{$Scale2Zoom->{openstreetmap_tah}} ) {
++	next unless $s == $scale;
++	$zoom = $Scale2Zoom->{openstreetmap_tah}->{$s};
++	$mapscale = $s;
++	last;
++    }
++
++    unless ( $zoom ) {
++	print "Error calculating Zoomlevel for Scale: $scale\n";
++	return (undef,undef);
++    }
++
++    if ($debug) {
++	print "\n";
++	print "Using openstreetmap_tah zoom ", $zoom, " for requested scale ", $scale, ":1 actual scale ", $mapscale, ":1\n";
++	print "lat: $lati\n";
++	print "lon: $long\n";
++    }
++
++    my $url = "http://tah.openstreetmap.org/MapOf/?lat=$lati&long=$long&z=$zoom&w=1280&h=1024&format=png";
++#   print "$url\n";
++    return ($url,$mapscale);
++}
+ 
+ #############################################################################
+ sub eniro_url($$$){
+@@ -2284,7 +2346,7 @@
+ =item B<--mapserver <MAPSERVER>>
+ 
+ Mapserver to download from. Default: 'expedia'.
+-Currently can use: landsat or expedia.
++Currently usable: landsat, expedia or openstreetmap_tah.
+ 
+ geoscience, gov_au, incrementp, googlesat, googlemap and eniro have download stubs, 
+ but they are !!!NOT!!!! in the right scale.
+@@ -2294,6 +2356,9 @@
+ 
+ landsat covers the whole world with satelite Photos
+ 
++openstreetmap_tah: Free maps from the OpenStreetmap Tiles at Home project, see 
++		   http://www.openstreetmap.org and http://tah.openstreetmap.org.
++
+ gov_au is for Australia
+ 
+ incrementp for japanese Maps
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch	47e014d89d9957ea970e01aced2dc553d3722236
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-ifdef-mapnik.patch	47e014d89d9957ea970e01aced2dc553d3722236
@@ -0,0 +1,18 @@
+Index: src/map_handler.c
+===================================================================
+--- aa/src/map_handler.c	(Revision 1699)
++++ aa/src/map_handler.c	(Revision 1700)
+@@ -660,9 +660,12 @@
+   if (maploaded)
+     gdk_pixbuf_unref (image);
+ 
++#ifdef MAPNIK
+   if ( !strcmp (filename,"mapnik") ) {
+ 	  limage = gdk_pixbuf_new_from_data(get_mapnik_imagedata(), GDK_COLORSPACE_RGB, FALSE, 8, 1280, 1024, 1280 * 3, NULL, NULL);
+-  } else {
++  } else 
++#endif
++  {
+ 	  limage = gdk_pixbuf_new_from_file (filename, NULL);
+ 	  if (limage == NULL)
+ 	    {
============================================================
--- packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch	b9c3b9e051b269ab097c36a70c58b6d218e0d55d
+++ packages/gpsdrive/gpsdrive-2.10pre4/gpsdrive-remove-hardcoded-paths.patch	b9c3b9e051b269ab097c36a70c58b6d218e0d55d
@@ -0,0 +1,96 @@
+diff -ur gpsdrive-2.10pre4.orig/src/Makefile.am gpsdrive-2.10pre4/src/Makefile.am
+--- gpsdrive-2.10pre4.orig/src/Makefile.am	2007-12-28 18:49:44.000000000 +0100
++++ gpsdrive-2.10pre4/src/Makefile.am	2007-12-28 18:50:29.000000000 +0100
+@@ -14,14 +14,14 @@
+ 	-DLOCALEDIR=\"${localedir}\" -DDATADIR=\"${datadir}\" \
+ 	-DLIBDIR=\"${libdir}\" \
+ 	-DFRIENDSSERVERVERSION=\"${FRIENDSSERVERVERSION}\" \
+-	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}\
+-	-I/usr/include/ \
+-	-I/usr/local/include \
+-	-I/opt/boost_1_35/include/boost-1_35 \
+-	-I/usr/local/include/freetype2 \
+-	-I/usr/include/freetype2 \
++	${NOGARMIN} ${NOPLUGINS} ${AMAPNIK}
++#	-I/usr/include/ \
++#	-I/usr/local/include \
++#	-I%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r5a2c2dc85911ec398a156e49ad35c17c5534442f -r0892eadc56b6091d6a37c303fe91fd0517a1b73b
#
#
#
# delete "packages/docbook-utils/docbook-utils-native_0.6.13.bb"
# 
# delete "packages/docbook-utils/docbook-utils_0.6.13.bb"
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3]
#    to [5f9e99fa45dd0ff3b521383e4f8f11e144767fec]
#
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	1fa5768d601b1fc24f2f64c740c2e5fc96c4fce3
+++ conf/distro/include/preferred-om-2008-versions.inc	5f9e99fa45dd0ff3b521383e4f8f11e144767fec
@@ -263,8 +263,8 @@ PREFERRED_VERSION_dnsmasq ?= "2.38"
 PREFERRED_VERSION_djvulibre ?= "3.5.19"
 PREFERRED_VERSION_dmxproto ?= "2.2.2"
 PREFERRED_VERSION_dnsmasq ?= "2.38"
-PREFERRED_VERSION_docbook-utils ?= "0.6.13"
-PREFERRED_VERSION_docbook-utils-native ?= "0.6.13"
+PREFERRED_VERSION_docbook-utils ?= "0.6.14"
+PREFERRED_VERSION_docbook-utils-native ?= "0.6.14"
 PREFERRED_VERSION_dosbox ?= "0.70"
 PREFERRED_VERSION_dosfstools ?= "2.11"
 PREFERRED_VERSION_dosfstools-native ?= "2.10"






More information about the Openembedded-commits mailing list