[oe-commits] org.oe.dev merge of '667771aae40d71d3a640333d77db8501aaa679df'

mickeyl commit oe at amethyst.openembedded.net
Wed Jun 18 15:19:51 UTC 2008 

merge of '667771aae40d71d3a640333d77db8501aaa679df'
     and '789d64c5f0950113dd422cc0a20a91d15947ad09'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4e3569a19b8a6f85c3878f45db976a5ef67711f2
ViewMTN: http://monotone.openembedded.org/revision/info/4e3569a19b8a6f85c3878f45db976a5ef67711f2
Files:
1
packages/fetchmail/fetchmail-6.3.8
packages/gtk-webcore/midori-0.0.18
packages/xorg-xserver/xserver-kdrive-1.4.2
packages/xorg-xserver/xserver-xorg-1.4.2
packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch
packages/fetchmail/fetchmail_6.3.8.bb
packages/gtk-webcore/midori-0.0.18/desktop.patch
packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch
packages/oprofile/oprofile/armv6_fix.patch
packages/oprofile/oprofile/fix-arith.patch
packages/oprofile/oprofile/oparchive_fix.patch
packages/oprofile/oprofile/opstart.patch
packages/oprofile/oprofile/root_option.patch
packages/oprofile/oprofile/xml_callgraph_details.patch
packages/oprofile/oprofileui-svn.inc
packages/oprofile/oprofileui.inc
packages/oprofile/oprofileui_svn.bb
packages/xorg-app/sessreg_1.0.4.bb
packages/xorg-app/xinit_1.1.0.bb
packages/xorg-proto/xextproto_7.0.3.bb
packages/xorg-xserver/xserver-kdrive-1.4.2/disable-xf86-dga-xorgcfg.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/enable-tslib.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/enable-xcalibrate.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/keyboard-resume-workaround.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/linux-keyboard-mediumraw.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/no_xkb.patch
packages/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch
packages/xorg-xserver/xserver-kdrive_1.4.2.bb
packages/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch
packages/xorg-xserver/xserver-xorg_1.4.2.bb
classes/packaged-staging.bbclass
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
packages/bwmon/bwmon_1.3.bb
packages/gtk-webcore/midori_0.0.18.bb
packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb
packages/libtool/libtool-cross_2.2.4.bb
packages/libtool/libtool_2.2.4.bb
packages/meta/slugos-packages.bb
packages/oprofile/oprofile_0.9.3.bb
packages/oprofile/oprofile_cvs.bb
packages/pciutils/pciutils-2.2.4/configure.patch
packages/pciutils/pciutils_2.2.4.bb
packages/stage-manager/files/stage-manager-ipkg
packages/stage-manager/stagemanager-native_0.0.1.bb
packages/syslog-ng/syslog-ng_2.0.5.bb
packages/u-boot/u-boot-git/beagleboard/base.patch
packages/u-boot/u-boot_git.bb
packages/glib-2.0/glib-2.0-native_2.16.1.bb
conf/distro/include/preferred-om-2008-versions.inc
packages/glib-2.0/glib-2.0_2.16.1.bb
Diffs:

