[oe-commits] org.oe.dev merge of '21a4d6e9a83528919c5fa1100510fac988f3fb20'
mickeyl commit
openembedded-commits at lists.openembedded.org
Tue Mar 4 22:35:12 UTC 2008
merge of '21a4d6e9a83528919c5fa1100510fac988f3fb20'
and '36ae94ae884a55393124760a3d8811541c62e82d'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 9851fa79590de88ec26cd9fb793c162054603016
ViewMTN: http://monotone.openembedded.org/revision/info/9851fa79590de88ec26cd9fb793c162054603016
Files:
1
packages/freesmartphone/pylgrim_svn.bb
conf/distro/include/sane-srcrevs.inc
packages/freesmartphone/enter_0.0.2.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/linux/linux/simpad/defconfig
packages/linux/linux-2.6.21/simpad/defconfig
packages/linux/linux-2.6.21/simpad
packages/woodstox
packages/classpath/files/xmlstream-fix.patch
packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff
packages/woodstox/woodstox2_2.0.6.bb
MAINTAINERS
conf/distro/include/angstrom-glibc.inc
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath-minimal_0.97.bb
packages/classpath/classpath-native_0.96.1.bb
packages/classpath/classpath.inc
packages/classpath/classpath_0.95.bb
packages/classpath/classpath_0.96.1.bb
packages/classpath/classpath_0.97.bb
packages/glibc/glibc_2.7.bb
Diffs:
#
# mt diff -r21a4d6e9a83528919c5fa1100510fac988f3fb20 -r9851fa79590de88ec26cd9fb793c162054603016
#
#
#
# add_file "packages/freesmartphone/pylgrim_svn.bb"
# content [8651ee9d9e38d0b67037e79502753b80bccdf538]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [c93d95925b43f437e02f491ade77d7eea716610f]
# to [9672ca64d633aa0e5cbf26a1e1080ffa11590147]
#
# patch "packages/freesmartphone/enter_0.0.2.bb"
# from [046cc1b2280bca6d06a2423b1f4c5cc5634a9430]
# to [d7e6c14bceebb3f0057b73deb937cee4cf109a50]
#
# patch "packages/freesmartphone/gsm0710muxd_svn.bb"
# from [9de94e01f72c26b0334ecababeb69b4ae287645e]
# to [c35675feeab41300a896a61eea7ae16bcb3b4c81]
#
============================================================
--- packages/freesmartphone/pylgrim_svn.bb 8651ee9d9e38d0b67037e79502753b80bccdf538
+++ packages/freesmartphone/pylgrim_svn.bb 8651ee9d9e38d0b67037e79502753b80bccdf538
@@ -0,0 +1,24 @@
+DESCRIPTION = "A GPS moving map application featuring OpenStreetMap tiles"
+HOMEPAGE = "http://neo1973-germany.de/wiki/pylgrim"
+AUTHOR = "Josch"
+LICENSE = "GPL"
+SECTION = "x11/navigation"
+DEPENDS = "edje-native"
+RDEPENDS = "task-python-efl python-textutils"
+PV = "0.0+svn${SRCREV}"
+
+SRC_URI = "svn://neo1973-germany.de/svn;module=pylgrim;proto=http"
+S = "${WORKDIR}/pylgrim"
+
+do_compile() {
+ edje_cc pylgrim.edc
+}
+
+do_install() {
+ install -d ${D}${datadir}/pylgrim
+ for i in *.py pylgrim.edj; do
+ install -m 0755 $i ${D}${datadir}/pylgrim/
+ done
+}
+
+FILES_${PN} += "${datadir}"
============================================================
--- conf/distro/include/sane-srcrevs.inc c93d95925b43f437e02f491ade77d7eea716610f
+++ conf/distro/include/sane-srcrevs.inc 9672ca64d633aa0e5cbf26a1e1080ffa11590147
@@ -31,7 +31,7 @@ SRCREV_pn-gpe-contacts ?= "9312"
SRCREV_pn-gconf-dbus ?= "641"
SRCREV_pn-gnuradio ?= "6377"
SRCREV_pn-gpe-contacts ?= "9312"
-SRCREV_pn-gsm0710muxd ?= "85"
+SRCREV_pn-gsm0710muxd ?= "90"
SRCREV_pn-gtkhtml2 ?= "1158"
SRCREV_pn-gypsy ?= "56"
SRCREV_pn-hildon-1 ?= "14429"
@@ -136,6 +136,7 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-opkg-native ?= "4142"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
+SRCREV_pn-pylgrim ?= "20"
SRCREV_pn-pyneod ?= "88"
SRCREV_pn-pyneog ?= "88"
SRCREV_pn-python-formencode = "3148"
============================================================
--- packages/freesmartphone/enter_0.0.2.bb 046cc1b2280bca6d06a2423b1f4c5cc5634a9430
+++ packages/freesmartphone/enter_0.0.2.bb d7e6c14bceebb3f0057b73deb937cee4cf109a50
@@ -1,4 +1,4 @@
-DESCRIPTION="A easy-to-use virtual keyboard for small touchscreen displays"
+DESCRIPTION = "An easy-to-use virtual keyboard for small touchscreen displays"
SECTION = "openmoko/inputmethods"
DEPENDS = "ecore evas edje"
PR = "r0"
============================================================
--- packages/freesmartphone/gsm0710muxd_svn.bb 9de94e01f72c26b0334ecababeb69b4ae287645e
+++ packages/freesmartphone/gsm0710muxd_svn.bb c35675feeab41300a896a61eea7ae16bcb3b4c81
@@ -1,13 +1,13 @@ SECTION = "console/network"
DESCRIPTION = "gsm 07.10 muxer userspace daemon"
HOMEPAGE = "http://www.freesmartphone.org"
AUTHOR = "M. Dietrich"
SECTION = "console/network"
-DEPENDS = "intltool-native dbus"
+DEPENDS = "intltool-native dbus dbus-glib"
RCONFLICTS = "gsmd"
RREPLACES = "gsmd"
LICENSE = "GPL"
PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=gsm0710muxd"
S = "${WORKDIR}/gsm0710muxd"
#
# mt diff -r36ae94ae884a55393124760a3d8811541c62e82d -r9851fa79590de88ec26cd9fb793c162054603016
#
#
#
# rename "packages/linux/linux/simpad/defconfig"
# to "packages/linux/linux-2.6.21/simpad/defconfig"
#
# add_dir "packages/linux/linux-2.6.21/simpad"
#
# add_dir "packages/woodstox"
#
# add_file "packages/classpath/files/xmlstream-fix.patch"
# content [4bf1d735126a491acd71312c04fe6b42e481ef75]
#
# add_file "packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff"
# content [31d7f56b8985a58265f54186c3dd4df209af734e]
#
# add_file "packages/woodstox/woodstox2_2.0.6.bb"
# content [a04603c745197f060f20adea3fe3cf9ffc624457]
#
# patch "MAINTAINERS"
# from [262b69f65fcf6efe10999757e3d8c513ed320113]
# to [c32136e1e82e1d64bf728f17c755ecc0abf13eb2]
#
# patch "conf/distro/include/angstrom-glibc.inc"
# from [5298d319ab0e8646c489c50e6e754391aa2f16d7]
# to [b655e2595b0beb2adddbf6f2e4f114b047128d2a]
#
# patch "packages/classpath/classpath-minimal_0.96.1.bb"
# from [dc3a72abbdd2e121e00c6ea3aeaf5434f164c02f]
# to [02423279a40cc9c5bde83b965533ab39526ab11a]
#
# patch "packages/classpath/classpath-minimal_0.97.bb"
# from [1dbca8bbd4be527feefdde7d7fd2126af6490e7b]
# to [7d2f5a5a665b8437435d4e674b51c8f2b442bd48]
#
# patch "packages/classpath/classpath-native_0.96.1.bb"
# from [8b956ee477f32cf28c75a7cd39e9e85373378164]
# to [de2308a46658542392eb7d94031a5a997a9dd987]
#
# patch "packages/classpath/classpath.inc"
# from [b992c2ac2ea9164632c7cc97aadc93694ae7d6db]
# to [38c3e19b11832c4ee048c930972f95afbc256c0c]
#
# patch "packages/classpath/classpath_0.95.bb"
# from [d2f820a6ce35613717c16b3612ca071f4d918e83]
# to [e7719be862652c7d80851c9e91f373cdcca5b3fb]
#
# patch "packages/classpath/classpath_0.96.1.bb"
# from [214aa050c2a1948b4e32c88821cce2b89be5f74b]
# to [33e806e4b65b649a2b4005bd15cb10f3d86c7df7]
#
# patch "packages/classpath/classpath_0.97.bb"
# from [db8b170f0f6f53145caf1d439efa49971f8c4475]
# to [e43aa91f755d291041b31336edce4b31751bdff0]
#
# patch "packages/glibc/glibc_2.7.bb"
# from [103ab2ecbe46e58a2574221a6ab35e0d7b843e62]
# to [f62da4b0450f5fe51216328cf863ed074424defd]
#
============================================================
--- packages/classpath/files/xmlstream-fix.patch 4bf1d735126a491acd71312c04fe6b42e481ef75
+++ packages/classpath/files/xmlstream-fix.patch 4bf1d735126a491acd71312c04fe6b42e481ef75
@@ -0,0 +1,93 @@
+Index: gnu/xml/stream/AttributeImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/AttributeImpl.java,v
+retrieving revision 1.1
+diff -u -r1.1 AttributeImpl.java
+--- gnu/xml/stream/AttributeImpl.java 4 Sep 2005 09:52:10 -0000 1.1
++++ gnu/xml/stream/AttributeImpl.java 4 Mar 2008 16:02:43 -0000
+@@ -56,11 +56,11 @@
+
+ protected final QName name;
+ protected final String value;
+- protected final QName type;
++ protected final String type;
+ protected final boolean specified;
+
+ protected AttributeImpl(Location location,
+- QName name, String value, QName type,
++ QName name, String value, String type,
+ boolean specified)
+ {
+ super(location);
+@@ -85,7 +85,7 @@
+ return value;
+ }
+
+- public QName getDTDType()
++ public String getDTDType()
+ {
+ return type;
+ }
+Index: gnu/xml/stream/XMLEventAllocatorImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventAllocatorImpl.java,v
+retrieving revision 1.3
+diff -u -r1.3 XMLEventAllocatorImpl.java
+--- gnu/xml/stream/XMLEventAllocatorImpl.java 3 Mar 2006 12:30:59 -0000 1.3
++++ gnu/xml/stream/XMLEventAllocatorImpl.java 4 Mar 2008 16:02:44 -0000
+@@ -165,7 +165,7 @@
+ attributes.add(new AttributeImpl(location,
+ reader.getAttributeName(i),
+ reader.getAttributeValue(i),
+- QName.valueOf(reader.getAttributeType(i)),
++ reader.getAttributeType(i),
+ reader.isAttributeSpecified(i)));
+ return new StartElementImpl(location,
+ reader.getName(),
+Index: gnu/xml/stream/XMLEventFactoryImpl.java
+===================================================================
+RCS file: /sources/classpath/classpath/gnu/xml/stream/XMLEventFactoryImpl.java,v
+retrieving revision 1.2
+diff -u -r1.2 XMLEventFactoryImpl.java
+--- gnu/xml/stream/XMLEventFactoryImpl.java 3 Mar 2006 12:30:59 -0000 1.2
++++ gnu/xml/stream/XMLEventFactoryImpl.java 4 Mar 2008 16:02:44 -0000
+@@ -79,20 +79,20 @@
+ {
+ return new AttributeImpl(location,
+ new QName(namespaceURI, localName, prefix),
+- value, QName.valueOf("CDATA"), true);
++ value, "CDATA", true);
+ }
+
+ public Attribute createAttribute(String localName, String value)
+ {
+ return new AttributeImpl(location,
+ new QName(localName),
+- value, QName.valueOf("CDATA"), true);
++ value, "CDATA", true);
+ }
+
+ public Attribute createAttribute(QName name, String value)
+ {
+ return new AttributeImpl(location, name, value,
+- QName.valueOf("CDATA"), true);
++ "CDATA", true);
+ }
+
+ public Namespace createNamespace(String namespaceURI)
+Index: javax/xml/stream/events/Attribute.java
+===================================================================
+RCS file: /sources/classpath/classpath/javax/xml/stream/events/Attribute.java,v
+retrieving revision 1.2
+diff -u -r1.2 Attribute.java
+--- javax/xml/stream/events/Attribute.java 4 Sep 2005 09:44:30 -0000 1.2
++++ javax/xml/stream/events/Attribute.java 4 Mar 2008 16:02:48 -0000
+@@ -59,7 +59,7 @@
+ /**
+ * Returns the type of this attribute.
+ */
+- QName getDTDType();
++ String getDTDType();
+
+ /**
+ * Indicates whether this attribute was specified in the input source, or
============================================================
--- packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff 31d7f56b8985a58265f54186c3dd4df209af734e
+++ packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff 31d7f56b8985a58265f54186c3dd4df209af734e
@@ -0,0 +1,13 @@
+Arm needs a similar fix as http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+
+--- /tmp/stdio-lock.h 2008-03-04 18:51:15.555038993 +0100
++++ glibc-2.7/ports/sysdeps/unix/sysv/linux/arm/bits/stdio-lock.h 2008-03-04 18:51:28.445035052 +0100
+@@ -50,6 +50,8 @@
+ _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \
+ _IO_flockfile (_fp)
+
++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
++
+ # define _IO_release_lock(_fp) \
+ _IO_funlockfile (_fp); \
+ _IO_cleanup_region_end (0)
============================================================
--- packages/woodstox/woodstox2_2.0.6.bb a04603c745197f060f20adea3fe3cf9ffc624457
+++ packages/woodstox/woodstox2_2.0.6.bb a04603c745197f060f20adea3fe3cf9ffc624457
@@ -0,0 +1,25 @@
+DESCRIPTION = "High-performance XML processor."
+LICENSE = "AL2.0 LGPL2.1"
+
+AUTHOR = "Codehaus"
+HOMEPAGE = "http://woodstox.codehaus.org"
+
+SRC_URI = "http://woodstox.codehaus.org/2.0.6/wstx-src.tar.gz"
+
+S = "${WORKDIR}"
+
+inherit java-library
+
+DEPENDS = "fastjar-native"
+
+do_compile() {
+ mkdir -p build/META-INF/services
+
+ javac -nowarn -sourcepath src/java -d build \
+ `find src/java/org -name "*.java"` \
+ `find src/java/com -name "*.java"`
+
+ cp -r src/resources/* build/META-INF/services
+
+ fastjar -C build -c -f ${JARFILENAME} .
+}
============================================================
--- MAINTAINERS 262b69f65fcf6efe10999757e3d8c513ed320113
+++ MAINTAINERS c32136e1e82e1d64bf728f17c755ecc0abf13eb2
@@ -273,8 +273,8 @@ Recipes: swt-gtk, rxtx, dbus-java, li
Recipes: jikes-native, jikes-initial, ecj-initial, ecj-bootstrap-native
Recipes: classpath*, cacao*, jamvm*
Recipes: swt-gtk, rxtx, dbus-java, libmatthew, kxml2, xmlpull
+Recipes: woodstox2
Recipes: midpath*, logic-analyze
Recipes: kobodeluxe
Recipes: hildon-thumbnail, libhildon*, libosso*, mce-dev, libconic
Recipes: libgpsbt, libgpsmgr, osso-gnome-vfs2, osso-gwconnect, osso-ic-oss
-
============================================================
--- conf/distro/include/angstrom-glibc.inc 5298d319ab0e8646c489c50e6e754391aa2f16d7
+++ conf/distro/include/angstrom-glibc.inc b655e2595b0beb2adddbf6f2e4f114b047128d2a
@@ -14,10 +14,15 @@ FULL_OPTIMIZATION_pn-perl = "-fexpensive
FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
+FULL_OPTIMIZATION_pn-glibc-intermediate = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+FULL_OPTIMIZATION_pn-glibc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
BUILD_OPTIMIZATION = "-Os"
BUILD_OPTIMIZATION_pn-perl = "-O1"
+BUILD_OPTIMIZATION_pn-glibc-intermediate = "-O2"
+BUILD_OPTIMIZATION_pn-glibc = "-O2"
BUILD_OPTIMIZATION_sparc = "-O2"
CXXFLAGS += "-fvisibility-inlines-hidden"
============================================================
--- packages/classpath/classpath-minimal_0.96.1.bb dc3a72abbdd2e121e00c6ea3aeaf5434f164c02f
+++ packages/classpath/classpath-minimal_0.96.1.bb 02423279a40cc9c5bde83b965533ab39526ab11a
@@ -1,8 +1,11 @@ require classpath.inc
require classpath.inc
-PR = "r5"
+PR = "r6"
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+ file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
PROVIDES = "${PN} classpath"
@@ -15,3 +18,5 @@ EXTRA_OECONF += "\
--disable-dssi \
--disable-examples \
"
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
============================================================
--- packages/classpath/classpath-minimal_0.97.bb 1dbca8bbd4be527feefdde7d7fd2126af6490e7b
+++ packages/classpath/classpath-minimal_0.97.bb 7d2f5a5a665b8437435d4e674b51c8f2b442bd48
@@ -1,7 +1,11 @@ require classpath.inc
require classpath.inc
-PR = "r0"
+SRC_URI += "\
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
+PR = "r1"
+
PROVIDES = "${PN} classpath"
EXTRA_OECONF += "\
@@ -13,3 +17,6 @@ EXTRA_OECONF += "\
--disable-dssi \
--disable-examples \
"
+
+CPPACKAGES = "${PBN}-common ${PBN}-tools"
+
============================================================
--- packages/classpath/classpath-native_0.96.1.bb 8b956ee477f32cf28c75a7cd39e9e85373378164
+++ packages/classpath/classpath-native_0.96.1.bb de2308a46658542392eb7d94031a5a997a9dd987
@@ -1,6 +1,9 @@ require classpath-native.inc
require classpath-native.inc
-PR = "r1"
+PR = "r2"
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+ file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
============================================================
--- packages/classpath/classpath.inc b992c2ac2ea9164632c7cc97aadc93694ae7d6db
+++ packages/classpath/classpath.inc 38c3e19b11832c4ee048c930972f95afbc256c0c
@@ -44,10 +44,15 @@ do_install() {
mv ${D}${libdir}/security ${D}${libdir}/${PBN}
}
-PACKAGES =+ "${PBN}-common ${PN}-examples \
+# Defines the packages that this classpath recipe creates.
+# This allows the classpath-minimal variants to override this
+# again.
+CPPACKAGES = "${PBN}-common ${PN}-examples \
${PN}-tools ${PN}-tools-doc \
- ${PN}-gtk ${PN}-gconf "
+ ${PN}-gtk ${PN}-gconf"
+PACKAGES =+ "${CPPACKAGES}"
+
FILES_${PN}-dev += "${libdir}/${PBN}/*.la ${incdir}/${PBN}"
FILES_${PBN}-common = "${datadir}/${PBN}/glibj.zip ${libdir}/logging.properties ${libdir}/${PBN}/security"
============================================================
--- packages/classpath/classpath_0.95.bb d2f820a6ce35613717c16b3612ca071f4d918e83
+++ packages/classpath/classpath_0.95.bb e7719be862652c7d80851c9e91f373cdcca5b3fb
@@ -1,8 +1,11 @@ require classpath.inc
require classpath.inc
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
+SRC_URI += "\
+ file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
-PR = "r2"
+PR = "r3"
DEPENDS += "gtk+ gconf libxtst"
============================================================
--- packages/classpath/classpath_0.96.1.bb 214aa050c2a1948b4e32c88821cce2b89be5f74b
+++ packages/classpath/classpath_0.96.1.bb 33e806e4b65b649a2b4005bd15cb10f3d86c7df7
@@ -1,9 +1,12 @@ require classpath.inc
require classpath.inc
-SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0 \
- "
-PR = "r4"
+SRC_URI += "\
+ file://gjar-prefix-patch.diff;patch=1;pnum=0 \
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
+PR = "r5"
+
DEPENDS += "gtk+ gconf libxtst"
EXTRA_OECONF += "\
============================================================
--- packages/classpath/classpath_0.97.bb db8b170f0f6f53145caf1d439efa49971f8c4475
+++ packages/classpath/classpath_0.97.bb e43aa91f755d291041b31336edce4b31751bdff0
@@ -1,7 +1,11 @@ require classpath.inc
require classpath.inc
-PR = "r0"
+SRC_URI += "\
+ file://xmlstream-fix.patch;patch=1;pnum=0 \
+ "
+PR = "r1"
+
DEPENDS += "gtk+ gconf libxtst"
EXTRA_OECONF += "\
============================================================
--- packages/glibc/glibc_2.7.bb 103ab2ecbe46e58a2574221a6ab35e0d7b843e62
+++ packages/glibc/glibc_2.7.bb f62da4b0450f5fe51216328cf863ed074424defd
@@ -57,6 +57,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gli
# file://fixup-aeabi-syscalls.patch;patch=1 \
# file://zecke-sane-readelf.patch;patch=1 \
file://ldd-unbash.patch;patch=1 \
+ file://glibc-arm-IO-acquire-lock-fix.diff;patch=1 \
file://generic-bits_select.h \
file://generic-bits_types.h \
file://generic-bits_typesizes.h \
More information about the Openembedded-commits
mailing list