[oe-commits] org.oe.dev merge of '18a264d6f6c878ae9877038ba82d3bbddafaab18'

[woglinde2 commit]

merge of '18a264d6f6c878ae9877038ba82d3bbddafaab18'
     and '366af8b1769c4db47736532d047cb4d4dc1ce9dc'

Author: woglinde2 at openembedded.org
Branch: org.openembedded.dev
Revision: a17632d8a39c63473b3ac6485b20959def5f3422
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a17632d8a39c63473b3ac6485b20959def5f3422
Files:
1
packages/kxml2/kxml2_2.3.0.bb
packages/linux/linux-2.6.21/gumstix/defconfig
packages/linux/linux_2.6.21.bb
Diffs:

#
# mt diff -r18a264d6f6c878ae9877038ba82d3bbddafaab18 -ra17632d8a39c63473b3ac6485b20959def5f3422
#
# 
# 
# patch "packages/kxml2/kxml2_2.3.0.bb"
#  from [db76cc2ca4973007e1315b82c614a2cd4f9e6fae]
#    to [7c4ff792800980cb83dfb9edf16c2672f5940354]
# 
============================================================
--- 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() {
 	:
 }


#
# mt diff -r366af8b1769c4db47736532d047cb4d4dc1ce9dc -ra17632d8a39c63473b3ac6485b20959def5f3422
#
# 
# 
# patch "packages/linux/linux-2.6.21/gumstix/defconfig"
#  from [4172539dc7818fd5645dddbdff3076dbbbda0593]
#    to [7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7]
# 
# patch "packages/linux/linux_2.6.21.bb"
#  from [654f207ad59b9947a0628500c0ca4779600942c7]
#    to [ba51fa252ec8e5f423145d8b34259d0a8a42c124]
# 
============================================================
--- packages/linux/linux-2.6.21/gumstix/defconfig	4172539dc7818fd5645dddbdff3076dbbbda0593
+++ packages/linux/linux-2.6.21/gumstix/defconfig	7d5c57d58c405ba8cc4468aba4ebf28e41c1dec7
@@ -34,7 +34,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 #
 # General setup
 #
-CONFIG_LOCALVERSION="gum"
+CONFIG_LOCALVERSION=""
 CONFIG_LOCALVERSION_AUTO=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
============================================================
--- packages/linux/linux_2.6.21.bb	654f207ad59b9947a0628500c0ca4779600942c7
+++ packages/linux/linux_2.6.21.bb	ba51fa252ec8e5f423145d8b34259d0a8a42c124
@@ -1,9 +1,9 @@ DEFAULT_PREFERENCE_gumstix = "1"
 require linux.inc
 
 DEFAULT_PREFERENCE_at91sam9263ek = "-1"
 DEFAULT_PREFERENCE_gumstix = "1"
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            file://defconfig \