#
# mt diff -r667771aae40d71d3a640333d77db8501aaa679df -r4e3569a19b8a6f85c3878f45db976a5ef67711f2
#
#
#
# add_dir "packages/fetchmail/fetchmail-6.3.8"
# 
# add_dir "packages/gtk-webcore/midori-0.0.18"
# 
# add_dir "packages/xorg-xserver/xserver-kdrive-1.4.2"
# 
# add_dir "packages/xorg-xserver/xserver-xorg-1.4.2"
# 
# add_file "packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch"
#  content [43420cf3d87053e2d4e56ae314920ae659928942]
# 
# add_file "packages/fetchmail/fetchmail_6.3.8.bb"
#  content [6a789128113572f654ad3969d3db1e5b310ec06f]
# 
# add_file "packages/gtk-webcore/midori-0.0.18/desktop.patch"
#  content [a0c82f13a717852e3c332c268f12e92bad95d9b2]
# 
# add_file "packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch"
#  content [7e3ea2cc037b123abe16e35f47225a936c98b116]
# 
# add_file "packages/oprofile/oprofile/armv6_fix.patch"
#  content [5603ec2069bdcd2a5b0102f5666bf662ea6c9bda]
# 
# add_file "packages/oprofile/oprofile/fix-arith.patch"
#  content [94c018206eb1555fb068cb5bb10fa0df596bd167]
# 
# add_file "packages/oprofile/oprofile/oparchive_fix.patch"
#  content [d12a72a44c46f0d9e72d4e907e3cf90ea0894b35]
# 
# add_file "packages/oprofile/oprofile/opstart.patch"
#  content [b908d1172451d2293083c4043b8b4fa6a5986f08]
# 
# add_file "packages/oprofile/oprofile/root_option.patch"
#  content [095f0845a3c86392b7150d54901e18645ad959ab]
# 
# add_file "packages/oprofile/oprofile/xml_callgraph_details.patch"
#  content [fe10c0f4ec9d740f7718c5448f0a368aefe6c887]
# 
# add_file "packages/oprofile/oprofileui-svn.inc"
#  content [2ea13ed1504dc8ee07ee046f7e0f3286dcb383e9]
# 
# add_file "packages/oprofile/oprofileui.inc"
#  content [47666017b5d02717362acb3ac48700167303e9cf]
# 
# add_file "packages/oprofile/oprofileui_svn.bb"
#  content [c77d711540b2579664f7a018d81d8a626339a1e1]
# 
# add_file "packages/xorg-app/sessreg_1.0.4.bb"
#  content [cac4367fdd9e349cfed34a7ac5a972138ab7d6a3]
# 
# add_file "packages/xorg-app/xinit_1.1.0.bb"
#  content [11fa62b52d00712f372c7092ec265b4dae6c213a]
# 
# add_file "packages/xorg-proto/xextproto_7.0.3.bb"
#  content [a2700c4f70667f3d8d5d1a838644f2a4bf6a2416]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/disable-xf86-dga-xorgcfg.patch"
#  content [0e8754f39994efeff67f876087794543f5ec4a2f]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/enable-tslib.patch"
#  content [d8f011120dc0a345fc9c5f897049fea887c705c3]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/enable-xcalibrate.patch"
#  content [08d76cc4f9d1c156f3ac72604bd0b9eb126d9b48]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/keyboard-resume-workaround.patch"
#  content [2dd41bf751f18da06f0d638ee68db2ba1a670f11]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/linux-keyboard-mediumraw.patch"
#  content [faca4d8feba0272517c84f11ac61a39c0b055556]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/no_xkb.patch"
#  content [17027e633e5809ba281942d8c0a5d96710ff3b44]
# 
# add_file "packages/xorg-xserver/xserver-kdrive-1.4.2/w100-autofoo.patch"
#  content [93931fd9a64ed0b3fee8337b05894bab22e14f63]
# 
# add_file "packages/xorg-xserver/xserver-kdrive_1.4.2.bb"
#  content [b2ad79cb8f03fec0ebecebdde76443a33a601362]
# 
# add_file "packages/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch"
#  content [1f677919202395a75968515302a556e50edaa142]
# 
# add_file "packages/xorg-xserver/xserver-xorg_1.4.2.bb"
#  content [82f378de1913460628054471e7fd0daca8a411a1]
# 
# patch "classes/packaged-staging.bbclass"
#  from [b491ec552b4ac0b93945ab4bb2534244ac8fbed5]
#    to [14d20073d82ebc1e8020080f2d3a644fa37ca552]
# 
# patch "conf/distro/include/sane-srcdates.inc"
#  from [cfc0adacd56bc877d9a3b6c76e0f0c96aa316ae5]
#    to [6ba2cf7787b2136c08a7c9a4ce71f239b2ad2ffa]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [aeccd2cc07a122231cd66b08e8769dba7c271812]
#    to [0b433ddda3d56e0d3d91f1c8730f0106aaaf69c5]
# 
# patch "packages/bwmon/bwmon_1.3.bb"
#  from [89e8b142a8225af37941b8acef224d492dc7f9f1]
#    to [a586be615b7281d5a28a210d45b582e9df3999d9]
# 
# patch "packages/gtk-webcore/midori_0.0.18.bb"
#  from [9491a87b02e123ae1e3c6b61d08ab71c192a97dd]
#    to [ef84be9ac374ed5369f4f0249cad6afbb0220fd0]
# 
# patch "packages/ipkg-utils/ipkg-utils_1.6+cvs20050404.bb"
#  from [07df3ff65c44bb77ace88de2929a1527ec1cead3]
#    to [c403e04d11ced9d66b77bf4e3d4802cca1f2af17]
# 
# patch "packages/libtool/libtool-cross_2.2.4.bb"
#  from [211ce9f184e30ace94c707888d8b8f89c501a31c]
#    to [5d9cea224a1ebf62a1471c769ffa9718f5572180]
# 
# patch "packages/libtool/libtool_2.2.4.bb"
#  from [bad9b83fc8d695ff9cff3d4046f13ae1fa3930d0]
#    to [478b531299447324ffec30d92ceab5a5005961dd]
# 
# patch "packages/meta/slugos-packages.bb"
#  from [8f81515c5aaa1108e646cbe57f516ab69335d272]
#    to [28581128f0072432d1d45dbfc5a38389fb81eab2]
# 
# patch "packages/oprofile/oprofile_0.9.3.bb"
#  from [a084caeffd2ac9506fb9d4e8cedf2a8e04a6757d]
#    to [23bb15274689c1ea9ae4c032498d980b567cf0c0]
# 
# patch "packages/oprofile/oprofile_cvs.bb"
#  from [219f961286e4c839f32b63f5e425108ac7e3dacd]
#    to [8762b088fad85c1082825ff1935df909accc4f05]
# 
# patch "packages/pciutils/pciutils-2.2.4/configure.patch"
#  from [aa73b31a034d658dd86fbc5502fb8e47c1448f4c]
#    to [f1bc5e3c06c4d899283842790d5370397133be9d]
# 
# patch "packages/pciutils/pciutils_2.2.4.bb"
#  from [86d87aa633c415ab2ef8e0ec59eb7d7008fb0f90]
#    to [570c4d2e7e8cc7ad779ce37908f03169ebf28339]
# 
# patch "packages/stage-manager/files/stage-manager-ipkg"
#  from [039533c80c39c7ad92cf0d47b2a4df052ab060fa]
#    to [dc79c757acdff1c005e911a0417a97dfee9f76de]
# 
# patch "packages/stage-manager/stagemanager-native_0.0.1.bb"
#  from [02571325be05edc0a1dc2d5a730e4765eda9c37b]
#    to [2e68c72d018fc86793578a4621d0b8415d406c9b]
# 
# patch "packages/syslog-ng/syslog-ng_2.0.5.bb"
#  from [9489ef81848706cf50c2350026a35fed2c87ab7f]
#    to [12a937203aaf8b34592795490fa00b8577b322a9]
# 
# patch "packages/u-boot/u-boot-git/beagleboard/base.patch"
#  from [2a376b51f55582cc5b5c789d00814ed2c676f152]
#    to [df07530c211e06732f6a1cc29550d437d7995ccd]
# 
# patch "packages/u-boot/u-boot_git.bb"
#  from [f5a6ed35ebbb55acec4098d2f8543f801d9416ab]
#    to [1eb87575cc629bb031de6d03bf2a6e4d91660f30]
#
============================================================
--- packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch	43420cf3d87053e2d4e56ae314920ae659928942
+++ packages/fetchmail/fetchmail-6.3.8/CVE-2007-4565.patch	43420cf3d87053e2d4e56ae314920ae659928942
@@ -0,0 +1,11 @@
+--- fetchmail-6.3.8-orig/sink.c
++++ fetchmail-6.3.8/sink.c
+@@ -262,7 +262,7 @@
+     const char *md1 = "MAILER-DAEMON", *md2 = "MAILER-DAEMON@";
+ 
+     /* don't bounce in reply to undeliverable bounces */
+-    if (!msg->return_path[0] ||
++    if (!msg || !msg->return_path[0] ||
+ 	strcmp(msg->return_path, "<>") == 0 ||
+ 	strcasecmp(msg->return_path, md1) == 0 ||
+ 	strncasecmp(msg->return_path, md2, strlen(md2)) == 0)
============================================================
--- packages/fetchmail/fetchmail_6.3.8.bb	6a789128113572f654ad3969d3db1e5b310ec06f
+++ packages/fetchmail/fetchmail_6.3.8.bb	6a789128113572f654ad3969d3db1e5b310ec06f
@@ -0,0 +1,20 @@
+DESCRIPTION = "Fetchmail is a free, full-featured, robust, \
+well-documented remote-mail retrieval and forwarding utility \
+intended to be used over on-demand TCP/IP links \
+(such as SLIP or PPP connections)."
+SECTION = "console/network"
+
+LICENSE = "GPL"
+
+PR = "r2"
+
+SRC_URI = "${DEBIAN_MIRROR}/main/f/${PN}/${PN}_${PV}.orig.tar.gz \
+	   file://CVE-2007-4565.patch;patch=1 \
+	   "
+
+inherit autotools gettext
+
+FILES_${PN} = "${bindir}/fetchmail"
+PACKAGES += "${PN}conf"
+FILES_${PN}conf = "${libdir}/python2.5/site-packages/fetchmailconf.py* ${bindir}/fetchmailconf"
+rdepends_${PN}conf = "${PN}"
============================================================
--- packages/gtk-webcore/midori-0.0.18/desktop.patch	a0c82f13a717852e3c332c268f12e92bad95d9b2
+++ packages/gtk-webcore/midori-0.0.18/desktop.patch	a0c82f13a717852e3c332c268f12e92bad95d9b2
@@ -0,0 +1,7 @@
+--- midori-0.0.18/midori.desktop.in-orig	2008-03-19 14:34:52.000000000 -0700
++++ midori-0.0.18/midori.desktop.in	2008-03-19 14:21:56.000000000 -0700
+@@ -1,4 +1,3 @@
+-
+ [Desktop Entry]
+ Version=1.0
+ Encoding=UTF-8
============================================================
--- packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch	7e3ea2cc037b123abe16e35f47225a936c98b116
+++ packages/ipkg-utils/ipkg-utils/arfile_even_alignment.patch	7e3ea2cc037b123abe16e35f47225a936c98b116
@@ -0,0 +1,11 @@
+--- ipkg-utils/arfile.py.orig	2008-06-11 21:07:01.000000000 -0500
++++ ipkg-utils/arfile.py	2008-06-14 19:56:04.000000000 -0500
+@@ -86,6 +86,8 @@
+                 return FileSection(self.f, self.f.tell(), size)
+ 
+             # Skip data and loop
++            if size % 2:
++                size = size + 1
+             data = self.f.seek(size, 1)
+ #            print hex(f.tell())
+ 
============================================================
--- packages/oprofile/oprofile/armv6_fix.patch	5603ec2069bdcd2a5b0102f5666bf662ea6c9bda
+++ packages/oprofile/oprofile/armv6_fix.patch	5603ec2069bdcd2a5b0102f5666bf662ea6c9bda
@@ -0,0 +1,54 @@
+---
+ events/arm/armv6/events |   43 +++++++++++++++++++++----------------------
+ 1 file changed, 21 insertions(+), 22 deletions(-)
+
+Index: oprofile-0.9.3/events/arm/armv6/events
+===================================================================
+--- oprofile-0.9.3.orig/events/arm/armv6/events	2007-07-16 19:22:17.000000000 +0100
++++ oprofile-0.9.3/events/arm/armv6/events	2007-09-28 11:13:32.000000000 +0100
+@@ -1,24 +1,23 @@
+ # ARM V6 events
+ #
+-event:0x00 counters:1,2 um:zero minimum:500 name:IFU_IFETCH_MISS : number of instruction fetch misses
+-event:0x01 counters:1,2 um:zero minimum:500 name:CYCLES_IFU_MEM_STALL : cycles instruction fetch pipe is stalled
+-event:0x02 counters:1,2 um:zero minimum:500 name:CYCLES_DATA_STALL : cycles stall occurs for due to data dependency
+-event:0x03 counters:1,2 um:zero minimum:500 name:ITLB_MISS : number of Instruction MicroTLB misses
+-event:0x04 counters:1,2 um:zero minimum:500 name:DTLB_MISS : number of Data MicroTLB misses
+-event:0x05 counters:1,2 um:zero minimum:500 name:BR_INST_EXECUTED : branch instruction executed w/ or w/o program flow change
+-event:0x06 counters:1,2 um:zero minimum:500 name:BR_INST_MISS_PRED : branch mispredicted
+-event:0x07 counters:1,2 um:zero minimum:500 name:INSN_EXECUTED : instructions executed
+-event:0x09 counters:1,2 um:zero minimum:500 name:DCACHE_ACCESS : data cache access, cacheable locations
+-event:0x0a counters:1,2 um:zero minimum:500 name:DCACHE_ACCESS_ALL : data cache access, all locations
+-event:0x0b counters:1,2 um:zero minimum:500 name:DCACHE_MISS : data cache miss
+-event:0x0c counters:1,2 um:zero minimum:500 name:DCACHE_WB : data cache writeback, 1 event for every half cacheline
+-event:0x0d counters:1,2 um:zero minimum:500 name:PC_CHANGE : number of times the program counter was changed without a mode switch
+-event:0x0f counters:1,2 um:zero minimum:500 name:TLB_MISS : Main TLB miss
+-event:0x10 counters:1,2 um:zero minimum:500 name:EXP_EXTERNAL : Explict external data access
+-event:0x11 counters:1,2 um:zero minimum:500 name:LSU_STALL : cycles stalled because Load Store request queque is full
+-event:0x12 counters:1,2 um:zero minimum:500 name:WRITE_DRAIN : Times write buffer was drained
+-event:0x20 counters:1,2 um:zero minimum:500 name:ETMEXTOUT0 : nuber of cycles ETMEXTOUT[0] signal was asserted
+-event:0x21 counters:1,2 um:zero minimum:500 name:ETMEXTOUT1 : nuber of cycles ETMEXTOUT[1] signal was asserted
+-event:0x22 counters:1,2 um:zero minimum:500 name:ETMEXTOUT_BOTH : nuber of cycles both ETMEXTOUT [0] and [1] were asserted * 2
+-event:0xff counters:1,2 um:zero minimum:500 name:CPU_CYCLES2 : clock cycles counter
+-event:0xfe counters:0 um:zero minimum:500 name:CPU_CYCLES : clock cycles counter
++event:0x00 counters:0,1 um:zero minimum:500 name:IFU_IFETCH_MISS : number of instruction fetch misses
++event:0x01 counters:0,1 um:zero minimum:500 name:CYCLES_IFU_MEM_STALL : cycles instruction fetch pipe is stalled
++event:0x02 counters:0,1 um:zero minimum:500 name:CYCLES_DATA_STALL : cycles stall occurs for due to data dependency
++event:0x03 counters:0,1 um:zero minimum:500 name:ITLB_MISS : number of Instruction MicroTLB misses
++event:0x04 counters:0,1 um:zero minimum:500 name:DTLB_MISS : number of Data MicroTLB misses
++event:0x05 counters:0,1 um:zero minimum:500 name:BR_INST_EXECUTED : branch instruction executed w/ or w/o program flow change
++event:0x06 counters:0,1 um:zero minimum:500 name:BR_INST_MISS_PRED : branch mispredicted
++event:0x07 counters:0,1 um:zero minimum:500 name:INSN_EXECUTED : instructions executed
++event:0x09 counters:0,1 um:zero minimum:500 name:DCACHE_ACCESS : data cache access, cacheable locations
++event:0x0a counters:0,1 um:zero minimum:500 name:DCACHE_ACCESS_ALL : data cache access, all locations
++event:0x0b counters:0,1 um:zero minimum:500 name:DCACHE_MISS : data cache miss
++event:0x0c counters:0,1 um:zero minimum:500 name:DCACHE_WB : data cache writeback, 1 event for every half cacheline
++event:0x0d counters:0,1 um:zero minimum:500 name:PC_CHANGE : number of times the program counter was changed without a mode switch
++event:0x0f counters:0,1 um:zero minimum:500 name:TLB_MISS : Main TLB miss
++event:0x10 counters:0,1 um:zero minimum:500 name:EXP_EXTERNAL : Explict external data access
++event:0x11 counters:0,1 um:zero minimum:500 name:LSU_STALL : cycles stalled because Load Store request queque is full
++event:0x12 counters:0,1 um:zero minimum:500 name:WRITE_DRAIN : Times write buffer was drained
++event:0x20 counters:0,1 um:zero minimum:500 name:ETMEXTOUT0 : nuber of cycles ETMEXTOUT[0] signal was asserted
++event:0x21 counters:0,1 um:zero minimum:500 name:ETMEXTOUT1 : nuber of cycles ETMEXTOUT[1] signal was asserted
++event:0x22 counters:0,1 um:zero minimum:500 name:ETMEXTOUT_BOTH : nuber of cycles both ETMEXTOUT [0] and [1] were asserted * 2
++event:0xff counters:0,1,2 um:zero minimum:500 name:CPU_CYCLES : clock cycles counter
============================================================
--- packages/oprofile/oprofile/fix-arith.patch	94c018206eb1555fb068cb5bb10fa0df596bd167
+++ packages/oprofile/oprofile/fix-arith.patch	94c018206eb1555fb068cb5bb10fa0df596bd167
@@ -0,0 +1,52 @@
+Index: utils/opcontrol
+===================================================================
+RCS file: /cvsroot/oprofile/oprofile/utils/opcontrol,v
+retrieving revision 1.148
+diff -u -r1.148 opcontrol
+--- utils/opcontrol	8 Nov 2007 09:24:30 -0000	1.148
++++ utils/opcontrol	27 Nov 2007 17:02:20 -0000
+@@ -395,7 +395,7 @@
+ 	echo "SESSION_DIR=$SESSION_DIR" >>$SETUP_FILE
+ 
+ 	if test "$NR_CHOSEN" != "0"; then
+-		for f in `seq 0 $((NR_CHOSEN - 1))`; do
++		for f in `seq 0 $(($NR_CHOSEN - 1))`; do
+ 			get_event $f
+ 			echo "CHOSEN_EVENTS_${f}=$GOTEVENT" >>$SETUP_FILE
+ 		done
+@@ -590,7 +590,7 @@
+ 	OPHELP_ARGS=
+ 
+ 	if test "$NR_CHOSEN" != 0; then
+-		for f in `seq 0 $((NR_CHOSEN - 1))`; do
++		for f in `seq 0 $(($NR_CHOSEN - 1))`; do
+ 			get_event $f
+ 			if test "$GOTEVENT" != ""; then
+ 				OPHELP_ARGS="$OPHELP_ARGS $GOTEVENT"
+@@ -612,7 +612,7 @@
+ 		return
+ 	fi
+ 
+-	for f in `seq 0 $((NR_CHOSEN - 1))`; do
++	for f in `seq 0 $(($NR_CHOSEN - 1))`; do
+ 		get_event $f
+ 		if test "$GOTEVENT" != ""; then
+ 			EVENT=`echo $GOTEVENT | awk -F: '{print $1}'`
+@@ -1226,7 +1226,7 @@
+ 	verify_counters
+ 
+ 	OPROFILED_EVENTS=
+-	for f in `seq 0 $((NR_CHOSEN - 1))`; do
++	for f in `seq 0 $(($NR_CHOSEN - 1))`; do
+ 		get_event $f
+ 		if test "$GOTEVENT" != ""; then
+ 			EVENT=`echo $GOTEVENT | awk -F: '{print $1}'`
+@@ -1383,7 +1383,7 @@
+ 	fi
+ 
+ 	if test "$NR_CHOSEN" != "0"; then
+-		for f in `seq 0 $((NR_CHOSEN - 1))`; do
++		for f in `seq 0 $(($NR_CHOSEN - 1))`; do
+ 			get_event $f
+ 			echo "Event $f: $GOTEVENT"
+ 		done
============================================================
--- packages/oprofile/oprofile/oparchive_fix.patch	d12a72a44c46f0d9e72d4e907e3cf90ea0894b35
+++ packages/oprofile/oprofile/oparchive_fix.patch	d12a72a44c46f0d9e72d4e907e3cf90ea0894b35
@@ -0,0 +1,22 @@
+Index: oprofile/pp/oparchive.cpp
+===================================================================
+--- oprofile.orig/pp/oparchive.cpp
++++ oprofile/pp/oparchive.cpp
+@@ -95,7 +95,7 @@ int oparchive(options::spec const & spec
+ 		 * to avoid overwriti%s
>>> DIFF TRUNCATED @ 16K


#
# mt diff -r789d64c5f0950113dd422cc0a20a91d15947ad09 -r4e3569a19b8a6f85c3878f45db976a5ef67711f2
#
#
#
# add_file "packages/glib-2.0/glib-2.0-native_2.16.1.bb"
#  content [f19fefa48d990052ffbf58da0fc87cfb88adac17]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [31082540c36a559d8a98fd280d83efab99ea9661]
#    to [dd76fae2197a9207fa2eb5ccd100a425b415f4b4]
# 
# patch "packages/glib-2.0/glib-2.0_2.16.1.bb"
#  from [5be635a5d5196c526c7181cff6b36dcd3a3767f0]
#    to [572e57e8dedd34b4305aba64c763aa3cfd87fd5a]
#
============================================================
--- packages/glib-2.0/glib-2.0-native_2.16.1.bb	f19fefa48d990052ffbf58da0fc87cfb88adac17
+++ packages/glib-2.0/glib-2.0-native_2.16.1.bb	f19fefa48d990052ffbf58da0fc87cfb88adac17
@@ -0,0 +1,30 @@
+require glib-2.0_${PV}.bb
+
+FILESPATH = "${FILE_DIRNAME}/glib-2.0-${PV}:${FILE_DIRNAME}/files"
+DEPENDS = "gtk-doc-native"
+PR = "r0"
+
+inherit native
+
+do_stage () {
+	install -m 0755 gobject/glib-mkenums ${STAGING_BINDIR}/
+	install -m 0755 gobject/.libs/glib-genmarshal ${STAGING_BINDIR}/
+	install -m 0755 glib-gettextize ${STAGING_BINDIR}/
+	oe_libinstall -so -C glib libglib-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gmodule libgmodule-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gthread libgthread-2.0 ${STAGING_LIBDIR}
+	oe_libinstall -so -C gobject libgobject-2.0 ${STAGING_LIBDIR}
+	autotools_stage_includes
+	install -d ${STAGING_INCDIR}/glib-2.0/glib
+	install -m 0755 ${S}/glibconfig.h ${STAGING_INCDIR}/glib-2.0/glibconfig.h
+	install -d ${STAGING_DATADIR}/aclocal
+	install -m 0644 ${S}/m4macros/glib-2.0.m4 ${STAGING_DATADIR}/aclocal/glib-2.0.m4
+	install -m 0644 ${S}/m4macros/glib-gettext.m4 ${STAGING_DATADIR}/aclocal/glib-gettext.m4
+	install -d ${STAGING_DATADIR}/glib-2.0/gettext/po
+	install -m 0755 mkinstalldirs ${STAGING_DATADIR}/glib-2.0/gettext/
+	install -m 0644 po/Makefile.in.in ${STAGING_DATADIR}/glib-2.0/gettext/po/
+}
+
+do_install () {
+	:
+}
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	31082540c36a559d8a98fd280d83efab99ea9661
+++ conf/distro/include/preferred-om-2008-versions.inc	dd76fae2197a9207fa2eb5ccd100a425b415f4b4
@@ -273,7 +273,7 @@ PREFERRED_VERSION_driftnet-nogui ?= "0.1
 PREFERRED_VERSION_dpkg-native ?= "1.13.25"
 PREFERRED_VERSION_driftnet ?= "0.1.6"
 PREFERRED_VERSION_driftnet-nogui ?= "0.1.6"
-PREFERRED_VERSION_dropbear ?= "0.49"
+PREFERRED_VERSION_dropbear ?= "0.51"
 PREFERRED_VERSION_dsniff ?= "2.3"
 PREFERRED_VERSION_duma ?= "2.5.7"
 PREFERRED_VERSION_dvb-image ?= "1.0"
@@ -466,7 +466,7 @@ PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
 PREFERRED_VERSION_glib-1.2 ?= "1.2.10"
 PREFERRED_VERSION_glib-1.2-native ?= "1.2.10"
 PREFERRED_VERSION_glib-2.0 ?= "2.16.1"
-PREFERRED_VERSION_glib-2.0-native ?= "2.12.4"
+PREFERRED_VERSION_glib-2.0-native ?= "2.16.1"
 PREFERRED_VERSION_glibc ?= "2.6.1"
 PREFERRED_VERSION_glibc-initial ?= "2.6.1"
 PREFERRED_VERSION_glibmm ?= "2.12.10"
@@ -477,9 +477,9 @@ PREFERRED_VERSION_gmailfs ?= "0.7.3"
 PREFERRED_VERSION_glrr-widgets ?= "20050529"
 PREFERRED_VERSION_glurp ?= "0.11.3"
 PREFERRED_VERSION_gmailfs ?= "0.7.3"
-PREFERRED_VERSION_gmp ?= "4.2.1"
+PREFERRED_VERSION_gmp ?= "4.2.2"
 PREFERRED_VERSION_gmpc ?= "0.13.0"
-PREFERRED_VERSION_gmp-native ?= "4.2.1"
+PREFERRED_VERSION_gmp-native ?= "4.2.2"
 PREFERRED_VERSION_gnash ?= "0.8.2"
 PREFERRED_VERSION_gnocky ?= "0.0.3"
 PREFERRED_VERSION_gnokii ?= "0.6.14"
@@ -1369,6 +1369,8 @@ PREFERRED_VERSION_openvpn ?= "2.0.9"
 PREFERRED_VERSION_openswan ?= "2.4.7"
 PREFERRED_VERSION_openttd ?= "0.4.0.1"
 PREFERRED_VERSION_openvpn ?= "2.0.9"
+PREFERRED_VERSION_opkg-native ?= "4488"
+PREFERRED_VERSION_opkg ?= "4488"
 PREFERRED_VERSION_oplinux-packages ?= "1.0"
 PREFERRED_VERSION_oprofile ?= "0.9.3"
 PREFERRED_VERSION_orage ?= "4.4.1"
@@ -1880,7 +1882,7 @@ PREFERRED_VERSION_u-boot-utils ?= "1.2.0
 PREFERRED_VERSION_u-boot ?= "1.2.0"
 PREFERRED_VERSION_u-boot-omap2430sdp ?= "1.1.4"
 PREFERRED_VERSION_u-boot-utils ?= "1.2.0"
-PREFERRED_VERSION_udev ?= "118"
+PREFERRED_VERSION_udev ?= "115"
 PREFERRED_VERSION_udev-hostap-cs-vcc-workaround ?= "1.0"
 PREFERRED_VERSION_udhcp ?= "0.9.8"
 PREFERRED_VERSION_ufraw ?= "0.12"
============================================================
--- packages/glib-2.0/glib-2.0_2.16.1.bb	5be635a5d5196c526c7181cff6b36dcd3a3767f0
+++ packages/glib-2.0/glib-2.0_2.16.1.bb	572e57e8dedd34b4305aba64c763aa3cfd87fd5a
@@ -7,4 +7,6 @@ SRC_URI = "http://ftp.gnome.org/pub/GNOM
            file://configure-libtool.patch;patch=1 \
            file://gcc-4.2-inline-fix.patch;patch=1 \
            file://hurd-arg-max.patch;patch=1 \
+"
+S = "${WORKDIR}/glib-${PV}"
+
-          "

More information about the Openembedded-commits mailing list