[oe-commits] org.oe.dev merge of '288800330cbc2faa2cdc0823b0016b858b6bee68'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sat Feb 16 17:08:12 UTC 2008
merge of '288800330cbc2faa2cdc0823b0016b858b6bee68'
and '6fbaa4dcc3640605ad76e93bbea2d08d823badbb'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0bbc4414a3d984fe899446fe3d8f50b9238cc3dc
ViewMTN: http://monotone.openembedded.org/revision/info/0bbc4414a3d984fe899446fe3d8f50b9238cc3dc
Files:
1
packages/linux/linux-2.6.24/powerpc-clockres.patch
packages/linux/linux-rt-2.6.24/powerpc-clockres.patch
conf/machine/h3900.conf
packages/classpath/classpath-minimal_0.96.1.bb
packages/classpath/classpath.inc
packages/classpath/classpath_0.96.1.bb
packages/linux/linux-rt_2.6.24.bb
packages/linux/linux_2.6.24.bb
packages/tasks/task-base.bb
packages/python/python-efl-examples.bb
packages/tasks/task-python-efl-examples.bb
packages/python/python-efl.bb
packages/tasks/task-python-efl.bb
conf/distro/include/sane-srcdates.inc
packages/python/python-ecore_cvs.bb
packages/python/python-edbus_cvs.bb
packages/python/python-edje_cvs.bb
packages/python/python-efl.inc
packages/python/python-emotion_cvs.bb
packages/python/python-epsilon_cvs.bb
packages/python/python-evas_cvs.bb
packages/tasks/task-openmoko-python-devel.bb
Diffs:
#
# mt diff -r288800330cbc2faa2cdc0823b0016b858b6bee68 -r0bbc4414a3d984fe899446fe3d8f50b9238cc3dc
#
#
#
# add_file "packages/linux/linux-2.6.24/powerpc-clockres.patch"
# content [ee29ef78ae4fc2768bf8eed018f777ecfb1a72d6]
#
# add_file "packages/linux/linux-rt-2.6.24/powerpc-clockres.patch"
# content [ee29ef78ae4fc2768bf8eed018f777ecfb1a72d6]
#
# patch "conf/machine/h3900.conf"
# from [849df89a61a34c3f1c79560dccd714393cceb3c0]
# to [e68aafc20bb71f3f808372fe084d0aa77e2bc151]
#
# patch "packages/classpath/classpath-minimal_0.96.1.bb"
# from [e55ff8e0007e4814498b21013d19e63123d425ee]
# to [a528f080620fffa4c0b22221b0f0cb95c6b6b9b7]
#
# patch "packages/classpath/classpath.inc"
# from [f89bbf74a4b188100d82872ac4cea3f094bafca9]
# to [0f2d68f2974e2300682063936e5b038bd33e9870]
#
# patch "packages/classpath/classpath_0.96.1.bb"
# from [d2f820a6ce35613717c16b3612ca071f4d918e83]
# to [d2c2deaabb0157794cca634460c4e588ebbfc5cf]
#
# patch "packages/linux/linux-rt_2.6.24.bb"
# from [fe4fc51b6385282cc05c46e7dc7a03308fa9dd1f]
# to [982f2f7f32de0753b206b0308ebd2667d8a6e5d4]
#
# patch "packages/linux/linux_2.6.24.bb"
# from [be53cbefd515472b9d7968e2116ddb1345856b91]
# to [ac7980a3cabecb85ffc82d86da685f56c1aa8d23]
#
# patch "packages/tasks/task-base.bb"
# from [2ebcd1a884302a4643dd61431a84aadea41cb978]
# to [461108bf3685f7346e95114839d03eebb184593b]
#
============================================================
--- packages/linux/linux-2.6.24/powerpc-clockres.patch ee29ef78ae4fc2768bf8eed018f777ecfb1a72d6
+++ packages/linux/linux-2.6.24/powerpc-clockres.patch ee29ef78ae4fc2768bf8eed018f777ecfb1a72d6
@@ -0,0 +1,47 @@
+Index: linux-2.6.24/arch/powerpc/kernel/asm-offsets.c
+===================================================================
+--- linux-2.6.24.orig/arch/powerpc/kernel/asm-offsets.c 2008-02-16 13:54:09.000000000 +0100
++++ linux-2.6.24/arch/powerpc/kernel/asm-offsets.c 2008-02-16 13:54:30.000000000 +0100
+@@ -312,7 +312,7 @@
+ DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);
+ DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);
+ DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);
+- DEFINE(CLOCK_REALTIME_RES, TICK_NSEC);
++ DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
+
+ #ifdef CONFIG_BUG
+ DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
+Index: linux-2.6.24/include/linux/hrtimer.h
+===================================================================
+--- linux-2.6.24.orig/include/linux/hrtimer.h 2008-02-16 13:54:09.000000000 +0100
++++ linux-2.6.24/include/linux/hrtimer.h 2008-02-16 13:54:33.000000000 +0100
+@@ -223,11 +223,13 @@
+ * idea of the (in)accuracy of timers. Timer values are rounded up to
+ * this resolution values.
+ */
+-# define KTIME_HIGH_RES (ktime_t) { .tv64 = 1 }
++# define HIGH_RES_NSEC 1
++# define KTIME_HIGH_RES (ktime_t) { .tv64 = HIGH_RES_NSEC }
++# define MONOTONIC_RES_NSEC HIGH_RES_NSEC
+ # define KTIME_MONOTONIC_RES KTIME_HIGH_RES
+
+ #else
+-
++# define MONOTONIC_RES_NSEC LOW_RES_NSEC
+ # define KTIME_MONOTONIC_RES KTIME_LOW_RES
+
+ /*
+Index: linux-2.6.24/include/linux/ktime.h
+===================================================================
+--- linux-2.6.24.orig/include/linux/ktime.h 2008-02-16 13:54:09.000000000 +0100
++++ linux-2.6.24/include/linux/ktime.h 2008-02-16 13:54:36.000000000 +0100
+@@ -316,7 +316,8 @@
+ * idea of the (in)accuracy of timers. Timer values are rounded up to
+ * this resolution values.
+ */
+-#define KTIME_LOW_RES (ktime_t){ .tv64 = TICK_NSEC }
++#define LOW_RES_NSEC TICK_NSEC
++#define KTIME_LOW_RES (ktime_t){ .tv64 = LOW_RES_NSEC }
+
+ /* Get the monotonic time in timespec format: */
+ extern void ktime_get_ts(struct timespec *ts);
============================================================
--- packages/linux/linux-rt-2.6.24/powerpc-clockres.patch ee29ef78ae4fc2768bf8eed018f777ecfb1a72d6
+++ packages/linux/linux-rt-2.6.24/powerpc-clockres.patch ee29ef78ae4fc2768bf8eed018f777ecfb1a72d6
@@ -0,0 +1,47 @@
+Index: linux-2.6.24/arch/powerpc/kernel/asm-offsets.c
+===================================================================
+--- linux-2.6.24.orig/arch/powerpc/kernel/asm-offsets.c 2008-02-16 13:54:09.000000000 +0100
++++ linux-2.6.24/arch/powerpc/kernel/asm-offsets.c 2008-02-16 13:54:30.000000000 +0100
+@@ -312,7 +312,7 @@
+ DEFINE(CLOCK_REALTIME, CLOCK_REALTIME);
+ DEFINE(CLOCK_MONOTONIC, CLOCK_MONOTONIC);
+ DEFINE(NSEC_PER_SEC, NSEC_PER_SEC);
+- DEFINE(CLOCK_REALTIME_RES, TICK_NSEC);
++ DEFINE(CLOCK_REALTIME_RES, MONOTONIC_RES_NSEC);
+
+ #ifdef CONFIG_BUG
+ DEFINE(BUG_ENTRY_SIZE, sizeof(struct bug_entry));
+Index: linux-2.6.24/include/linux/hrtimer.h
+===================================================================
+--- linux-2.6.24.orig/include/linux/hrtimer.h 2008-02-16 13:54:09.000000000 +0100
++++ linux-2.6.24/include/linux/hrtimer.h 2008-02-16 13:54:33.000000000 +0100
+@@ -223,11 +223,13 @@
+ * idea of the (in)accuracy of timers. Timer values are rounded up to
+ * this resolution values.
+ */
+-# define KTIME_HIGH_RES (ktime_t) { .tv64 = 1 }
++# define HIGH_RES_NSEC 1
++# define KTIME_HIGH_RES (ktime_t) { .tv64 = HIGH_RES_NSEC }
++# define MONOTONIC_RES_NSEC HIGH_RES_NSEC
+ # define KTIME_MONOTONIC_RES KTIME_HIGH_RES
+
+ #else
+-
++# define MONOTONIC_RES_NSEC LOW_RES_NSEC
+ # define KTIME_MONOTONIC_RES KTIME_LOW_RES
+
+ /*
+Index: linux-2.6.24/include/linux/ktime.h
+===================================================================
+--- linux-2.6.24.orig/include/linux/ktime.h 2008-02-16 13:54:09.000000000 +0100
++++ linux-2.6.24/include/linux/ktime.h 2008-02-16 13:54:36.000000000 +0100
+@@ -316,7 +316,8 @@
+ * idea of the (in)accuracy of timers. Timer values are rounded up to
+ * this resolution values.
+ */
+-#define KTIME_LOW_RES (ktime_t){ .tv64 = TICK_NSEC }
++#define LOW_RES_NSEC TICK_NSEC
++#define KTIME_LOW_RES (ktime_t){ .tv64 = LOW_RES_NSEC }
+
+ /* Get the monotonic time in timespec format: */
+ extern void ktime_get_ts(struct timespec *ts);
============================================================
--- conf/machine/h3900.conf 849df89a61a34c3f1c79560dccd714393cceb3c0
+++ conf/machine/h3900.conf e68aafc20bb71f3f808372fe084d0aa77e2bc151
@@ -24,6 +24,8 @@ PREFERRED_PROVIDER_xserver = "xserver-kd
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
+
#
# Modules autoload and other boot properties
#
============================================================
--- packages/classpath/classpath-minimal_0.96.1.bb e55ff8e0007e4814498b21013d19e63123d425ee
+++ packages/classpath/classpath-minimal_0.96.1.bb a528f080620fffa4c0b22221b0f0cb95c6b6b9b7
@@ -1,6 +1,6 @@ require classpath.inc
require classpath.inc
-PR = "r3"
+PR = "r4"
SRC_URI += "file://gjar-prefix-patch.diff;patch=1;pnum=0"
============================================================
--- packages/classpath/classpath.inc f89bbf74a4b188100d82872ac4cea3f094bafca9
+++ packages/classpath/classpath.inc 0f2d68f2974e2300682063936e5b038bd33e9870
@@ -9,6 +9,8 @@ RDEPENDS_${PN} = "${PBN}-common (>= ${PV
RPROVIDES = ""
RDEPENDS_${PN} = "${PBN}-common (>= ${PV})"
+RDEPENDS_${PN}-examples = "java2-runtime ${PN}-awt"
+RDEPENDS_${PN}-tools = "java2-runtime"
RPROVIDES_${PN} = "${PBN}"
RPROVIDES_${PN}-gtk = "${PBN}-awt"
============================================================
--- packages/classpath/classpath_0.96.1.bb d2f820a6ce35613717c16b3612ca071f4d918e83
+++ packages/classpath/classpath_0.96.1.bb d2c2deaabb0157794cca634460c4e588ebbfc5cf
@@ -1,8 +1,9 @@ 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 \
+ "
-PR = "r2"
+PR = "r3"
DEPENDS += "gtk+ gconf libxtst"
============================================================
--- packages/linux/linux-rt_2.6.24.bb fe4fc51b6385282cc05c46e7dc7a03308fa9dd1f
+++ packages/linux/linux-rt_2.6.24.bb 982f2f7f32de0753b206b0308ebd2667d8a6e5d4
@@ -6,11 +6,12 @@ DEPENDS_append_mpc8313e-rdb = " dtc-nati
DEPENDS_append_mpc8313e-rdb = " dtc-native"
-PR = "r1"
+PR = "r2"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
${KERNELORG_MIRROR}/pub/linux/kernel/projects/rt/patch-2.6.24-rt1.bz2;patch=1 \
http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
+ file://powerpc-clockres.patch;patch=1 \
file://defconfig"
S = "${WORKDIR}/linux-2.6.24"
============================================================
--- packages/linux/linux_2.6.24.bb be53cbefd515472b9d7968e2116ddb1345856b91
+++ packages/linux/linux_2.6.24.bb ac7980a3cabecb85ffc82d86da685f56c1aa8d23
@@ -7,11 +7,12 @@ DEPENDS_append_mpc8313e-rdb = " dtc-nati
DEPENDS_append_mpc8313e-rdb = " dtc-native"
-PR = "r3"
+PR = "r5"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
- file://defconfig \
- "
+ http://kamikaze.waninkoko.info/patches/2.6.24/kamikaze1/broken-out/squashfs-lzma-2.6.24.patch;patch=1 \
+ file://powerpc-clockres.patch;patch=1 \
+ file://defconfig"
# Real-time preemption. This is experimental and requires a different defconfig.
#SRC_URI += " http://www.kernel.org/pub/linux/kernel/projects/rt/patch-2.6.24-rt1.bz2;patch=1"
============================================================
--- packages/tasks/task-base.bb 2ebcd1a884302a4643dd61431a84aadea41cb978
+++ packages/tasks/task-base.bb 461108bf3685f7346e95114839d03eebb184593b
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r60"
+PR = "r61"
inherit task
#
# mt diff -r6fbaa4dcc3640605ad76e93bbea2d08d823badbb -r0bbc4414a3d984fe899446fe3d8f50b9238cc3dc
#
#
#
# rename "packages/python/python-efl-examples.bb"
# to "packages/tasks/task-python-efl-examples.bb"
#
# rename "packages/python/python-efl.bb"
# to "packages/tasks/task-python-efl.bb"
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [458c1cdc7fdad7be3787a02fe3c5ab93a2b03733]
# to [e417185fe87a77364d7d662829af7d8b658df96e]
#
# patch "packages/python/python-ecore_cvs.bb"
# from [295246b44c66e0eec08f9eaa1d8d53026cfaaf09]
# to [b6e5ba00d6b809a3e441d6dc27d125164f78dacb]
#
# patch "packages/python/python-edbus_cvs.bb"
# from [b9e9b38cb16c01ec8101aa260e4284de97c19c1e]
# to [d5e8bad1f13826a22bcd975f9899d3048049d345]
#
# patch "packages/python/python-edje_cvs.bb"
# from [18a2503cde02ed33e4f15943318b8dfc8cfcfca3]
# to [46da9e504d792e8cd17a35cec8ebeea2f9a49c58]
#
# patch "packages/python/python-efl.inc"
# from [c89446d67552d9bb92644bcef06879c238785740]
# to [7a1e1c981a4d514c24d0cf695b0c335614b36bbb]
#
# patch "packages/python/python-emotion_cvs.bb"
# from [45709d87daaee3ee043e8c8536f35bb73b68f5ca]
# to [9fc029007ba460e19b900588f14fada95732512a]
#
# patch "packages/python/python-epsilon_cvs.bb"
# from [3aa59441db25ec4ff0a8fae0e15f87935ad266f7]
# to [ba4915bb31b83045d2be815f9b219c081c2701e1]
#
# patch "packages/python/python-evas_cvs.bb"
# from [8d47b306dcfe4ce206dd3e6188ebc30c94c155b7]
# to [004f170367e06ca113e955f686f51ce112ce9368]
#
# patch "packages/tasks/task-openmoko-python-devel.bb"
# from [cb71bae786a4c3afdb8e584ce30ec3ae8ebabdc3]
# to [561fb2c52bfab563c0929cbc0c48393897743b6b]
#
============================================================
--- conf/distro/include/sane-srcdates.inc 458c1cdc7fdad7be3787a02fe3c5ab93a2b03733
+++ conf/distro/include/sane-srcdates.inc e417185fe87a77364d7d662829af7d8b658df96e
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080129"
+EFL_SRCDATE = "20080216"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- packages/python/python-ecore_cvs.bb 295246b44c66e0eec08f9eaa1d8d53026cfaaf09
+++ packages/python/python-ecore_cvs.bb b6e5ba00d6b809a3e441d6dc27d125164f78dacb
@@ -1,6 +1,7 @@ require python-efl.inc
require python-efl.inc
-DEPENDS += "ecore"
-PR = "r5"
+DEPENDS += "python-evas ecore"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
do_stage() {
distutils_stage_all
============================================================
--- packages/python/python-edbus_cvs.bb b9e9b38cb16c01ec8101aa260e4284de97c19c1e
+++ packages/python/python-edbus_cvs.bb d5e8bad1f13826a22bcd975f9899d3048049d345
@@ -1,8 +1,8 @@ DEPENDS += "edbus python-dbus"
require python-efl.inc
DEPENDS += "edbus python-dbus"
+PV = "0.1.1+cvs${SRCDATE}"
+PR = "r0"
-PR = "r3"
-
SRC_URI = "${E_CVS};module=e17/proto/python-efl/python-e_dbus"
S = "${WORKDIR}/python-e_dbus"
============================================================
--- packages/python/python-edje_cvs.bb 18a2503cde02ed33e4f15943318b8dfc8cfcfca3
+++ packages/python/python-edje_cvs.bb 46da9e504d792e8cd17a35cec8ebeea2f9a49c58
@@ -1,4 +1,5 @@ DEPENDS += "edje python-evas"
require python-efl.inc
DEPENDS += "edje python-evas"
-PR = "r5"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
============================================================
--- packages/python/python-efl.inc c89446d67552d9bb92644bcef06879c238785740
+++ packages/python/python-efl.inc 7a1e1c981a4d514c24d0cf695b0c335614b36bbb
@@ -6,7 +6,6 @@ RDEPENDS += "python-lang"
# does not compile unless pyrex has been built
DEPENDS = "python-cython-native python-pyrex-native python-numeric"
RDEPENDS += "python-lang"
-PV = "0.1.1+cvs${SRCDATE}"
inherit setuptools
============================================================
--- packages/python/python-emotion_cvs.bb 45709d87daaee3ee043e8c8536f35bb73b68f5ca
+++ packages/python/python-emotion_cvs.bb 9fc029007ba460e19b900588f14fada95732512a
@@ -1,3 +1,4 @@ DEPENDS += "emotion python-evas"
require python-efl.inc
DEPENDS += "emotion python-evas"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
-PR = "r4"
============================================================
--- packages/python/python-epsilon_cvs.bb 3aa59441db25ec4ff0a8fae0e15f87935ad266f7
+++ packages/python/python-epsilon_cvs.bb ba4915bb31b83045d2be815f9b219c081c2701e1
@@ -1,3 +1,4 @@ DEPENDS += "epsilon python-ecore"
require python-efl.inc
DEPENDS += "epsilon python-ecore"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
-PR = "r4"
============================================================
--- packages/python/python-evas_cvs.bb 8d47b306dcfe4ce206dd3e6188ebc30c94c155b7
+++ packages/python/python-evas_cvs.bb 004f170367e06ca113e955f686f51ce112ce9368
@@ -1,6 +1,7 @@ DEPENDS += "evas"
require python-efl.inc
DEPENDS += "evas"
-PR = "r4"
+PV = "0.2.1+cvs${SRCDATE}"
+PR = "r0"
do_stage() {
distutils_stage_all
============================================================
--- packages/tasks/task-openmoko-python-devel.bb cb71bae786a4c3afdb8e584ce30ec3ae8ebabdc3
+++ packages/tasks/task-openmoko-python-devel.bb 561fb2c52bfab563c0929cbc0c48393897743b6b
@@ -1,12 +1,12 @@ LICENSE = "MIT"
DESCRIPTION = "OpenMoko: Python Development Tools"
SECTION = "openmoko/devel"
LICENSE = "MIT"
-PR = "r2"
+PR = "r3"
inherit task
RDEPENDS_task-openmoko-python-devel = "\
- python-efl \
+ task-python-efl \
python-pygtk \
python-lightmediascanner \
"
More information about the Openembedded-commits
mailing list