[oe-commits] org.oe.dev merge of '343be32549619f9cdde460a045b0592d3af6ddb0'

[oe commit]

merge of '343be32549619f9cdde460a045b0592d3af6ddb0'
     and '486b98349c864712c681885da1a19351dd230534'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: f190bd98405258a8e3c41c78328042de0c263fdb
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f190bd98405258a8e3c41c78328042de0c263fdb
Files:
1
conf/machine/gumstix.conf
packages/linux/linux.inc
packages/classpath/classpath-minimal.inc
packages/kxml2
packages/kxml2/kxml2_2.3.0.bb
packages/classpath/classpath-minimal-native_0.95.bb
packages/classpath/classpath-minimal_0.95.bb
Diffs:

#
# mt diff -r343be32549619f9cdde460a045b0592d3af6ddb0 -rf190bd98405258a8e3c41c78328042de0c263fdb
#
# 
# 
# patch "conf/machine/gumstix.conf"
#  from [75e55dd0434ef7022374d2e79bd4a46db49d7c21]
#    to [a650e6c9c2788b0d9289abdda0b9ed9e3e8ded38]
# 
# patch "packages/linux/linux.inc"
#  from [d128bae3ce7c9dfd5aade6bc00dd94b38ec21b93]
#    to [0d2a0276e1a47797b28ef11fe32b25b254898aa2]
# 
============================================================
--- conf/machine/gumstix.conf	75e55dd0434ef7022374d2e79bd4a46db49d7c21
+++ conf/machine/gumstix.conf	a650e6c9c2788b0d9289abdda0b9ed9e3e8ded38
@@ -15,6 +15,8 @@ OLDEST_KERNEL = "2.6.15"
 
 OLDEST_KERNEL = "2.6.15"
 
+UBOOT_ENTRYPOINT = "a0008000"
+
 #Assume people have some gumstix extension boards 
 MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget bluetooth"
 
============================================================
--- packages/linux/linux.inc	d128bae3ce7c9dfd5aade6bc00dd94b38ec21b93
+++ packages/linux/linux.inc	0d2a0276e1a47797b28ef11fe32b25b254898aa2
@@ -59,6 +59,8 @@ do_install_prepend() {
         fi
 }
 
+UBOOT_ENTRYPOINT ?= "20008000"
+
 do_deploy() {
         install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
@@ -68,7 +70,7 @@ do_deploy() {
             ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
             rm -f linux.bin.gz
             gzip -9 linux.bin
-            uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a 20008000 -e 20008000 -n "${DISTRO_NAME} Kernel for ${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+            uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME} Kernel for ${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
             rm -f linux.bin.gz
         fi
 }


#
# mt diff -r486b98349c864712c681885da1a19351dd230534 -rf190bd98405258a8e3c41c78328042de0c263fdb
#
# 
# 
# delete "packages/classpath/classpath-minimal.inc"
# 
# add_dir "packages/kxml2"
# 
# add_file "packages/kxml2/kxml2_2.3.0.bb"
#  content [db76cc2ca4973007e1315b82c614a2cd4f9e6fae]
# 
# patch "packages/classpath/classpath-minimal-native_0.95.bb"
#  from [a3710719a4819aacb9839dd5aaa9a92b703a74f6]
#    to [c2f37c60e37490ac94dd3774919d805ede5de1be]
# 
# patch "packages/classpath/classpath-minimal_0.95.bb"
#  from [1e37a31c37529a51633ba1087ed6429090784b95]
#    to [85a438ea63e8e5790dca42e27ef3b9318d4dee3f]
# 
============================================================
--- packages/kxml2/kxml2_2.3.0.bb	db76cc2ca4973007e1315b82c614a2cd4f9e6fae
+++ packages/kxml2/kxml2_2.3.0.bb	db76cc2ca4973007e1315b82c614a2cd4f9e6fae
@@ -0,0 +1,31 @@
+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
+
+do_unpack() {
+	:
+}
+
+do_install() {
+
+install -d ${D}${datadir}/java
+install -m 0644 ${DL_DIR}/${JAR} ${D}${datadir}/java
+
+}
+
+do_stage() {
+
+install -d ${STAGING_DATADIR}/java
+install -m 0644 ${DL_DIR}/${JAR} ${STAGING_DATADIR}/java
+
+}
+
+PACKAGES = "${PN}"
+
+FILES_${PN} = "${datadir}/java/${JAR}"
============================================================
--- packages/classpath/classpath-minimal-native_0.95.bb	a3710719a4819aacb9839dd5aaa9a92b703a74f6
+++ packages/classpath/classpath-minimal-native_0.95.bb	c2f37c60e37490ac94dd3774919d805ede5de1be
@@ -1,8 +1,7 @@ inherit native
 
 # classpath-minimal-native has no packages
 # primary goal is to speed up building of java virtual machines
 
 inherit native
+require classpath-minimal_${PV}.bb
+PR = "r0"
-
-require classpath-minimal.inc
-
============================================================
--- packages/classpath/classpath-minimal_0.95.bb	1e37a31c37529a51633ba1087ed6429090784b95
+++ packages/classpath/classpath-minimal_0.95.bb	85a438ea63e8e5790dca42e27ef3b9318d4dee3f
@@ -1,5 +1,39 @@
+DESCRIPTION = "GNU Classpath standard Java libraries"
+HOMEPAGE = "http://www.gnu.org/software/classpath/"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "Classpath"
+PROVIDES = "classpath"
+RPROVIDES = "classpath"
 
-# classpath-minimal-native has no packages
-# primary goal is to speed up building of java virtual machines
+S = "${WORKDIR}/classpath-${PV}"
 
+SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
+
+DEPENDS = "ecj-native zip-native"
+
+inherit autotools
+
+
+EXTRA_OECONF = "--with-glibj \
+                --with-ecj=${STAGING_BINDIR_NATIVE}/ecj \
+                --disable-alsa \
+                --disable-gconf-peer \
+                --disable-gtk-peer \
+                --disable-plugin \
+                --disable-dssi \
+                --disable-examples \
+               "
+do_install() {
+        :
+}
+
+do_stage() {
+        install -d ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni.h ${STAGING_INCDIR}/classpath-minimal/
+        install -m 0644 include/jni_md.h ${STAGING_INCDIR}/classpath-minimal/
+        install -d ${STAGING_DATADIR}/java/classpath-minimal/
+        install -m 0644 lib/glibj.zip ${STAGING_DATADIR}/java/classpath-minimal/
+}
+
+PACKAGES = " "
-require classpath-minimal.inc