[oe-commits] org.oe.dev merge of '9877d1d45993745222565aabcf9dda0a305cb1d5'
oe commit
openembedded-commits at lists.openembedded.org
Wed Jul 25 01:39:05 UTC 2007
merge of '9877d1d45993745222565aabcf9dda0a305cb1d5'
and 'b30f5071d106efd92d97d7e0c735332475c0ee26'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 9fd082bd3a6b033c885925024d8f350d1b0c0438
ViewMTN: http://monotone.openembedded.org/revision.psp?id=9fd082bd3a6b033c885925024d8f350d1b0c0438
Files:
1
packages/gpephone/phoneserver/phoneserver-gta01.patch
packages/pkgconfig/pkgconfig-0.22
packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h
packages/pkgconfig/pkgconfig-native_0.22.bb
packages/pkgconfig/pkgconfig_0.22.bb
classes/sanity.bbclass
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
packages/gpephone/phoneserver_1.0.bb
packages/openmoko-apps/openmoko-rssreader_svn.bb
packages/opie-alarm/opie-alarm_cvs.bb
packages/ruby/ruby_1.8.5.bb
packages/tasks/task-base.bb
packages/gpephone/cms92init-0.1
packages/gpephone/cms92init-0.1/oe-install.patch
packages/gpephone/gpe-applauncher_0.8.bb
packages/gpephone/gpe-phonepanel_0.9.bb
packages/gpephone/libgpephone_0.4.bb
packages/gpephone/cms92init_0.1.bb
packages/gpephone/ptim-helper_svn.bb
packages/gpephone/ptim-manager_svn.bb
Diffs:
#
# mt diff -r9877d1d45993745222565aabcf9dda0a305cb1d5 -r9fd082bd3a6b033c885925024d8f350d1b0c0438
#
#
#
# delete "packages/gpephone/phoneserver/phoneserver-gta01.patch"
#
# add_dir "packages/pkgconfig/pkgconfig-0.22"
#
# add_file "packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h"
# content [372a1bb7b434a2d33536de584a8e41604dd5fe1e]
#
# add_file "packages/pkgconfig/pkgconfig-native_0.22.bb"
# content [1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d]
#
# add_file "packages/pkgconfig/pkgconfig_0.22.bb"
# content [fffbd20e4754ed405bc7f24d8eacec693adf09f7]
#
# patch "classes/sanity.bbclass"
# from [dcb94eb7036e5db9888430963dfbead08880632d]
# to [95fd13bb43f72d6183d34fd1c7babdc5fd181427]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
# from [274dcb7d5c72996b49644fa765c72f56ce8f956e]
# to [2ed176b9d093b41fb1abb2ec3d3fffaed7673a66]
#
# patch "packages/gpephone/phoneserver_1.0.bb"
# from [c9fc0ccf00876cce1f9e3f946114ca849cdf589f]
# to [b99b5709d87b22dacde074be177ebcfc003d9664]
#
# patch "packages/openmoko-apps/openmoko-rssreader_svn.bb"
# from [413a32e69453ed84ebeba692f3795ebaa83bef8f]
# to [cdd9a012395501606080a4fd591a4a3a39a0be4f]
#
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
# from [ab53754a45a99c30cb4df8437d42d73aad9d163e]
# to [729efab276ac16baecddae1fc83592ec38182ff4]
#
# patch "packages/ruby/ruby_1.8.5.bb"
# from [abb57d427cbbc11f4ff83d8dc8f53951a1066f8b]
# to [7544aec96e0f0bee56c8380879e7478a865e00f5]
#
# patch "packages/tasks/task-base.bb"
# from [2b89141c35420f2a2ec89ff47305e1e4034c4067]
# to [fe2979cb73be668163bfcc4d8438f2aef96d197b]
#
============================================================
--- packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h 372a1bb7b434a2d33536de584a8e41604dd5fe1e
+++ packages/pkgconfig/pkgconfig-0.22/glibconfig-sysdefs.h 372a1bb7b434a2d33536de584a8e41604dd5fe1e
@@ -0,0 +1,6 @@
+#define GLIB_SYSDEF_POLLIN =1
+#define GLIB_SYSDEF_POLLOUT =4
+#define GLIB_SYSDEF_POLLPRI =2
+#define GLIB_SYSDEF_POLLERR =8
+#define GLIB_SYSDEF_POLLHUP =16
+#define GLIB_SYSDEF_POLLNVAL =32
============================================================
--- packages/pkgconfig/pkgconfig-native_0.22.bb 1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d
+++ packages/pkgconfig/pkgconfig-native_0.22.bb 1ae6b78461b7b7a18e01e9bcfb1f8cf40d0a313d
@@ -0,0 +1,7 @@
+SECTION = "console/utils"
+require pkgconfig_${PV}.bb
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/pkgconfig-${PV}"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+inherit native
+DEPENDS = ""
============================================================
--- packages/pkgconfig/pkgconfig_0.22.bb fffbd20e4754ed405bc7f24d8eacec693adf09f7
+++ packages/pkgconfig/pkgconfig_0.22.bb fffbd20e4754ed405bc7f24d8eacec693adf09f7
@@ -0,0 +1,30 @@
+SECTION = "console/utils"
+DESCRIPTION = "pkg-config is a system for managing library \
+compile/link flags that works with automake and autoconf. \
+It replaces the ubiquitous *-config scripts you may have \
+seen with a single tool."
+HOMEPAGE = "http://pkg-config.freedesktop.org/wiki/"
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "http://pkgconfig.freedesktop.org/releases/pkg-config-${PV}.tar.gz \
+ file://glibconfig-sysdefs.h"
+
+S = "${WORKDIR}/pkg-config-${PV}/"
+
+inherit autotools
+
+acpaths = "-I ."
+do_configure () {
+ install -m 0644 ${WORKDIR}/glibconfig-sysdefs.h glib-1.2.8/
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_stage_prepend() {
+ install -d -m 0755 ${STAGING_DATADIR}/pkgconfig
+
+}
============================================================
--- classes/sanity.bbclass dcb94eb7036e5db9888430963dfbead08880632d
+++ classes/sanity.bbclass 95fd13bb43f72d6183d34fd1c7babdc5fd181427
@@ -89,7 +89,7 @@ def check_sanity(e):
if not check_app_exists('${BUILD_PREFIX}g++', e.data):
missing = missing + "C++ Compiler (${BUILD_PREFIX}g++),"
- required_utilities = "patch diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
+ required_utilities = "patch help2man diffstat texi2html makeinfo cvs svn git bzip2 tar gzip gawk md5sum bison"
for util in required_utilities.split():
if not check_app_exists( util, e.data ):
============================================================
--- conf/distro/include/preferred-opie-versions-1.2.3-pre.inc 274dcb7d5c72996b49644fa765c72f56ce8f956e
+++ conf/distro/include/preferred-opie-versions-1.2.3-pre.inc 2ed176b9d093b41fb1abb2ec3d3fffaed7673a66
@@ -1,9 +1,9 @@ PALMTOP_USE_MULTITHREADED_QT ?= "yes"
#
# Default versions
QTE_VERSION ?= "2.3.10"
PALMTOP_USE_MULTITHREADED_QT ?= "yes"
-OPIE_SRCDATE ?= "20070717"
+OPIE_SRCDATE ?= "20070724"
OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
============================================================
--- packages/gpephone/phoneserver_1.0.bb c9fc0ccf00876cce1f9e3f946114ca849cdf589f
+++ packages/gpephone/phoneserver_1.0.bb b99b5709d87b22dacde074be177ebcfc003d9664
@@ -1,16 +1,13 @@ PRIORITY = "optional"
LICENSE = "LiPS"
DESCRIPTION = "Phone services server"
SECTION = "gpe"
PRIORITY = "optional"
-PR = "r2"
+PR = "r1"
-PACKAGE_ARCH = "${MACHINE}"
-
DEPENDS = "dbus-glib glib-2.0 libmsgenabler libabenabler"
GPE_TARBALL_SUFFIX= "bz2"
inherit gpephone autotools
-SRC_URI_append_x86 = " file://changeport.patch;patch=1;pnum=0"
-SRC_URI_append_fic-gta01 = " file://phoneserver-gta01.patch;patch=1"
+SRC_URI += "file://changeport.patch;patch=1;pnum=0"
============================================================
--- packages/openmoko-apps/openmoko-rssreader_svn.bb 413a32e69453ed84ebeba692f3795ebaa83bef8f
+++ packages/openmoko-apps/openmoko-rssreader_svn.bb cdd9a012395501606080a4fd591a4a3a39a0be4f
@@ -1,6 +1,6 @@ SECTION = "openmoko/applications"
DESCRIPTION = "The OpenMoko RSS Reader"
SECTION = "openmoko/applications"
-DEPENDS += "libmrss check"
+DEPENDS += "libmrss check webkit"
PV = "0.0.1+svn${SRCDATE}"
PR = "r1"
============================================================
--- packages/opie-alarm/opie-alarm_cvs.bb ab53754a45a99c30cb4df8437d42d73aad9d163e
+++ packages/opie-alarm/opie-alarm_cvs.bb 729efab276ac16baecddae1fc83592ec38182ff4
@@ -1,7 +1,7 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r2.1"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/core/opiealarm \
file://01opiealarm \
============================================================
--- packages/ruby/ruby_1.8.5.bb abb57d427cbbc11f4ff83d8dc8f53951a1066f8b
+++ packages/ruby/ruby_1.8.5.bb 7544aec96e0f0bee56c8380879e7478a865e00f5
@@ -1,2 +1,8 @@ DEPENDS = "ruby-native zlib openssl"
require ruby.inc
DEPENDS = "ruby-native zlib openssl"
+
+PR = "r1"
+
+FILES_${PN}-dbg += "${libdir}/ruby/1.8/*/.debug \
+ ${libdir}/ruby/1.8/*/*/.debug"
+
============================================================
--- packages/tasks/task-base.bb 2b89141c35420f2a2ec89ff47305e1e4034c4067
+++ packages/tasks/task-base.bb fe2979cb73be668163bfcc4d8438f2aef96d197b
@@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r40"
+PR = "r41"
DEPENDS = "task-boot"
PROVIDES = "${PACKAGES}"
@@ -223,9 +223,13 @@ task-base-pcmcia26 = "\
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
+# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
+
RDEPENDS_task-base-bluetooth = "\
blueprobe \
- bluez-utils"
+ bluez-utils \
+ bluez-utils-compat \
+ "
RRECOMMENDS_task-base-bluetooth = "\
kernel-module-bluetooth \
#
# mt diff -rb30f5071d106efd92d97d7e0c735332475c0ee26 -r9fd082bd3a6b033c885925024d8f350d1b0c0438
#
#
#
# add_dir "packages/gpephone/cms92init-0.1"
#
# add_file "packages/gpephone/cms92init-0.1/oe-install.patch"
# content [92a9217561ad5289901027621593b8b04f1f30f3]
#
# add_file "packages/gpephone/gpe-applauncher_0.8.bb"
# content [8bf8fe86f0e4c4ac69af6cd8e016291f5c9f8b0a]
#
# add_file "packages/gpephone/gpe-phonepanel_0.9.bb"
# content [c93e6b7e66dd19940e0c8fb75f21d6f49c94e121]
#
# add_file "packages/gpephone/libgpephone_0.4.bb"
# content [44d41bf58a76db78937bca6261d15a3b883ceb81]
#
# patch "packages/gpephone/cms92init_0.1.bb"
# from [16ba2433467bf06374fbefab70e13c9415cd6920]
# to [ff8f3fd5583050a20973cf88ba0f269e7f18c947]
#
# patch "packages/gpephone/ptim-helper_svn.bb"
# from [eaf5cdd4d29b32dfccd466b4b0e57015d3114c71]
# to [513ccb848c66db512ec88c73d15970eb5210a843]
#
# patch "packages/gpephone/ptim-manager_svn.bb"
# from [b41567456c5550b64223e4dd454293d27d5a7614]
# to [4c3fe941a6e90ebc9e6e3297be02b3de9df72b1f]
#
============================================================
--- packages/gpephone/cms92init-0.1/oe-install.patch 92a9217561ad5289901027621593b8b04f1f30f3
+++ packages/gpephone/cms92init-0.1/oe-install.patch 92a9217561ad5289901027621593b8b04f1f30f3
@@ -0,0 +1,9 @@
+--- cms92init-simple/Makefile~ 2007-05-24 12:14:31.000000000 +0200
++++ cms92init-simple/Makefile 2007-05-24 12:14:31.000000000 +0200
+@@ -12,5 +12,5 @@
+
+ install:
+ install -d $(DESTDIR)/$(PREFIX)/bin
+- install -m755 cms92init $(DESTDIR)/$(PREFIX)/bin
++ install -m 755 cms92init $(DESTDIR)/$(PREFIX)/bin
+
============================================================
--- packages/gpephone/gpe-applauncher_0.8.bb 8bf8fe86f0e4c4ac69af6cd8e016291f5c9f8b0a
+++ packages/gpephone/gpe-applauncher_0.8.bb 8bf8fe86f0e4c4ac69af6cd8e016291f5c9f8b0a
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cellphone application launcher."
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+
+DEPENDS = "gtk+ libgpewidget libgpephone libgpelaunch dbus-glib libsettings"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += '${datadir}/themes'
============================================================
--- packages/gpephone/gpe-phonepanel_0.9.bb c93e6b7e66dd19940e0c8fb75f21d6f49c94e121
+++ packages/gpephone/gpe-phonepanel_0.9.bb c93e6b7e66dd19940e0c8fb75f21d6f49c94e121
@@ -0,0 +1,12 @@
+LICENSE = "GPL"
+DESCRIPTION = "A cellphone status panel to be used with gpe-applauncher."
+SECTION = "gpe"
+PRIORITY = "optional"
+PR = "r0"
+
+DEPENDS = "gtk+ libgpephone dbus-glib libsettings"
+
+GPE_TARBALL_SUFFIX= "bz2"
+inherit gpephone autotools
+
+FILES_${PN} += "${datadir}/themes"
============================================================
--- packages/gpephone/libgpephone_0.4.bb 44d41bf58a76db78937bca6261d15a3b883ceb81
+++ packages/gpephone/libgpephone_0.4.bb 44d41bf58a76db78937bca6261d15a3b883ceb81
@@ -0,0 +1,13 @@
+LICENSE = "LGPL"
+DESCRIPTION = "Base library for GPE phone environment."
+SECTION = "gpe/libs"
+PRIORITY = "optional"
+DEPENDS = "gtk+ gtk-doc dbus-glib"
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+inherit gpephone pkgconfig autotools
+
+do_stage () {
+ autotools_stage_all
+}
============================================================
--- packages/gpephone/cms92init_0.1.bb 16ba2433467bf06374fbefab70e13c9415cd6920
+++ packages/gpephone/cms92init_0.1.bb ff8f3fd5583050a20973cf88ba0f269e7f18c947
@@ -7,7 +7,8 @@ inherit gpephone
inherit gpephone
-SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2"
+SRC_URI = "${GPEPHONE_MIRROR}/GPRS/GPRS-${PV}.tar.bz2 \
+ file://oe-install.patch;patch=1"
S = ${WORKDIR}/GPRS/cms92init-simple
============================================================
--- packages/gpephone/ptim-helper_svn.bb eaf5cdd4d29b32dfccd466b4b0e57015d3114c71
+++ packages/gpephone/ptim-helper_svn.bb 513ccb848c66db512ec88c73d15970eb5210a843
@@ -14,7 +14,7 @@ S = "${WORKDIR}/imhelper"
S = "${WORKDIR}/imhelper"
-FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps"
+FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps/*"
FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/helper/.debug/*.so"
FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/helper/*.la"
============================================================
--- packages/gpephone/ptim-manager_svn.bb b41567456c5550b64223e4dd454293d27d5a7614
+++ packages/gpephone/ptim-manager_svn.bb 4c3fe941a6e90ebc9e6e3297be02b3de9df72b1f
@@ -1,9 +1,10 @@ PV = "0.1+svn-${SRCDATE}"
DESCRIPTION = "Phone input method manager module"
SECTION = "gpephone"
PRIORITY = "optional"
LICENSE = "LiPS"
DEPENDS = "gtk+ ptim-headers libiac"
PV = "0.1+svn-${SRCDATE}"
+PR = "r1"
DEFAULT_PREFERENCE = "-1"
@@ -18,6 +19,14 @@ FILES_${PN}-dev += "${libdir}/gtk-2.0/*/
FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug/*.so"
FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/*.la"
+
+do_install_append () {
+ # That's evil...
+ install -m 644 ${S}/conf/imconfig ${D}/${libdir}/gtk-2.0/*/immodules/ptim
+}
+
+
+
do_stage () {
autotools_stage_all
}
More information about the Openembedded-commits
mailing list