[oe-commits] org.oe.dev merge of '0a9f655b4113fe8e3bfe6ae45053cebe0c2a0ee8'

[oe commit]

merge of '0a9f655b4113fe8e3bfe6ae45053cebe0c2a0ee8'
     and 'abaaa429d4020daefbea346a2ce406cbeb6def5e'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: a76dd1b5376db647307f8c3546330d838727e546
ViewMTN: http://monotone.openembedded.org/revision/info/a76dd1b5376db647307f8c3546330d838727e546
Files:
1
packages/glibc/eglibc-svn/export-fcntl2.patch
packages/glibc/eglibc_svn.bb
conf/distro/include/insane-srcrevs.inc
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
packages/openocd/openocd_svn.bb
Diffs:

#
# mt diff -r0a9f655b4113fe8e3bfe6ae45053cebe0c2a0ee8 -ra76dd1b5376db647307f8c3546330d838727e546
#
# 
# 
# delete "packages/glibc/eglibc-svn/export-fcntl2.patch"
# 
# patch "packages/glibc/eglibc_svn.bb"
#  from [d271198997ba4fa58ec16de91362b22a79f8d84f]
#    to [bb25ed1e0fdfd432e265209f03dfaf36f79bdf1b]
# 
============================================================
--- packages/glibc/eglibc_svn.bb	d271198997ba4fa58ec16de91362b22a79f8d84f
+++ packages/glibc/eglibc_svn.bb	bb25ed1e0fdfd432e265209f03dfaf36f79bdf1b
@@ -5,7 +5,6 @@ SRC_URI = "svn://svn.eglibc.org;module=t
 PV = "2.6+svnr${SRCREV}"
 PR = "r1"
 SRC_URI = "svn://svn.eglibc.org;module=trunk \
-           file://export-fcntl2.patch;patch=1 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 S = "${WORKDIR}/trunk/libc"


#
# mt diff -rabaaa429d4020daefbea346a2ce406cbeb6def5e -ra76dd1b5376db647307f8c3546330d838727e546
#
# 
# 
# patch "conf/distro/include/insane-srcrevs.inc"
#  from [63ea6dbb957d94e0f729963a34f021d69c8a2f5a]
#    to [77f0eea1a733be785bb5acfaed64815e5f62f68a]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [5709f08bc2fb571ee70795901ea2c48568d7653a]
#    to [7ab3e4a626dd86961455dfee876c957f998cfb14]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [01cdd7f15c21314dbd3bcdaf1fe669cb962d28ab]
#    to [8ef0eddf4e37302d33c521544534be5bf1b59e24]
# 
# patch "packages/openocd/openocd_svn.bb"
#  from [a0cc3e78ddf617567092bc819022548cfb0fd186]
#    to [ff4b08ed923a74c3efa4730980288907a11baeb7]
# 
============================================================
--- conf/distro/include/insane-srcrevs.inc	63ea6dbb957d94e0f729963a34f021d69c8a2f5a
+++ conf/distro/include/insane-srcrevs.inc	77f0eea1a733be785bb5acfaed64815e5f62f68a
@@ -70,6 +70,8 @@ SRCREV_pn-openmoko-today2-folders ?= "${
 SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openocd ?= "${AUTOREV}"
+SRCREV_pn-openocd-native ?= "${AUTOREV}"
 SRCREV_pn-psplash ?= "${AUTOREV}"
 SRCREV_pn-settings-daemon ?= "${AUTOREV}"
 SRCREV_pn-sjf2410-linux-native ?= "${AUTOREV}"
============================================================
--- conf/distro/include/moko-autorev.inc	5709f08bc2fb571ee70795901ea2c48568d7653a
+++ conf/distro/include/moko-autorev.inc	7ab3e4a626dd86961455dfee876c957f998cfb14
@@ -49,3 +49,5 @@ SRCREV_pn-openmoko-today2-folders ?= "${
 SRCREV_pn-openmoko-today ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-today2-folders ?= "${AUTOREV}"
+SRCREV_pn-openocd ?= "${AUTOREV}"
+SRCREV_pn-openocd-native ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	01cdd7f15c21314dbd3bcdaf1fe669cb962d28ab
+++ conf/distro/include/sane-srcrevs.inc	8ef0eddf4e37302d33c521544534be5bf1b59e24
@@ -80,6 +80,8 @@ SRCREV_pn-openmoko-today2-folders ?= "26
 SRCREV_pn-openmoko-today ?= "2556"
 SRCREV_pn-openmoko-today2 ?= "2955"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
+SRCREV_pn-openocd ?= "206"
+SRCREV_pn-openocd-native ?= "206"
 SRCREV_pn-psplash ?= "249"
 SRCREV_pn-settings-daemon ?= "1615"
 SRCREV_pn-sjf2410-linux-native ?= "933"
============================================================
--- packages/openocd/openocd_svn.bb	a0cc3e78ddf617567092bc819022548cfb0fd186
+++ packages/openocd/openocd_svn.bb	ff4b08ed923a74c3efa4730980288907a11baeb7
@@ -1,7 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing"
 HOMEPAGE = "http://openocd.berlios.de/"
 LICENSE = "GPL"
-PV = "0.0+svn${SRCDATE}"
+PV = "0.0+r${SRCREV}"
+PR = "r1"
 
 inherit autotools