[oe-commits] org.oe.dev merge of '32e6a3c5d4994942e12a0f14ff64ebd224726e17'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Aug 20 20:05:47 UTC 2007
merge of '32e6a3c5d4994942e12a0f14ff64ebd224726e17'
and 'f1d39ac0c47301d60716c311f9babd62a0c15fc2'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 5ad6f42b55c9b2e3db7384a70948aee3be638cd6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5ad6f42b55c9b2e3db7384a70948aee3be638cd6
Files:
1
classes/distutils.bbclass
packages/python/python-efl.inc
packages/python/python-evas_cvs.bb
packages/gsm/files/fix-mlbuf.patch
packages/gsm/libgsmd_svn.bb
packages/linux/linux-handhelds-2.6/magician/defconfig
packages/linux/linux-omap2_git.bb
packages/makedevs/makedevs-1.0.0/makedevs.c
Diffs:
#
# mt diff -r32e6a3c5d4994942e12a0f14ff64ebd224726e17 -r5ad6f42b55c9b2e3db7384a70948aee3be638cd6
#
#
#
# patch "classes/distutils.bbclass"
# from [360816dccb4f857e2065ebda84f78fde86ff4b65]
# to [b5fdf6a8a6b47377bbad57ef7d345783624e42be]
#
# patch "packages/python/python-efl.inc"
# from [6ac61900a9a6dedff63afcb55e931f9337453406]
# to [80730c5bf36a6a6a0cbbbb65f28daf6416921c23]
#
# patch "packages/python/python-evas_cvs.bb"
# from [643730b5cf660ec8fdedb50a18b9af6fb1834cee]
# to [95ca09f432a324ad0b1751de0270eb7d943c51b6]
#
============================================================
--- classes/distutils.bbclass 360816dccb4f857e2065ebda84f78fde86ff4b65
+++ classes/distutils.bbclass b5fdf6a8a6b47377bbad57ef7d345783624e42be
@@ -9,9 +9,16 @@ distutils_stage_headers() {
distutils_stage_headers() {
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python setup.py install_headers --install-dir=${STAGING_INCDIR}/${PYTHON_DIR} || \
- oefatal "python setup.py install execution failed."
+ oefatal "python setup.py install_headers execution failed."
}
+distutils_stage_all() {
+ PYTHONPATH=${STAGING_INCDIR}/../${PYTHON_DIR}/site-packages \
+ BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
+ ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${STAGING_INCDIR}/.. --install-data=${STAGING_INCDIR}/../share || \
+ oefatal "python setup.py install (stage) execution failed."
+}
+
distutils_do_install() {
install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
PYTHONPATH=${D}/${libdir}/${PYTHON_DIR}/site-packages \
============================================================
--- packages/python/python-efl.inc 6ac61900a9a6dedff63afcb55e931f9337453406
+++ packages/python/python-efl.inc 80730c5bf36a6a6a0cbbbb65f28daf6416921c23
@@ -1,9 +1,9 @@ DEPENDS = "python-pyrex-native python-nu
DESCRIPTION = "${PN} bindings"
LICENSE = "BSD"
AUTHOR = "Gustavo Sverzut Barbieri <barbieri at gmail.com>"
HOMEPAGE = "http://www.enlightenment.org"
DEPENDS = "python-pyrex-native python-numeric"
-PV = "0.0.0+cvs${SRCDATE}"
+PV = "0.1.1+cvs${SRCDATE}"
inherit distutils
============================================================
--- packages/python/python-evas_cvs.bb 643730b5cf660ec8fdedb50a18b9af6fb1834cee
+++ packages/python/python-evas_cvs.bb 95ca09f432a324ad0b1751de0270eb7d943c51b6
@@ -1,13 +1,7 @@ do_stage() {
require python-efl.inc
DEPENDS += "evas"
do_stage() {
- distutils_stage_headers
+ distutils_stage_all
}
-
-#do_stage_append() {
-# install -d ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/
-# install -m 0644 evas/evas.c_evas.pxd ${STAGING_DIR}/${BUILD_SYS}/include/${PYTHON_DIR}/python-evas/
-#}
-
#
# mt diff -rf1d39ac0c47301d60716c311f9babd62a0c15fc2 -r5ad6f42b55c9b2e3db7384a70948aee3be638cd6
#
#
#
# add_file "packages/gsm/files/fix-mlbuf.patch"
# content [557dce80239fff8ac79176198ecf6c19a3aaa4e0]
#
# patch "packages/gsm/libgsmd_svn.bb"
# from [6387ca7f099a514f35eed5b601884e71694739b2]
# to [ba98d351988038ba9049d25dc6f82ae76c983ee7]
#
# patch "packages/linux/linux-handhelds-2.6/magician/defconfig"
# from [733c78dca4659e362fbd3a43ef5287380bb72f1b]
# to [3ece7048b0db57ab0907cfe256ce71a1e13290f6]
#
# patch "packages/linux/linux-omap2_git.bb"
# from [ab62a543cf001bbe863e1adb93758519b57f7036]
# to [51f14792a8bc6ce3690fa88f529d8b7a51ef40d9]
#
# patch "packages/makedevs/makedevs-1.0.0/makedevs.c"
# from [ea1e63451b180d14554bdb8508f0c4189e250d6b]
# to [d8baece6be2666c9a9d240fe16d7577ec42225c5]
#
============================================================
--- packages/gsm/files/fix-mlbuf.patch 557dce80239fff8ac79176198ecf6c19a3aaa4e0
+++ packages/gsm/files/fix-mlbuf.patch 557dce80239fff8ac79176198ecf6c19a3aaa4e0
@@ -0,0 +1,50 @@
+Index: gsm/src/gsmd/atcmd.c
+===================================================================
+--- gsm/src/gsmd/atcmd.c (revision 2745)
++++ gsm/src/gsmd/atcmd.c (working copy)
+@@ -370,8 +370,8 @@
+ if (g->mlbuf_len)
+ g->mlbuf[g->mlbuf_len ++] = '\n';
+ DEBUGP("Appending buf to mlbuf\n");
+- if (len > sizeof(g->mlbuf) - g->mlbuf_len)
+- len = sizeof(g->mlbuf) - g->mlbuf_len;
++ if (len > MLPARSE_BUF_SIZE - g->mlbuf_len)
++ len = MLPARSE_BUF_SIZE - g->mlbuf_len;
+ memcpy(g->mlbuf + g->mlbuf_len, buf, len);
+ g->mlbuf_len += len;
+
+@@ -470,7 +470,7 @@
+ if (cr)
+ len = cr - pos->cur;
+ else
+- len = pos->buflen;
++ len = pos->buflen - 1; /* assuming zero-terminated strings */
+ rc = write(fd, pos->cur, len);
+ if (rc == 0) {
+ gsmd_log(GSMD_ERROR, "write returns 0, aborting\n");
+@@ -480,8 +480,8 @@
+ fd, rc);
+ return rc;
+ }
+- if (cr && rc == len)
+- rc ++; /* Skip the \n */
++ if (!cr || rc == len)
++ rc ++; /* Skip the \n or \0 */
+ pos->buflen -= rc;
+ pos->cur += rc;
+ write(fd, "\r", 1);
+Index: gsm/src/gsmd/gsmd.c
+===================================================================
+--- gsm/src/gsmd/gsmd.c (revision 2745)
++++ gsm/src/gsmd/gsmd.c (working copy)
+@@ -301,6 +301,10 @@
+ {
+ INIT_LLIST_HEAD(&g->users);
+
++ g->mlbuf = talloc_array(gsmd_tallocs, unsigned char, MLPARSE_BUF_SIZE);
++ if (!g->mlbuf)
++ return -ENOMEM;
++
+ return 0;
+ }
+
============================================================
--- packages/gsm/libgsmd_svn.bb 6387ca7f099a514f35eed5b601884e71694739b2
+++ packages/gsm/libgsmd_svn.bb ba98d351988038ba9049d25dc6f82ae76c983ee7
@@ -9,6 +9,7 @@ SRC_URI = "svn://svn.openmoko.org/trunk/
SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
+ file://fix-mlbuf.patch;patch=1 \
file://gsmd \
file://default"
S = "${WORKDIR}/gsm"
@@ -27,8 +28,17 @@ do_install_append() {
install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/
install -d ${D}/${sysconfdir}/default
install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
+ # band-aid:
+ install -d ${D}${includedir}/common
+ install -m 0644 ${S}/include/common/linux_list.h ${D}${includedir}/common
}
+# band-aid:
+do_stage_append () {
+ install -d ${STAGING_INCDIR}/common
+ install ${S}/include/common/linux_list.h ${STAGING_INCDIR}/common
+}
+
PACKAGES =+ "${PN}-tools gsmd gsmd-plugins \
gsmd-plugin-machine-generic gsmd-plugin-machine-tihtc \
gsmd-plugin-vendor-qc gsmd-plugin-vendor-ti \
============================================================
--- packages/linux/linux-handhelds-2.6/magician/defconfig 733c78dca4659e362fbd3a43ef5287380bb72f1b
+++ packages/linux/linux-handhelds-2.6/magician/defconfig 3ece7048b0db57ab0907cfe256ce71a1e13290f6
@@ -167,7 +167,6 @@ CONFIG_MAGICIAN_LCD=y
CONFIG_MAGICIAN_PM=y
CONFIG_MAGICIAN_TS=m
CONFIG_MAGICIAN_LCD=y
-CONFIG_MAGICIAN_DS1WM=m
CONFIG_MAGICIAN_PHONE=m
# CONFIG_MACH_HTCAPACHE is not set
# CONFIG_MACH_BLUEANGEL is not set
@@ -908,6 +907,7 @@ CONFIG_ADC_ADS7846_SSP=m
# CONFIG_MFD_SM501 is not set
# CONFIG_HTC_ASIC2 is not set
# CONFIG_HTC_ASIC3 is not set
+CONFIG_HTC_PASIC3=y
CONFIG_HTC_EGPIO=y
# CONFIG_HTC_ASIC3_DS1WM is not set
# CONFIG_SOC_SAMCOP is not set
@@ -929,13 +929,15 @@ CONFIG_LEDS_MAGICIAN=y
# LED drivers
#
CONFIG_LEDS_MAGICIAN=y
+CONFIG_LEDS_PASIC3=y
#
# LED Triggers
#
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
-# CONFIG_LEDS_TRIGGER_HWTIMER is not set
+CONFIG_LEDS_TRIGGER_HWTIMER=y
+CONFIG_LEDS_TRIGGER_BACKLIGHT=y
# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set
CONFIG_LEDS_TRIGGER_SHARED=y
============================================================
--- packages/linux/linux-omap2_git.bb ab62a543cf001bbe863e1adb93758519b57f7036
+++ packages/linux/linux-omap2_git.bb 51f14792a8bc6ce3690fa88f529d8b7a51ef40d9
@@ -7,7 +7,6 @@ SRC_URI = "git://source.mvista.com/git/l
COMPATIBLE_MACHINE = "omap2430sdp"
SRC_URI = "git://source.mvista.com/git/linux-omap-2.6.git;protocol=git \
- file://omap-2430-lcd.patch;patch=1;pnum=1 \
file://defconfig.eabi \
file://defconfig"
============================================================
--- packages/makedevs/makedevs-1.0.0/makedevs.c ea1e63451b180d14554bdb8508f0c4189e250d6b
+++ packages/makedevs/makedevs-1.0.0/makedevs.c d8baece6be2666c9a9d240fe16d7577ec42225c5
@@ -106,6 +106,7 @@ static void add_new_directory(char *name
static void add_new_directory(char *name, char *path,
unsigned long uid, unsigned long gid, unsigned long mode)
{
+ mkdir(path,mode);
// printf("Directory: %s %s UID: %ld GID %ld MODE: %ld\n", path, name, uid, gid, mode);
}
@@ -136,6 +137,13 @@ static void add_new_file(char *name, cha
static void add_new_file(char *name, char *path, unsigned long uid,
unsigned long gid, unsigned long mode)
{
+ int fd = open(path,O_CREAT | O_WRONLY, mode);
+ if(fd<0)
+ {
+ error_msg_and_die("%s: file can not be created!", path);
+ } else {
+ close(fd);
+ }
// printf("File: %s %s UID: %ld GID: %ld MODE: %ld\n",
// path, name, gid, uid, mode);
}
More information about the Openembedded-commits
mailing list