[oe-commits] org.oe.dev merge of '4d6ee85cc3ba867945ab4763b494533e79d9e0ac'

[koen commit]

merge of '4d6ee85cc3ba867945ab4763b494533e79d9e0ac'
     and '750fe5c3f11c985f4ea63c4d0e6a98d0326f40b7'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: cfef2808f96e98d6ce87cac946a3e835eca914b4
ViewMTN: http://monotone.openembedded.org/revision/info/cfef2808f96e98d6ce87cac946a3e835eca914b4
Files:
1
packages/classpath/classpath-minimal_0.97.2.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -r4d6ee85cc3ba867945ab4763b494533e79d9e0ac -rcfef2808f96e98d6ce87cac946a3e835eca914b4
#
#
#
# patch "packages/classpath/classpath-minimal_0.97.2.bb"
#  from [eeed706438d6b4b51f8ecb1582addd8a6820f098]
#    to [2f6c505ff2139a8cc6f85c6a8cfe7a4114e0b604]
#
============================================================
--- packages/classpath/classpath-minimal_0.97.2.bb	eeed706438d6b4b51f8ecb1582addd8a6820f098
+++ packages/classpath/classpath-minimal_0.97.2.bb	2f6c505ff2139a8cc6f85c6a8cfe7a4114e0b604
@@ -3,6 +3,7 @@ SRC_URI += "\
 SRC_URI += "\
   file://netif_16.patch;patch=1;pnum=0 \
   file://SimpleName.diff;patch=1;pnum=0 \
+  file://javanet-local.patch;patch=1;pnum=0 \
   "
 
 PR = "r0"


#
# mt diff -r750fe5c3f11c985f4ea63c4d0e6a98d0326f40b7 -rcfef2808f96e98d6ce87cac946a3e835eca914b4
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [840f016202d28dd7d52f92202a9c81d4c69a4e4d]
#    to [a9e403c8ad9bd1cce3d2f28c2b7cd0c69e2020c4]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc	840f016202d28dd7d52f92202a9c81d4c69a4e4d
+++ conf/distro/include/sane-srcrevs.inc	a9e403c8ad9bd1cce3d2f28c2b7cd0c69e2020c4
@@ -138,9 +138,9 @@ SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4488"
-SRCREV_pn-opkg-native ?= "4491"
-SRCREV_pn-opkg-sdk ?= "4488"
+SRCREV_pn-opkg ?= "4564"
+SRCREV_pn-opkg-native ?= "4564"
+SRCREV_pn-opkg-sdk ?= "4564"
 SRCREV_pn-opkg-utils ?= "4534"
 SRCREV_pn-opkg-utils-native ?= "4534"
 SRCREV_pn-oprofileui ?= "173"