[oe-commits] org.oe.dev merge of '1505fef26a6cdc6bec6d7d7a81b02146504bb790'
oe commit
oe at amethyst.openembedded.net
Tue Apr 8 12:39:26 UTC 2008
merge of '1505fef26a6cdc6bec6d7d7a81b02146504bb790'
and 'feea3227e23d70e02158cb7ee3b896e6e4d28fe3'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: eb6012f4f544cad5eba77acb92e2eafbff01a119
ViewMTN: http://monotone.openembedded.org/revision/info/eb6012f4f544cad5eba77acb92e2eafbff01a119
Files:
1
packages/python/python-pyrtc_svn.bb
conf/distro/chinook-compat.conf
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb
packages/s3c24xx-utils/s3c24xx-gpio_svn.bb
packages/s3c24xx-utils/sjf2410-linux-native_svn.bb
packages/dosfstools/files/2.6.20-syscall.patch
packages/diffutils/diffutils_2.8.1.bb
packages/dosfstools/dosfstools-native_2.10.bb
packages/less/less_418.bb
Diffs:
#
# mt diff -r1505fef26a6cdc6bec6d7d7a81b02146504bb790 -reb6012f4f544cad5eba77acb92e2eafbff01a119
#
#
#
# add_file "packages/python/python-pyrtc_svn.bb"
# content [bfeeeeccaeaceda2fa0fee0dfffed426bfcad026]
#
# patch "conf/distro/chinook-compat.conf"
# from [bc6984bba9a01e6ec920c499c8fbacfe7533e83e]
# to [271e8379588ab95358ace72a9bc2946e8fcca2b7]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [1474e937489b8938c1858d53c427068ce882e743]
# to [534cab07a9373e1020839557e2432ce088c550e8]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69]
# to [fa679c887c40501f1728c25ffd9222506ce6f366]
#
# patch "packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb"
# from [0bdc20dd566d6175fff6c13e3c54b17e8b1542b9]
# to [b75660af4d2976417371bd6521760757571bf7bd]
#
# patch "packages/s3c24xx-utils/s3c24xx-gpio_svn.bb"
# from [e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff]
# to [7cee2203504f78f69abd1d1993c7f7b8955ebb4d]
#
# patch "packages/s3c24xx-utils/sjf2410-linux-native_svn.bb"
# from [9063b21889a311b3259a27e13d933e6cb7360f5f]
# to [9a022b0f5e9ee48883d86a30efdf184681913e3a]
#
============================================================
--- packages/python/python-pyrtc_svn.bb bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
+++ packages/python/python-pyrtc_svn.bb bfeeeeccaeaceda2fa0fee0dfffed426bfcad026
@@ -0,0 +1,16 @@
+DESCRIPTION = "PyRTC is a python extension module that supports talking to the \
+RTC (Real Time Clock) found in most PCs and SOCs"
+SECTION = "devel/python"
+HOMEPAGE = "http://www.freesmartphone.org"
+AUTHOR = "Michael 'Mickey' Lauer <mlauer at vanille-media.de>"
+LICENSE = "GPLv2"
+SRCNAME = "pyrtc"
+DEPENDS = "python-cython-native"
+PV = "1.0.0+svnr${SRCREV}"
+PR = "ml0"
+
+SRC_URI = "svn://projects.linuxtogo.org/svn/smartphones/trunk/software;module=${SRCNAME}"
+S = "${WORKDIR}/${SRCNAME}"
+
+inherit distutils
+
============================================================
--- conf/distro/chinook-compat.conf bc6984bba9a01e6ec920c499c8fbacfe7533e83e
+++ conf/distro/chinook-compat.conf 271e8379588ab95358ace72a9bc2946e8fcca2b7
@@ -61,8 +61,10 @@ PREFERRED_VERSION_gcc-cross = "3.4.4cs20
PREFERRED_VERSION_gcc = "3.4.4cs2005q3.2"
PREFERRED_VERSION_gcc-cross = "3.4.4cs2005q3.2"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
+#PREFERRED_VERSION_gcc-cross-initial = "3.4.4cs2005q3.2"
+
# Use recent enough version of the headers to let HAL build successfully.
PREFERRED_VERSION_linux-libc-headers = "2.6.20"
@@ -165,7 +167,7 @@ PREFERRED_PROVIDER_classpath = "classpat
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"
-PREFERRED_VERSION_classpath = "0.97"
+PREFERRED_VERSION_classpath = "0.97.1"
PREFERRED_PROVIDER_swt3.4-gtk = "swt3.4-gtk-hildon"
PREFERRED_VERSION_swt3.4-gtk-hildon = "3.3+3.4M5"
@@ -200,3 +202,5 @@ PKG_libconic = "libconic0"
PKG_osso-ic-oss = "osso-ic"
PKG_libconic = "libconic0"
+
+PKG_libgcc = "libgcc1"
============================================================
--- conf/distro/include/sane-srcdates.inc 1474e937489b8938c1858d53c427068ce882e743
+++ conf/distro/include/sane-srcdates.inc 534cab07a9373e1020839557e2432ce088c550e8
@@ -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 = "20080330"
+EFL_SRCDATE = "20080409"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 7b88a07e203269cf2a7c7e72fc4c6c60f48b8e69
+++ conf/distro/include/sane-srcrevs.inc fa679c887c40501f1728c25ffd9222506ce6f366
@@ -146,8 +146,9 @@ SRCREV_pn-python-formencode = "3148"
SRCREV_pn-pyneod ?= "88"
SRCREV_pn-pyneog ?= "88"
SRCREV_pn-python-formencode = "3148"
-SRCREV_pn-python-gsmd = "127"
+SRCREV_pn-python-gsmd = "148"
SRCREV_pn-python-lightmediascanner = "68"
+SRCREV_pn-python-pyrtc = "152"
SRCREV_pn-s3c24xx-gpio ?= "4130"
SRCREV_pn-settings-daemon ?= "1755"
SRCREV_pn-sjf2410-linux-native ?= "933"
============================================================
--- packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb 0bdc20dd566d6175fff6c13e3c54b17e8b1542b9
+++ packages/s3c24xx-utils/s3c2410-boot-usb-native_svn.bb b75660af4d2976417371bd6521760757571bf7bd
@@ -3,7 +3,7 @@ LICENSE = "GPL"
SECTION = "devel"
AUTHOR = "Harald Welte"
LICENSE = "GPL"
-PV = "0.1.0+svn${SRCDATE}"
+PV = "0.1.0+svn${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https"
============================================================
--- packages/s3c24xx-utils/s3c24xx-gpio_svn.bb e4d0ff4d3de3a71c5b5cd12a3d21e3b2d861c1ff
+++ packages/s3c24xx-utils/s3c24xx-gpio_svn.bb 7cee2203504f78f69abd1d1993c7f7b8955ebb4d
@@ -1,8 +1,8 @@ LICENSE = "GPL"
DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3c24xx platform"
SECTION = "console/utils"
LICENSE = "GPL"
-PV = "1.0+svn${SRCDATE}"
-PR = "r0"
+PV = "1.0+svn${SRCREV}"
+PR = "r1"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http"
S = "${WORKDIR}/gpio"
============================================================
--- packages/s3c24xx-utils/sjf2410-linux-native_svn.bb 9063b21889a311b3259a27e13d933e6cb7360f5f
+++ packages/s3c24xx-utils/sjf2410-linux-native_svn.bb 9a022b0f5e9ee48883d86a30efdf184681913e3a
@@ -2,7 +2,7 @@ LICENSE = "GPL"
SECTION = "devel"
AUTHOR = "Harald Welte"
LICENSE = "GPL"
-PV = "0.1+svn${SRCDATE}"
+PV = "0.1+svn${SRCREV}"
PR = "r0"
SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https"
#
# mt diff -rfeea3227e23d70e02158cb7ee3b896e6e4d28fe3 -reb6012f4f544cad5eba77acb92e2eafbff01a119
#
#
#
# add_file "packages/dosfstools/files/2.6.20-syscall.patch"
# content [d16fa45896b2fa1a24df86947a8748d591cb2857]
#
# patch "packages/diffutils/diffutils_2.8.1.bb"
# from [f65140ead392f9fb8acae02e1ad6211ff3da6a70]
# to [8549a96143d03b98e290128f5dbd920fde3f0b15]
#
# patch "packages/dosfstools/dosfstools-native_2.10.bb"
# from [74f77d7777f1859ca6103dda2b291c4ba8081da8]
# to [b4d20dfdf25b3e72471114ea9213d8a8eec2b1c9]
#
# patch "packages/less/less_418.bb"
# from [7a32bf4f532a88f87963b671d7730f2d4daefd8b]
# to [27876ef01a533f7c4f28ac5c850f0785523fc65b]
#
============================================================
--- packages/dosfstools/files/2.6.20-syscall.patch d16fa45896b2fa1a24df86947a8748d591cb2857
+++ packages/dosfstools/files/2.6.20-syscall.patch d16fa45896b2fa1a24df86947a8748d591cb2857
@@ -0,0 +1,65 @@
+Index: dosfstools-2.10/dosfsck/io.c
+===================================================================
+--- dosfstools-2.10.orig/dosfsck/io.c 2007-06-07 16:15:52.000000000 +0200
++++ dosfstools-2.10/dosfsck/io.c 2007-06-07 16:16:06.000000000 +0200
+@@ -42,28 +42,11 @@
+ /* Use the _llseek system call directly, because there (once?) was a bug in
+ * the glibc implementation of it. */
+ #include <linux/unistd.h>
+-#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
+ /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */
+ static loff_t llseek( int fd, loff_t offset, int whence )
+ {
+ return lseek(fd, offset, whence);
+ }
+-#else
+-# ifndef __NR__llseek
+-# error _llseek system call not present
+-# endif
+-static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
+- loff_t *, res, uint, wh );
+-
+-static loff_t llseek( int fd, loff_t offset, int whence )
+-{
+- loff_t actual;
+-
+- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0)
+- return (loff_t)-1;
+- return actual;
+-}
+-#endif
+
+
+ void fs_open(char *path,int rw)
+Index: dosfstools-2.10/mkdosfs/mkdosfs.c
+===================================================================
+--- dosfstools-2.10.orig/mkdosfs/mkdosfs.c 2007-06-07 16:15:11.000000000 +0200
++++ dosfstools-2.10/mkdosfs/mkdosfs.c 2007-06-07 16:15:30.000000000 +0200
+@@ -116,27 +116,11 @@
+ /* Use the _llseek system call directly, because there (once?) was a bug in
+ * the glibc implementation of it. */
+ #include <linux/unistd.h>
+-#if defined __alpha || defined __ia64__ || defined __s390x__ || defined __x86_64__ || defined __ppc64__
+ /* On alpha, the syscall is simply lseek, because it's a 64 bit system. */
+ static loff_t llseek( int fd, loff_t offset, int whence )
+ {
+ return lseek(fd, offset, whence);
+ }
+-#else
+-# ifndef __NR__llseek
+-# error _llseek system call not present
+-# endif
+-static _syscall5( int, _llseek, uint, fd, ulong, hi, ulong, lo,
+- loff_t *, res, uint, wh );
+-static loff_t llseek( int fd, loff_t offset, int whence )
+-{
+- loff_t actual;
+-
+- if (_llseek(fd, offset>>32, offset&0xffffffff, &actual, whence) != 0)
+- return (loff_t)-1;
+- return actual;
+-}
+-#endif
+
+ #define ROUND_UP(value, divisor) (value + (divisor - (value % divisor))) / divisor
+
============================================================
--- packages/diffutils/diffutils_2.8.1.bb f65140ead392f9fb8acae02e1ad6211ff3da6a70
+++ packages/diffutils/diffutils_2.8.1.bb 8549a96143d03b98e290128f5dbd920fde3f0b15
@@ -3,7 +3,7 @@ used for creating patch files."
DESCRIPTION = "Diffutils contains the GNU diff, diff3, \
sdiff, and cmp utilities. These programs are usually \
used for creating patch files."
-PR = "r2"
+PR = "r3"
SRC_URI = "${GNU_MIRROR}/diffutils/diffutils-${PV}.tar.gz"
@@ -18,8 +18,21 @@ do_install_append () {
do_install_append () {
mv ${D}${bindir}/diff ${D}${bindir}/diff.${PN}
+ mv ${D}${bindir}/cmp ${D}${bindir}/cmp.${PN}
}
ALTERNATIVE_NAME = "diff"
ALTERNATIVE_PATH = "diff.${PN}"
ALTERNATIVE_PRIORITY = "100"
+
+pkg_postinst_${PN} () {
+
+update-alternatives --install /usr/bin/cmp cmp cmp.diffutils 100
+
+}
+
+pkg_postrm_${PN} () {
+
+update-alternatives --remove cmp cmp.diffutils
+
+}
============================================================
--- packages/dosfstools/dosfstools-native_2.10.bb 74f77d7777f1859ca6103dda2b291c4ba8081da8
+++ packages/dosfstools/dosfstools-native_2.10.bb b4d20dfdf25b3e72471114ea9213d8a8eec2b1c9
@@ -7,7 +7,7 @@ S="${WORKDIR}/dosfstools-${PV}"
S="${WORKDIR}/dosfstools-${PV}"
-PR="r3"
+PR="r4"
SRC_URI = "ftp://ftp.uni-erlangen.de/pub/Linux/LOCAL/dosfstools/dosfstools-${PV}.src.tar.gz \
file://mkdosfs-bootcode.patch;patch=1 \
@@ -16,7 +16,8 @@ SRC_URI = "ftp://ftp.uni-erlangen.de/pub
file://dosfstools-2.10-kernel-2.6.patch;patch=1 \
file://msdos_fat12_undefined.patch;patch=1 \
file://dosfstools-msdos_fs-types.patch;patch=1 \
- file://include-linux-types.patch;patch=1"
+ file://include-linux-types.patch;patch=1 \
+ file://2.6.20-syscall.patch;patch=1"
inherit native
============================================================
--- packages/less/less_418.bb 7a32bf4f532a88f87963b671d7730f2d4daefd8b
+++ packages/less/less_418.bb 27876ef01a533f7c4f28ac5c850f0785523fc65b
@@ -6,7 +6,7 @@ DEPENDS = "ncurses"
LICENSE = "BSD"
DEPENDS = "ncurses"
-SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz "
+SRC_URI = "${GNU_MIRROR}/less/less-${PV}.tar.gz"
inherit autotools update-alternatives
More information about the Openembedded-commits
mailing list