[oe-commits] org.oe.dev merge of 'ad632a7eb7f054624190b7f4503868e9c174c9b6'

[oe commit]

merge of 'ad632a7eb7f054624190b7f4503868e9c174c9b6'
     and 'ba5f0bfd65d0f4a53bb92b3488758f3be847e612'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 0fd25dfc18f365d3b975a9657dae8f1afebdfbc1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0fd25dfc18f365d3b975a9657dae8f1afebdfbc1
Files:
1
packages/kxml2/kxml2_2.3.0.bb
packages/linux/linux-ml403-mvista-2.6.x_git.bb
packages/linux/linux-ml403-slab-2.6.x_git.bb
packages/wv/wv_1.2.0.bb
Diffs:

#
# mt diff -rad632a7eb7f054624190b7f4503868e9c174c9b6 -r0fd25dfc18f365d3b975a9657dae8f1afebdfbc1
#
# 
# 
# patch "packages/kxml2/kxml2_2.3.0.bb"
#  from [db76cc2ca4973007e1315b82c614a2cd4f9e6fae]
#    to [7c4ff792800980cb83dfb9edf16c2672f5940354]
# 
# patch "packages/linux/linux-ml403-mvista-2.6.x_git.bb"
#  from [0b85356181b86aff883e8c239db19375dceb5900]
#    to [607a3ec1212c49a8bec07ab6a9220e1868f31e6d]
# 
# patch "packages/linux/linux-ml403-slab-2.6.x_git.bb"
#  from [efd1223458f6c9ab6ac8ddba666e5e4b0d3a14ac]
#    to [dc32409e752ed5db7c5885ac404c458875c5cb87]
# 
============================================================
--- packages/kxml2/kxml2_2.3.0.bb	db76cc2ca4973007e1315b82c614a2cd4f9e6fae
+++ packages/kxml2/kxml2_2.3.0.bb	7c4ff792800980cb83dfb9edf16c2672f5940354
@@ -1,13 +1,15 @@ PR = "r0"
 DESCRIPTION = "kxml2 is a small XML pull parser"
 HOMEPAGE = "http://kxml.sourceforge.net/"
 LICENSE  = "BSD"
 PRIORITY = "optional"
 PR = "r0"
 
-SRC_URI = "http://downloads.sourceforge.net/kxml/kxml2-2.3.0.jar"
 
 JAR = ${PN}-${PV}.jar
 
+SRC_URI = "http://downloads.sourceforge.net/kxml/${JAR}"
+
+
 do_unpack() {
 	:
 }
============================================================
--- packages/linux/linux-ml403-mvista-2.6.x_git.bb	0b85356181b86aff883e8c239db19375dceb5900
+++ packages/linux/linux-ml403-mvista-2.6.x_git.bb	607a3ec1212c49a8bec07ab6a9220e1868f31e6d
@@ -1,10 +1,10 @@ LICENSE = "GPL"
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
 LICENSE = "GPL"
-#DEPENDS = "u-boot"
-PR = "r0"
+DEPENDS = "git-native"
+PR = "r1"
 DEFAULT_PREFERENCE = "-1"
 COMPATIBLE_MACHINE = "xilinx-ml403"
 SRC_URI = "git://source.mvista.com/git/linux-xilinx-26;protocol=git \
============================================================
--- packages/linux/linux-ml403-slab-2.6.x_git.bb	efd1223458f6c9ab6ac8ddba666e5e4b0d3a14ac
+++ packages/linux/linux-ml403-slab-2.6.x_git.bb	dc32409e752ed5db7c5885ac404c458875c5cb87
@@ -1,11 +1,11 @@ LICENSE = "GPL"
 #Kernel for the xilinx-ml403 board using SecretLabs git tree
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 SECTION = "kernel"
 DESCRIPTION = "Linux kernel for Xilinx ML403 Virtex 4 fpga board"
 LICENSE = "GPL"
-#DEPENDS = "u-boot"
-PR = "r0"
+DEPENDS = "git-native"
+PR = "r1"
 PV = "2.6+git${SRCDATE}"
 
 COMPATIBLE_MACHINE = "xilinx-ml403"


#
# mt diff -rba5f0bfd65d0f4a53bb92b3488758f3be847e612 -r0fd25dfc18f365d3b975a9657dae8f1afebdfbc1
#
# 
# 
# patch "packages/wv/wv_1.2.0.bb"
#  from [4041946dc0833b27cf6bc2b0e91ac6b51e3fe3f4]
#    to [d5cae2d72683d8d4c698822ec4699cba938841f2]
# 
============================================================
--- packages/wv/wv_1.2.0.bb	4041946dc0833b27cf6bc2b0e91ac6b51e3fe3f4
+++ packages/wv/wv_1.2.0.bb	d5cae2d72683d8d4c698822ec4699cba938841f2
@@ -1,5 +1,7 @@ LICENSE = "GPLv2"
 LICENSE = "GPLv2"
 
+DEPENDS = "libgsf"
+
 SRC_URI = "http://switch.dl.sourceforge.net/sourceforge/wvware/wv-${PV}.tar.gz"
 
 S = "${WORKDIR}/${PN}-${PV}"