[oe-commits] org.oe.dev merge of '481cda07f650eec08e83f5f63d522be2fbcb6ff1'
Laibsch commit
oe at amethyst.openembedded.net
Mon Sep 1 18:23:54 UTC 2008
merge of '481cda07f650eec08e83f5f63d522be2fbcb6ff1'
and '75bc4e3a2d2ba7222114e2b45642c31b8e2057dd'
Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 4c5824a87e8a6e8fc0a45362f9b1497ccc47fc76
ViewMTN: http://monotone.openembedded.org/revision/info/4c5824a87e8a6e8fc0a45362f9b1497ccc47fc76
Files:
1
packages/librcf/librcf_0.4.bb
packages/gpe-calendar/gpe-calendar_0.92.bb
packages/gpe-contacts/gpe-contacts_0.49.bb
packages/gpe-login/gpe-login_0.95.bb
packages/libqpe/libqpe-opie/argv.patch
packages/eglibc/eglibc_svn.bb
packages/glibc/glibc_2.5.bb
packages/glibc/glibc_2.6.1.bb
packages/glibc/glibc_2.7.bb
packages/libqpe/libqpe-opie_cvs.bb
packages/tasks/task-native-sdk.bb
packages/uclibc/bfin-uclibc_svn.bb
packages/uclibc/uclibc.inc
packages/uclibc/uclibc_0.9.26.bb
packages/uclibc/uclibc_0.9.27.bb
packages/uclibc/uclibc_0.9.28.bb
packages/uclibc/uclibc_0.9.29.bb
packages/uclibc/uclibc_nptl.bb
packages/uclibc/uclibc_svn.bb
Diffs:
#
# mt diff -r481cda07f650eec08e83f5f63d522be2fbcb6ff1 -r4c5824a87e8a6e8fc0a45362f9b1497ccc47fc76
#
#
#
# patch "packages/librcf/librcf_0.4.bb"
# from [56d98a60b0f89419c4f86264cdb69f34c50bdeef]
# to [6bea26d557ebaa7c5f05e4007b14436f0831e7ca]
#
============================================================
--- packages/librcf/librcf_0.4.bb 56d98a60b0f89419c4f86264cdb69f34c50bdeef
+++ packages/librcf/librcf_0.4.bb 6bea26d557ebaa7c5f05e4007b14436f0831e7ca
@@ -36,7 +36,7 @@ do_stage() {
tar -C include --exclude='*.diff' -cvf - . | tar -C ${STAGING_INCDIR} -xvf -
}
-PACKAGES = "${PN}-dbg ${PN}-mt ${PN}-st ${PN}-dev"
+PACKAGES = "${PN}-dbg ${PN}-mt ${PN}-st ${PN}-dev ${PN}"
FILES_${PN}-mt = "/usr/lib/libRCFmt.so*"
FILES_${PN}-st = "/usr/lib/libRCFst.so*"
FILES_${PN}-dev = "/usr/lib/libRCF[sm]t.a /usr/include"
#
# mt diff -r75bc4e3a2d2ba7222114e2b45642c31b8e2057dd -r4c5824a87e8a6e8fc0a45362f9b1497ccc47fc76
#
#
#
# add_file "packages/gpe-calendar/gpe-calendar_0.92.bb"
# content [350b266171cd6b781035f21bc253f8ee830222ea]
#
# add_file "packages/gpe-contacts/gpe-contacts_0.49.bb"
# content [12389d9ee885d2b01064703041a94b548b045844]
#
# add_file "packages/gpe-login/gpe-login_0.95.bb"
# content [aafaba0fd81e9e931a35ba2e8e104138da5c249f]
#
# add_file "packages/libqpe/libqpe-opie/argv.patch"
# content [824d2cf67d344e6beca4a2ae34a5eb93ab62fa65]
#
# patch "packages/eglibc/eglibc_svn.bb"
# from [175848d8e38b548d456707101f14158a0aef0c9f]
# to [579f64f2be97fb0ccba90c0527996365db04d69b]
#
# patch "packages/glibc/glibc_2.5.bb"
# from [28f2f9a3a57828b85bdecaf06acd329fee9c0b86]
# to [76dfe8533318cb5562fd8d7cc7fb176b60ec8cb0]
#
# patch "packages/glibc/glibc_2.6.1.bb"
# from [57bf7eb6dae142987a9e81c5916a9181d7ec554a]
# to [d1c3a2677ee3782a7c42edf9fc8a1abe269dc4ea]
#
# patch "packages/glibc/glibc_2.7.bb"
# from [e91e43390c8241eaa333acc59cfd49359d7979fe]
# to [4d9139ab5c9440611da75d340fb3cd3623e7b2e5]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [91e2e33456b6a52c2e638114582c8bedf85783ac]
# to [5b455f635df061033bcf1797d4f490d5b64a3edc]
#
# patch "packages/tasks/task-native-sdk.bb"
# from [e9aff3af03f3423a34dcb2853582e08fdd66a6a5]
# to [80fba75c8d21780b6f54763256f5828453d33f13]
#
# patch "packages/uclibc/bfin-uclibc_svn.bb"
# from [e6c66ba278e5ce02ed11b35bd5f35655d2bee089]
# to [f5887aff60acb829eb361dbaf20d5948d6fdb684]
#
# patch "packages/uclibc/uclibc.inc"
# from [b9731e1c2f88c691c051a5483ea18e8f61e1d9ba]
# to [87c57651af3b432e1e276e442f06fb540434c6bb]
#
# patch "packages/uclibc/uclibc_0.9.26.bb"
# from [8c4ecfedfcea87b3c96dbc1c2c39a80890f8bb42]
# to [a9c5c7a53dff8b42c1ad2b3439fcf1d5b68c2f49]
#
# patch "packages/uclibc/uclibc_0.9.27.bb"
# from [df5f9a00d2118c5b62001047dbcb53adbe3cd3c3]
# to [d9aad4f438701e3d54c1b13cbc3ac614ad29f946]
#
# patch "packages/uclibc/uclibc_0.9.28.bb"
# from [57793a0bc95945f45c0f3916bb2c11edd2d3a217]
# to [82aad93faa17a5e28331876152cc398f2fd4b7cd]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [8b02df79e5136a8b2833ea26f26f95484bc814ec]
# to [36b3e0ba61c9b81964d2c2a0a34ac781598ecf46]
#
# patch "packages/uclibc/uclibc_nptl.bb"
# from [4999fa82e8cb40cbff3508bf2427ca942ce9fc73]
# to [8b1c3ebb64f33f85d7a9bce48a3c6544564a36fc]
#
# patch "packages/uclibc/uclibc_svn.bb"
# from [eaf1abec09168bb845c5cc7719513cfa957f0072]
# to [da7c4cf07c2da423ae14ee83bc3e9059f0a09962]
#
============================================================
--- packages/gpe-calendar/gpe-calendar_0.92.bb 350b266171cd6b781035f21bc253f8ee830222ea
+++ packages/gpe-calendar/gpe-calendar_0.92.bb 350b266171cd6b781035f21bc253f8ee830222ea
@@ -0,0 +1,16 @@
+DESCRIPTION = "GPE calendar is the calendar application of the GPE PIM suite."
+SECTION = "gpe"
+LICENSE = "GPL"
+
+DEPENDS = "libhandoff libsoup libeventdb libschedule libxsettings libxsettings-client libgpepimc libdisplaymigration libgpevtype libsoundgen"
+RDEPENDS = "gpe-icons"
+
+PR = "r0"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit autotools gpe
+
+do_configure () {
+ autotools_do_configure
+}
============================================================
--- packages/gpe-contacts/gpe-contacts_0.49.bb 12389d9ee885d2b01064703041a94b548b045844
+++ packages/gpe-contacts/gpe-contacts_0.49.bb 12389d9ee885d2b01064703041a94b548b045844
@@ -0,0 +1,13 @@
+DESCRIPTION = "GPE contacts manager"
+LICENSE = "GPL"
+SECTION = "gpe"
+
+DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus-glib"
+RDEPENDS = "gpe-icons"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools
+
+FILES_${PN} += " ${datadir}/gpe ${datadir}/gpe-contacts"
+
============================================================
--- packages/gpe-login/gpe-login_0.95.bb aafaba0fd81e9e931a35ba2e8e104138da5c249f
+++ packages/gpe-login/gpe-login_0.95.bb aafaba0fd81e9e931a35ba2e8e104138da5c249f
@@ -0,0 +1,37 @@
+DESCRIPTION = "GPE user login screen"
+SECTION = "gpe"
+PRIORITY = "optional"
+LICENSE = "GPL"
+DEPENDS = "gtk+ libgpewidget gpe-ownerinfo xkbd"
+RDEPENDS = "xkbd gpe-theme-clearlooks"
+RPROVIDES_${PN} = "gpe-session-starter"
+PR = "r0"
+
+SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
+
+GPE_TARBALL_SUFFIX = "bz2"
+
+inherit gpe autotools pkgconfig
+
+
+SRC_URI += "file://removeblue-fontsize8.patch;patch=1"
+SRC_URI += " file://chvt-keylaunch.patch;patch=1 "
+SRC_URI += " file://c-locale.patch;patch=1 "
+
+SRC_URI_append_spitz = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_akita = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+SRC_URI_append_c7x0 = "file://brightness-adjust-keyluanchrc.patch;patch=1"
+
+
+CONFFILES_${PN} += " \
+${sysconfdir}/apm/suspend.d/S98lock-display \
+${sysconfdir}/gpe/gpe-login.conf \
+${sysconfdir}/gpe/locale.alias \
+${sysconfdir}/sysconfig/gpelogin \
+${sysconfdir}/X11/gpe-login.keylaunchrc \
+${sysconfdir}/X11/gpe-login.gtkrc \
+${sysconfdir}/X11/gpe-login.setup \
+${sysconfdir}/X11/gpe-login.pre-session \
+${sysconfdir}/X11/Xinit.d/99gpe-login \
+${sysconfdir}/X11/Xsession.d/50autolock \
+"
============================================================
--- packages/libqpe/libqpe-opie/argv.patch 824d2cf67d344e6beca4a2ae34a5eb93ab62fa65
+++ packages/libqpe/libqpe-opie/argv.patch 824d2cf67d344e6beca4a2ae34a5eb93ab62fa65
@@ -0,0 +1,13 @@
+Index: library/qpeapplication.h
+===================================================================
+--- library.orig/qpeapplication.h 2008-06-12 01:18:24.548201862 +0200
++++ library/qpeapplication.h 2008-06-12 01:18:30.861635469 +0200
+@@ -127,7 +127,7 @@
+ static void showWidget( QWidget*, bool nomax=FALSE ) QPE_WEAK_SYMBOL;
+ /* Merge setTempScreenSaverMode */
+ #ifdef QTOPIA_INTERNAL_INITAPP
+- void initApp( int argv, char **argv );
++ void initApp( int argc, char **argv );
+ #endif
+
+ static void setKeepRunning();
============================================================
--- packages/eglibc/eglibc_svn.bb 175848d8e38b548d456707101f14158a0aef0c9f
+++ packages/eglibc/eglibc_svn.bb 579f64f2be97fb0ccba90c0527996365db04d69b
@@ -3,7 +3,7 @@ PV = "2.8+svnr${SRCREV}"
# DEFAULT_PREFERENCE = "-1"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/eglibc-svn"
PV = "2.8+svnr${SRCREV}"
-PR = "r9"
+PR = "r10"
SRC_URI = "svn://svn.eglibc.org;module=trunk \
file://eglibc-svn-arm-lowlevellock-include-tls.patch;patch=1 \
file://etc/ld.so.conf \
@@ -12,7 +12,7 @@ PACKAGES_DYNAMIC = "libc6*"
B = "${WORKDIR}/build-${TARGET_SYS}"
PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
PROVIDES_${PN}-dbg = "glibc-dbg"
# the -isystem in bitbake.conf screws up glibc do_stage
@@ -39,7 +39,6 @@ python __anonymous () {
bb.data.getVar('TARGET_OS', d, 1))
}
-
EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
--without-cvs --disable-profile --disable-debug --without-gd \
--enable-clocale=gnu \
============================================================
--- packages/glibc/glibc_2.5.bb 28f2f9a3a57828b85bdecaf06acd329fee9c0b86
+++ packages/glibc/glibc_2.5.bb 76dfe8533318cb5562fd8d7cc7fb176b60ec8cb0
@@ -1,10 +1,10 @@ require glibc.inc
require glibc.inc
-PR = "r16"
+PR = "r17"
ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/glibc/glibc_2.6.1.bb 57bf7eb6dae142987a9e81c5916a9181d7ec554a
+++ packages/glibc/glibc_2.6.1.bb d1c3a2677ee3782a7c42edf9fc8a1abe269dc4ea
@@ -1,8 +1,8 @@ require glibc.inc
require glibc.inc
-PR = "r10"
+PR = "r11"
PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/glibc/glibc_2.7.bb e91e43390c8241eaa333acc59cfd49359d7979fe
+++ packages/glibc/glibc_2.7.bb 4d9139ab5c9440611da75d340fb3cd3623e7b2e5
@@ -3,9 +3,9 @@ PACKAGES_DYNAMIC = "libc6*"
ARM_INSTRUCTION_SET = "arm"
PACKAGES_DYNAMIC = "libc6*"
-RPROVIDES_${PN}-dev = "libc6-dev"
+RPROVIDES_${PN}-dev = "libc6-dev virtual-libc-dev"
-PR = "r6"
+PR = "r7"
# the -isystem in bitbake.conf screws up glibc do_stage
BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
============================================================
--- packages/libqpe/libqpe-opie_cvs.bb 91e2e33456b6a52c2e638114582c8bedf85783ac
+++ packages/libqpe/libqpe-opie_cvs.bb 5b455f635df061033bcf1797d4f490d5b64a3edc
@@ -1,11 +1,12 @@ PV = "${OPIE_CVS_PV}"
require ${PN}.inc
PV = "${OPIE_CVS_PV}"
-PR = "r2"
+PR = "r3"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1 \
file://unbreak-logging.patch;patch=1 \
file://citytime-path.patch;patch=1 \
+ file://argv.patch;patch=1 \
"
============================================================
--- packages/tasks/task-native-sdk.bb e9aff3af03f3423a34dcb2853582e08fdd66a6a5
+++ packages/tasks/task-native-sdk.bb 80fba75c8d21780b6f54763256f5828453d33f13
@@ -1,10 +1,11 @@ LICENSE = "MIT"
DESCRIPTION = "Packages required for native (on-device) SDK"
LICENSE = "MIT"
-DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
-RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
+DEPENDS = "virtual/libc gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
+RDEPENDS = "gcc-symlinks g++-symlinks cpp-symlinks binutils-symlinks \
+ make virtual-libc-dev \
flex flex-dev bison gawk sed grep autoconf automake make \
patch patchutils diffstat diffutils libstdc++-dev"
-PR = "r2"
+PR = "r3"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
============================================================
--- packages/uclibc/bfin-uclibc_svn.bb e6c66ba278e5ce02ed11b35bd5f35655d2bee089
+++ packages/uclibc/bfin-uclibc_svn.bb f5887aff60acb829eb361dbaf20d5948d6fdb684
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
# on whether the base patches apply to the selected (SRCDATE) svn release.
#
UCLIBC_BASE ?= "0.9.29"
-PR = "r2"
+PR = "r3"
PV = "${UCLIBC_BASE}+svnr${SRCREV}"
require uclibc.inc
============================================================
--- packages/uclibc/uclibc.inc b9731e1c2f88c691c051a5483ea18e8f61e1d9ba
+++ packages/uclibc/uclibc.inc 87c57651af3b432e1e276e442f06fb540434c6bb
@@ -52,7 +52,7 @@ FILES_uclibc-thread-db = "/lib/libthread
FILES_uclibc-utils-dbg += "${bindir}/.debug ${sbindir}/.debug"
FILES_uclibc-gconv = "${libdir}/gconv"
FILES_uclibc-thread-db = "/lib/libthread_db*"
-RPROVIDES_uclibc-dev += "libc-dev"
+RPROVIDES_uclibc-dev += "libc-dev virtual-libc-dev"
#
# This locale file gets copied into uClibc-${PV}/extra/locale/ prior to
============================================================
--- packages/uclibc/uclibc_0.9.26.bb 8c4ecfedfcea87b3c96dbc1c2c39a80890f8bb42
+++ packages/uclibc/uclibc_0.9.26.bb a9c5c7a53dff8b42c1ad2b3439fcf1d5b68c2f49
@@ -1,4 +1,4 @@
-PR = "r10"
+PR = "r11"
require uclibc.inc
============================================================
--- packages/uclibc/uclibc_0.9.27.bb df5f9a00d2118c5b62001047dbcb53adbe3cd3c3
+++ packages/uclibc/uclibc_0.9.27.bb d9aad4f438701e3d54c1b13cbc3ac614ad29f946
@@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1"
DEFAULT_PREFERENCE = "1"
-PR = "r10"
+PR = "r11"
require uclibc.inc
============================================================
--- packages/uclibc/uclibc_0.9.28.bb 57793a0bc95945f45c0f3916bb2c11edd2d3a217
+++ packages/uclibc/uclibc_0.9.28.bb 82aad93faa17a5e28331876152cc398f2fd4b7cd
@@ -1,5 +1,5 @@ DEFAULT_PREFERENCE = "1"
DEFAULT_PREFERENCE = "1"
-PR = "r14"
+PR = "r15"
require uclibc.inc
============================================================
--- packages/uclibc/uclibc_0.9.29.bb 8b02df79e5136a8b2833ea26f26f95484bc814ec
+++ packages/uclibc/uclibc_0.9.29.bb 36b3e0ba61c9b81964d2c2a0a34ac781598ecf46
@@ -7,7 +7,7 @@ UCLIBC_BASE ?= "0.9.29"
# on whether the base patches apply to the selected (SRCDATE) svn release.
#
UCLIBC_BASE ?= "0.9.29"
-PR = "r24"
+PR = "r25"
DEFAULT_PREFERENCE = "1"
require uclibc.inc
============================================================
--- packages/uclibc/uclibc_nptl.bb 4999fa82e8cb40cbff3508bf2427ca942ce9fc73
+++ packages/uclibc/uclibc_nptl.bb 8b1c3ebb64f33f85d7a9bce48a3c6544564a36fc
@@ -8,7 +8,7 @@ PV = "${UCLIBC_BASE}+svnr${SRCREV}"
#
UCLIBC_BASE ?= "0.9.29"
PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r0"
+PR = "r1"
#DEFAULT_PREFERENCE = "2"
#DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
# precedence.
============================================================
--- packages/uclibc/uclibc_svn.bb eaf1abec09168bb845c5cc7719513cfa957f0072
+++ packages/uclibc/uclibc_svn.bb da7c4cf07c2da423ae14ee83bc3e9059f0a09962
@@ -8,7 +8,7 @@ PV = "${UCLIBC_BASE}+svnr${SRCREV}"
#
UCLIBC_BASE ?= "0.9.29"
PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r13"
+PR = "r14"
#DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
# precedence.
More information about the Openembedded-commits
mailing list