[oe-commits] org.oe.dev merge of '9851fa79590de88ec26cd9fb793c162054603016'

thebohemian commit openembedded-commits at lists.openembedded.org
Tue Mar 4 22:35:25 UTC 2008 

merge of '9851fa79590de88ec26cd9fb793c162054603016'
     and 'c93306d4f46a3c6202a5b3d330190edb629f43ec'

Author: thebohemian at openembedded.org
Branch: org.openembedded.dev
Revision: dabcd2c2b7dba60e1d00d1442a0d3f925defafc1
ViewMTN: http://monotone.openembedded.org/revision/info/dabcd2c2b7dba60e1d00d1442a0d3f925defafc1
Files:
1
packages/maemo4/libhildonfm.inc
packages/freesmartphone/pylgrim_svn.bb
packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff
conf/distro/include/angstrom-glibc.inc
conf/distro/include/sane-srcrevs.inc
packages/freesmartphone/enter_0.0.2.bb
packages/freesmartphone/gsm0710muxd_svn.bb
packages/glibc/glibc_2.7.bb
Diffs:

#
# mt diff -r9851fa79590de88ec26cd9fb793c162054603016 -rdabcd2c2b7dba60e1d00d1442a0d3f925defafc1
#
# 
# 
# patch "packages/maemo4/libhildonfm.inc"
#  from [702ae68cf109a6449b217f12b2a3a9ae5b0ce95c]
#    to [de522fbf4f35d5ed4566913669b9c22bd1e7657b]
# 
============================================================
--- packages/maemo4/libhildonfm.inc	702ae68cf109a6449b217f12b2a3a9ae5b0ce95c
+++ packages/maemo4/libhildonfm.inc	de522fbf4f35d5ed4566913669b9c22bd1e7657b
@@ -16,6 +16,11 @@ do_stage() {
 
 do_stage() {
 	autotools_stage_all
+  if [ ! -d ${STAGING_INCDIR}/hildon-widgets ]
+  then
+    mkdir -p ${STAGING_INCDIR}/hildon-widgets
+  fi
+
 	ln -sf ${STAGING_INCDIR}/hildon-fm-2/hildon/* ${STAGING_INCDIR}/hildon-widgets/
 }
 


#
# mt diff -rc93306d4f46a3c6202a5b3d330190edb629f43ec -rdabcd2c2b7dba60e1d00d1442a0d3f925defafc1
#
# 
# 
# add_file "packages/freesmartphone/pylgrim_svn.bb"
#  content [8651ee9d9e38d0b67037e79502753b80bccdf538]
# 
# add_file "packages/glibc/glibc-2.4/glibc-arm-IO-acquire-lock-fix.diff"
#  content [31d7f56b8985a58265f54186c3dd4df209af734e]
# 
# patch "conf/distro/include/angstrom-glibc.inc"
#  from [5298d319ab0e8646c489c50e6e754391aa2f16d7]
#    to [b655e2595b0beb2adddbf6f2e4f114b047128d2a]
# 
# 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]
# 
# patch "packages/glibc/glibc_2.7.bb"
#  from [103ab2ecbe46e58a2574221a6ab35e0d7b843e62]
#    to [f62da4b0450f5fe51216328cf863ed074424defd]
# 
============================================================
--- 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}"
============================================================
--- 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)
============================================================
--- 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"
============================================================
--- 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"
============================================================
--- 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