[oe-commits] org.oe.dev merge of '27e74ef96f09a42940bdd926f11c1d423d1e1eba'
mickeyl commit
openembedded-commits at lists.openembedded.org
Fri Nov 2 12:22:34 UTC 2007
merge of '27e74ef96f09a42940bdd926f11c1d423d1e1eba'
and 'edb8cd28fd8376663f333ba190c7e25b5ebf3794'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 2cc1d45d9437bdd14d505b2d7872c95ac87a0157
ViewMTN: http://monotone.openembedded.org/revision/info/2cc1d45d9437bdd14d505b2d7872c95ac87a0157
Files:
1
packages/ezx/ezxd_svn.bb
packages/gsm/pty/pty.c
packages/gsm/pty_0.0.bb
packages/openmoko2/openmoko-worldclock2_svn.bb
conf/distro/include/preferred-openmoko-versions.inc
conf/distro/angstrom-2007.1.conf
conf/distro/angstrom-2008.1.conf
conf/distro/openmoko.conf
Diffs:
#
# mt diff -r27e74ef96f09a42940bdd926f11c1d423d1e1eba -r2cc1d45d9437bdd14d505b2d7872c95ac87a0157
#
#
#
# patch "packages/ezx/ezxd_svn.bb"
# from [04b108ecbf1292f3bd17572ff59680b8ad1cea67]
# to [46b961aa8dda3f4cf39b5fa53635a8d8ce1aef67]
#
# patch "packages/gsm/pty/pty.c"
# from [7a2613f0b781a75de9ea3f481fc8d3790867d26e]
# to [d18a16924bf69ffcba16fae826baa8d89e2a06ff]
#
# patch "packages/gsm/pty_0.0.bb"
# from [8ac2b04ce6b9a1f198e37c508f7a21b989c2d21c]
# to [8ebcd037b7b27852452c2f50a6fe1abc782476c1]
#
# patch "packages/openmoko2/openmoko-worldclock2_svn.bb"
# from [2cc4090d85a7ec780f069c0211ae2ba1d6cff205]
# to [3558db9e705b8362761086486501699ef7e86813]
#
============================================================
--- packages/ezx/ezxd_svn.bb 04b108ecbf1292f3bd17572ff59680b8ad1cea67
+++ packages/ezx/ezxd_svn.bb 46b961aa8dda3f4cf39b5fa53635a8d8ce1aef67
@@ -1,10 +1,10 @@ PV = "0.0+svnr${SRCREV}"
DESCRIPTION = "Open implementation of motorola's tapisrv, replaces opentapi"
LICENSE = "GPLv2"
SECTION = "devel"
AUTHOR = "Daniel Ribeiro"
PV = "0.0+svnr${SRCREV}"
-PR = "r3"
+PR = "r4"
SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=ezxd;proto=http \
file://ezxd.init \
@@ -17,6 +17,8 @@ S = "${WORKDIR}/${PN}"
S = "${WORKDIR}/${PN}"
+CFLAGS_append = " -DDEBUG "
+
do_configure() {
sed -i -e s:CROSS:CC:g Makefile
}
============================================================
--- packages/gsm/pty/pty.c 7a2613f0b781a75de9ea3f481fc8d3790867d26e
+++ packages/gsm/pty/pty.c d18a16924bf69ffcba16fae826baa8d89e2a06ff
@@ -22,6 +22,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
+#include <poll.h>
#define CHECK(val, name) \
if (val == -1) { \
@@ -32,7 +33,8 @@
#define min(a, b) ((a) < (b) ? (a) : (b))
#define max(a, b) ((a) > (b) ? (a) : (b))
-static int forward2(int in0, int out0, int in1, int out1) {
+static int forward2(int in0, int out0, int in1, int out1,
+ int (*closed)(int fd)) {
int inpos = 0, inlen = 0, outpos = 0, outlen = 0, ret, n;
fd_set rfds, wfds;
char in[0x100], out[0x100];
@@ -66,6 +68,13 @@ static int forward2(int in0, int out0, i
sizeof(out) - max(ret, outlen));
if (ret > 0)
outlen += ret;
+ if (ret < 0 && errno == EIO && closed) {
+ in1 = out0 = closed(in1);
+ if (in1 < 0)
+ return in1;
+ n = max(max(in0, in1), max(out0, out1)) + 1;
+ continue;
+ }
}
if (FD_ISSET(out0, &wfds)) {
ret = write(out0, in + inpos,
@@ -88,6 +97,19 @@ static int forward2(int in0, int out0, i
return pause();
}
+static int reopen(int fd) {
+ const char *name = ttyname(fd);
+
+ CHECK(close(fd), close(pty));
+ fd = open(name, O_RDWR | O_NOCTTY);
+ CHECK(fd, open);
+ CHECK(grantpt(fd), grantpt);
+ CHECK(unlockpt(fd), unlockpt);
+
+ fprintf(stderr, "%s\n", ptsname(fd));
+ return fd;
+}
+
int main(int argc, char *argv[], char **envp) {
int sock, fd;
struct sockaddr_in sa;
@@ -108,7 +130,7 @@ int main(int argc, char *argv[], char **
return pause();
#endif
if (argc != 3)
- return forward2(0, fd, fd, 1);
+ return forward2(0, fd, fd, 1, reopen);
#if 0
/* Connect a sub-process with a pty */
@@ -121,7 +143,7 @@ int main(int argc, char *argv[], char **
i = fileno(popen(param, O_RDWR));
CHECK(i, popen);
free(param);
- return forward2(i, fd, fd, i);
+ return forward2(i, fd, fd, i, reopen);
#endif
/* Connect a TCP socket with a pty */
@@ -137,5 +159,5 @@ int main(int argc, char *argv[], char **
CHECK(sock, socket);
CHECK(connect(sock, (struct sockaddr *) &sa, sizeof(sa)), connect);
- return forward2(sock, fd, fd, sock);
+ return forward2(sock, fd, fd, sock, reopen);
}
============================================================
--- packages/gsm/pty_0.0.bb 8ac2b04ce6b9a1f198e37c508f7a21b989c2d21c
+++ packages/gsm/pty_0.0.bb 8ebcd037b7b27852452c2f50a6fe1abc782476c1
@@ -1,5 +1,6 @@ LICENSE = "GPLv2"
DESCRIPTION = "Forwards a socket to a tty"
LICENSE = "GPLv2"
+PR = "r1"
SRC_URI = "file://pty.c"
============================================================
--- packages/openmoko2/openmoko-worldclock2_svn.bb 2cc4090d85a7ec780f069c0211ae2ba1d6cff205
+++ packages/openmoko2/openmoko-worldclock2_svn.bb 3558db9e705b8362761086486501699ef7e86813
@@ -1,6 +1,6 @@ SECTION = "openmoko/tools"
DESCRIPTION = "A World-Clock for OpenMoko"
SECTION = "openmoko/tools"
-DEPENDS = "libmokoui2 openmoko-dates2 libnotify"
+DEPENDS = "libmokoui2 libjana"
PV = "0.1.0+svnr${SRCREV}"
inherit openmoko2
#
# mt diff -redb8cd28fd8376663f333ba190c7e25b5ebf3794 -r2cc1d45d9437bdd14d505b2d7872c95ac87a0157
#
#
#
# delete "conf/distro/include/preferred-openmoko-versions.inc"
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [58d5a5972c3201255ecb63ccde82093b930045ee]
# to [049fc2b41b1cdbb5c3fac1992eaa84cf2757f201]
#
# patch "conf/distro/angstrom-2008.1.conf"
# from [de57aec5bf786bb9d5cdb1d40856ed0a69ec0f17]
# to [b57f91c4b69991f51bbaf3bbdea9681d1bba1e6e]
#
# patch "conf/distro/openmoko.conf"
# from [98121f29b1e93f614687d8a818b5129f98eab3b6]
# to [fb09004f81fdf9ff14811c7e83335282b3f46b4b]
#
============================================================
--- conf/distro/angstrom-2007.1.conf 58d5a5972c3201255ecb63ccde82093b930045ee
+++ conf/distro/angstrom-2007.1.conf 049fc2b41b1cdbb5c3fac1992eaa84cf2757f201
@@ -160,7 +160,6 @@ require conf/distro/include/preferred-xo
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-xorg-versions.inc
-require conf/distro/include/preferred-openmoko-versions.inc
# Virtuals:
============================================================
--- conf/distro/angstrom-2008.1.conf de57aec5bf786bb9d5cdb1d40856ed0a69ec0f17
+++ conf/distro/angstrom-2008.1.conf b57f91c4b69991f51bbaf3bbdea9681d1bba1e6e
@@ -92,7 +92,6 @@ require conf/distro/include/preferred-xo
require conf/distro/include/preferred-gpe-versions-2.8.inc
require conf/distro/include/preferred-e-versions.inc
require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
-require conf/distro/include/preferred-openmoko-versions.inc
# Virtuals:
============================================================
--- conf/distro/openmoko.conf 98121f29b1e93f614687d8a818b5129f98eab3b6
+++ conf/distro/openmoko.conf fb09004f81fdf9ff14811c7e83335282b3f46b4b
@@ -37,8 +37,6 @@ PREFERRED_PROVIDER_libgsmd = "libgsmd"
# we want the openmoko svn version of gsmd
PREFERRED_PROVIDER_libgsmd = "libgsmd"
-require conf/distro/include/preferred-openmoko-versions.inc
-
# Bleeding-edge developers should add the following line to their local.conf:
# require conf/distro/include/moko-autorev.inc
@@ -62,7 +60,7 @@ PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACH
PACKAGE_ARCH_pn-neod_fic-gta01 = "${MACHINE_CLASS}"
PACKAGE_ARCH_pn-neod_fic-gta02 = "${MACHINE_CLASS}"
-# Select packge versions we wash to use.
+# Select package versions we want to use.
PREFERRED_PROVIDER_gtk+ = "gtk+-fastscaling"
PREFERRED_VERSION_gtk+-fastscaling = "2.10.14"
More information about the Openembedded-commits
mailing list