[oe-commits] org.oe.dev merge of '5744cdb7ad43a125c73b2dd57d51ded57a140c60'
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Feb 23 18:40:29 UTC 2008
merge of '5744cdb7ad43a125c73b2dd57d51ded57a140c60'
and 'be4a9a82ecf6de3dc409f7e421e00f48275630a4'
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: d4edfdc5d41bfdf331ec7bc23e996d430aae5ac7
ViewMTN: http://monotone.openembedded.org/revision/info/d4edfdc5d41bfdf331ec7bc23e996d430aae5ac7
Files:
1
packages/fbset/fbset-init
packages/fbset/fbset-modes/qemuarm
packages/fbset/fbset-init/default-fbset
packages/fbset/fbset-init/fbset.sh
packages/fbset/fbset-init.bb
packages/fbset/fbset-modes/qemuarm/fb.modes
packages/fbset/fbset-modes.bb
packages/psplash/psplash_svn.bb
mtn:execute
true
packages/klibc/files/install.patch
packages/klibc/klibc_0.190.bb
packages/kphonepi
packages/ktimetrackerpi
packages/randrext
packages/randrext/randrext_1.0.bb
packages/randrext/randrext_cvs.bb
packages/recordext
packages/recordext/recordext_cvs.bb
packages/renderext
packages/renderext/renderext_0.8.bb
packages/renderext/renderext_cvs.bb
packages/altboot/altboot_1.1.1+wip-SVNR78.bb
packages/altboot/altboot_1.1.1+wip-SVNR79.bb
packages/compositeext
packages/obsolete/compositeext
packages/damageext
packages/obsolete/damageext
packages/fixesext
packages/obsolete/fixesext
packages/free42/free42-vga_1.4.36.bb
packages/free42/free42-vga_1.4.41.bb
packages/klibc/klibc_1.1.1.bb
packages/klibc/klibc_1.5.bb
packages/kphonepi/kphonepi_1.0.0.bb
packages/kdepimpi/kphonepi_1.0.0.bb
packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb
packages/kdepimpi/ktimetrackerpi_0.9.7.bb
packages/libpcap/libpcap-0.9.6
packages/libpcap/libpcap-0.9.8
packages/libpcap/libpcap_0.9.6.bb
packages/libpcap/libpcap_0.9.8.bb
packages/panoramixext
packages/obsolete/panoramixext
packages/resourceext
packages/obsolete/resourceext
packages/xxf86dgaext
packages/obsolete/xxf86dgaext
packages/xxf86vmext
packages/obsolete/xxf86vmext
packages/kdepimpi/kdepimpi-x11
packages/gpgme/gpgme.inc
packages/kdepimpi/kdepimpi-qte.inc
packages/kdepimpi/kdepimpi-x11/kabc.patch
packages/kdepimpi/kdepimpi-x11/kammu.patch
packages/kdepimpi/kdepimpi-x11/korganizer.patch
packages/kdepimpi/kdepimpi-x11/libkcal.patch
packages/kdepimpi/kdepimpi-x11/nomail.patch
packages/kdepimpi/kdepimpi-x11.inc
packages/kdepimpi/kdepimpi-x11_2.2.3.bb
packages/kexec/files/kexec-klibc.patch
packages/klibc/files/klibc_kexecsyscall.patch
packages/klibc/files/staging.patch
classes/nylon-mirrors.bbclass
classes/oplinux-mirrors.bbclass
classes/sanity.bbclass
conf/bitbake.conf
conf/checksums.ini
conf/distro/include/sane-srcrevs.inc
conf/distro/openmoko.conf
conf/distro/sharprom-compatible.conf
conf/sanity.conf
packages/angstrom/angstrom-task-sectest.bb
packages/asterisk/asterisk_1.4.10.bb
packages/asterisk/asterisk_1.4.11.bb
packages/asterisk/asterisk_1.4.17.bb
packages/bootsplash/bootsplash-native_3.0.7.bb
packages/findutils/findutils_4.2.29.bb
packages/gpgme/gpgme_1.0.0.bb
packages/gpgme/gpgme_1.0.3.bb
packages/gpgme/gpgme_1.1.4.bb
packages/gpsdrive/gpsdrive_2.10pre2.bb
packages/gpsdrive/gpsdrive_2.10pre3.bb
packages/initrdscripts/initramfs-kexec_1.0.bb
packages/kdepimpi/files/gcc4.patch
packages/kdepimpi/files/gcc42.patch
packages/kdepimpi/files/qt-mt.patch
packages/kexec/kexec-tools-static_1.101.bb
packages/kexec/kexec-tools.inc
packages/kexec/kexec-tools_1.101.bb
packages/klibc/klibc-common.inc
packages/klibc/klibc-utils-static_1.5.bb
packages/klibc/klibc.inc
packages/libxine/libxine-fb_1.0.bb
packages/libxine/libxine-x11_1.0.bb
packages/libxine/libxine_1.1.0.bb
packages/mozilla/firefox.inc
packages/mozilla/firefox_1.0.7.bb
packages/mozilla/firefox_2.0.0.3.bb
packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb
packages/prismstumbler/prismstumbler_0.7.3.bb
packages/rdesktop/rdesktop_1.3.1.bb
packages/rdesktop/rdesktop_1.4.1.bb
packages/rdesktop/rdesktop_1.5.0.bb
packages/subversion/subversion_1.3.1.bb
packages/subversion/subversion_1.4.0.bb
packages/subversion/subversion_1.4.3.bb
packages/subversion/subversion_1.4.5.bb
packages/tcltk/tcl_8.4.11.bb
packages/u-boot/u-boot-openmoko_svn.bb
packages/uclibc/elf2flt_svn.bb
packages/xmms-embedded/xmms-embedded_20040327.bb
packages/xorg-app/mkbold-mkitalic-native_0.11.bb
Diffs:
#
# mt diff -r5744cdb7ad43a125c73b2dd57d51ded57a140c60 -rd4edfdc5d41bfdf331ec7bc23e996d430aae5ac7
#
#
#
# add_dir "packages/fbset/fbset-init"
#
# add_dir "packages/fbset/fbset-modes/qemuarm"
#
# add_file "packages/fbset/fbset-init/default-fbset"
# content [75705626b2020d4da86e03d8ec233c6a7f471f40]
#
# add_file "packages/fbset/fbset-init/fbset.sh"
# content [cad0c4d5575c11336c95f684d2de2aca9ca97a93]
#
# add_file "packages/fbset/fbset-init.bb"
# content [a83fcda44f7eb9b99d9ff8d0a0f061a69b2ba2f6]
#
# add_file "packages/fbset/fbset-modes/qemuarm/fb.modes"
# content [d7e99588e4262702106e8b8c0dd75c117f3ff997]
#
# patch "packages/fbset/fbset-modes.bb"
# from [414d4cdbb4ad78dce7653a1ff5b6825200370c26]
# to [b6bc4b79dc3409ade5a257e67bcb6eaad78e693d]
#
# patch "packages/psplash/psplash_svn.bb"
# from [b698aff22a0110395efea1fa894814aa903d798e]
# to [fa4a90b01b11bc3fd19dec0f01b3f34da4aef5ec]
#
# set "packages/fbset/fbset-init/fbset.sh"
# attr "mtn:execute"
# value "true"
#
============================================================
--- packages/fbset/fbset-init/default-fbset 75705626b2020d4da86e03d8ec233c6a7f471f40
+++ packages/fbset/fbset-init/default-fbset 75705626b2020d4da86e03d8ec233c6a7f471f40
@@ -0,0 +1,3 @@
+# Uncomment and set value below to one of modes from /etc/fb.modes
+# or alternatively to "-xres <width> -yres <height>"
+#FBSET_MODE="vga"
============================================================
--- packages/fbset/fbset-init/fbset.sh cad0c4d5575c11336c95f684d2de2aca9ca97a93
+++ packages/fbset/fbset-init/fbset.sh cad0c4d5575c11336c95f684d2de2aca9ca97a93
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+. /etc/default/fbset
+[ -n "$FBSET_MODE" ] && fbset -n $FBSET_MODE
============================================================
--- packages/fbset/fbset-init.bb a83fcda44f7eb9b99d9ff8d0a0f061a69b2ba2f6
+++ packages/fbset/fbset-init.bb a83fcda44f7eb9b99d9ff8d0a0f061a69b2ba2f6
@@ -0,0 +1,19 @@
+DESCRIPTION = "Set framebuffer mode during boot"
+PR = "r1"
+
+SRC_URI = "file://fbset.sh file://default-fbset"
+
+inherit update-rc.d
+
+INITSCRIPT_NAME = "fbset.sh"
+INITSCRIPT_PARAMS = "start 0 S ."
+
+do_install() {
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/default
+ install -m 0755 ${WORKDIR}/fbset.sh ${D}${sysconfdir}/init.d/
+ install -m 0644 ${WORKDIR}/default-fbset ${D}${sysconfdir}/default/fbset
+}
+
+PACKAGE_ARCH = "all"
+CONFFILES_${PN} = "${sysconfdir}/default/fbset"
============================================================
--- packages/fbset/fbset-modes/qemuarm/fb.modes d7e99588e4262702106e8b8c0dd75c117f3ff997
+++ packages/fbset/fbset-modes/qemuarm/fb.modes d7e99588e4262702106e8b8c0dd75c117f3ff997
@@ -0,0 +1,17 @@
+# QEMU versatilepb machine, qemuarm in OE
+
+mode "vga" "640x480"
+ geometry 640 480 640 480 16
+endmode
+
+mode "vga-portrait" "480x640"
+ geometry 480 640 480 640 16
+endmode
+
+mode "qvga" "320x240"
+ geometry 320 240 320 240 16
+endmode
+
+mode "qvga-portrait" "240x320"
+ geometry 240 320 240 320 16
+endmode
============================================================
--- packages/fbset/fbset-modes.bb 414d4cdbb4ad78dce7653a1ff5b6825200370c26
+++ packages/fbset/fbset-modes.bb b6bc4b79dc3409ade5a257e67bcb6eaad78e693d
@@ -1,6 +1,6 @@ PV = "0.1.0"
DESCRIPTION = "Default display timings and resolutions for fbset"
PV = "0.1.0"
-PR = "r2"
+PR = "r3"
SRC_URI = "file://fb.modes"
============================================================
--- packages/psplash/psplash_svn.bb b698aff22a0110395efea1fa894814aa903d798e
+++ packages/psplash/psplash_svn.bb fa4a90b01b11bc3fd19dec0f01b3f34da4aef5ec
@@ -1,9 +1,9 @@ PV = "0.0+svnr${SRCREV}"
DESCRIPTION = "Userspace framebuffer boot logo based on usplash."
HOMEPAGE = "http://projects.o-hand.com/psplash"
SECTION = "base"
LICENSE = "GPL"
PV = "0.0+svnr${SRCREV}"
-PR = "r12"
+PR = "r13"
RDEPENDS = "initscripts"
# You can create your own pslash-hand-img.h by doing
@@ -36,6 +36,6 @@ INITSCRIPT_NAME = "psplash"
}
INITSCRIPT_NAME = "psplash"
-INITSCRIPT_PARAMS = "start 0 S . stop 20 0 1 6 ."
+INITSCRIPT_PARAMS = "start 01 S . stop 20 0 1 6 ."
FILES_${PN} += "/mnt/.psplash"
#
# mt diff -rbe4a9a82ecf6de3dc409f7e421e00f48275630a4 -rd4edfdc5d41bfdf331ec7bc23e996d430aae5ac7
#
#
#
# delete "packages/klibc/files/install.patch"
#
# delete "packages/klibc/klibc_0.190.bb"
#
# delete "packages/kphonepi"
#
# delete "packages/ktimetrackerpi"
#
# delete "packages/randrext"
#
# delete "packages/randrext/randrext_1.0.bb"
#
# delete "packages/randrext/randrext_cvs.bb"
#
# delete "packages/recordext"
#
# delete "packages/recordext/recordext_cvs.bb"
#
# delete "packages/renderext"
#
# delete "packages/renderext/renderext_0.8.bb"
#
# delete "packages/renderext/renderext_cvs.bb"
#
# rename "packages/altboot/altboot_1.1.1+wip-SVNR78.bb"
# to "packages/altboot/altboot_1.1.1+wip-SVNR79.bb"
#
# rename "packages/compositeext"
# to "packages/obsolete/compositeext"
#
# rename "packages/damageext"
# to "packages/obsolete/damageext"
#
# rename "packages/fixesext"
# to "packages/obsolete/fixesext"
#
# rename "packages/free42/free42-vga_1.4.36.bb"
# to "packages/free42/free42-vga_1.4.41.bb"
#
# rename "packages/klibc/klibc_1.1.1.bb"
# to "packages/klibc/klibc_1.5.bb"
#
# rename "packages/kphonepi/kphonepi_1.0.0.bb"
# to "packages/kdepimpi/kphonepi_1.0.0.bb"
#
# rename "packages/ktimetrackerpi/ktimetrackerpi_0.9.7.bb"
# to "packages/kdepimpi/ktimetrackerpi_0.9.7.bb"
#
# rename "packages/libpcap/libpcap-0.9.6"
# to "packages/libpcap/libpcap-0.9.8"
#
# rename "packages/libpcap/libpcap_0.9.6.bb"
# to "packages/libpcap/libpcap_0.9.8.bb"
#
# rename "packages/panoramixext"
# to "packages/obsolete/panoramixext"
#
# rename "packages/resourceext"
# to "packages/obsolete/resourceext"
#
# rename "packages/xxf86dgaext"
# to "packages/obsolete/xxf86dgaext"
#
# rename "packages/xxf86vmext"
# to "packages/obsolete/xxf86vmext"
#
# add_dir "packages/kdepimpi/kdepimpi-x11"
#
# add_file "packages/gpgme/gpgme.inc"
# content [b13cccb8a5bee784f86c9e8c266b18f6ca87022b]
#
# add_file "packages/kdepimpi/kdepimpi-qte.inc"
# content [fb2614dc19c44fd71119ef6be827e9c62c67b057]
#
# add_file "packages/kdepimpi/kdepimpi-x11/kabc.patch"
# content [df403b912190a224d099dc5f9d374b7b219190da]
#
# add_file "packages/kdepimpi/kdepimpi-x11/kammu.patch"
# content [8546ab724328cc0e928eca11abae77a1ae87ea5c]
#
# add_file "packages/kdepimpi/kdepimpi-x11/korganizer.patch"
# content [36f5509ac6229510a0fc75e3b48c6fbe5985fff1]
#
# add_file "packages/kdepimpi/kdepimpi-x11/libkcal.patch"
# content [e460dfab310f6bc63e9e065e36dfdf9a64075aee]
#
# add_file "packages/kdepimpi/kdepimpi-x11/nomail.patch"
# content [04916bb3da166c0ac4d4618ca18a9504ea33cb20]
#
# add_file "packages/kdepimpi/kdepimpi-x11.inc"
# content [b9ff595eead7a24aedb8391634cc158e956c6271]
#
# add_file "packages/kdepimpi/kdepimpi-x11_2.2.3.bb"
# content [8b8b0aab88bcf20f98725982dfc396ffa242d3cd]
#
# add_file "packages/kexec/files/kexec-klibc.patch"
# content [0c778df2238eb4e8880f42f1cbad2044a8dadd87]
#
# add_file "packages/klibc/files/klibc_kexecsyscall.patch"
# content [027581e82a2945c16d6bd7ee256967b69a2fc638]
#
# add_file "packages/klibc/files/staging.patch"
# content [744788fb708efea82c9caafcb0509e1581351bcb]
#
# patch "classes/nylon-mirrors.bbclass"
# from [376b7465920814cf2d72d3ad84339ba9443a70ab]
# to [102010d2a19c8b12b6de91f8b903db60701bfede]
#
# patch "classes/oplinux-mirrors.bbclass"
# from [1349196904a1b7eb854816b63b65eb58babc8f0a]
# to [ed581826599bb12881bb248c12360c0f7cbae434]
#
# patch "classes/sanity.bbclass"
# from [476edb8104e59b309dc8324d39e691ffd1116e3a]
# to [7c5340af69fe3211497c811df2af7c17db7e435a]
#
# patch "conf/bitbake.conf"
# from [a605bd5d4d48054b72d21c74a922a9a0a2d12a76]
# to [20411cfe48d828effd31bc1b225638aa75828191]
#
# patch "conf/checksums.ini"
# from [d46efbb6c50b6c05af0157650b6e3e6a51f5243d]
# to [eb9de8f37d459cdc0493e46911c3d815b00b240f]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [c50ac937f3aa1f2966905448c3afbb2e1bb0025f]
# to [5593e5efc3a50fcda9d2247e1e4eb97b9974d204]
#
# patch "conf/distro/openmoko.conf"
# from [4512da55b21499913ae1534988c81c3c26b99c64]
# to [02896609234a09af5537fbcaf494e70d8a9addba]
#
# patch "conf/distro/sharprom-compatible.conf"
# from [1917f33c694aff55fe7253f1a1dcb3dcb92edde8]
# to [a56c571d457931934464e14394215bc4932503e6]
#
# patch "conf/sanity.conf"
# from [8074d545842c568a6a98bad4358a6da7c037e6c6]
# to [19e2e5d9bfa5113b4c25577b445fd588b4a0999b]
#
# patch "packages/altboot/altboot_1.1.1+wip-SVNR79.bb"
# from [23034faf0bf4b951b3987f4253824cfdc50c4459]
# to [92a2019a88f00288a822465089cc720b1d997615]
#
# patch "packages/angstrom/angstrom-task-sectest.bb"
# from [0df8c6eb7d44b4b09ee6daecc100e47abb3ede24]
# to [70fcfba8464b46af63d1c816ca4786fdf40cc9be]
#
# patch "packages/asterisk/asterisk_1.4.10.bb"
# from [2d51154605b0ca7b662304502f3cb12e7330014e]
# to [63f58515cb08e7fedd04b521e8d2b6ba74a63457]
#
# patch "packages/asterisk/asterisk_1.4.11.bb"
# from [c8d00d57639bbb867b0f3bab8775bb2375e7fd7a]
# to [60ad063e816162c04cc9f9093a4b97c9e48fb6be]
#
# patch "packages/asterisk/asterisk_1.4.17.bb"
# from [060df18e986c1290e557ca7de184d66634bcb25a]
# to [2f04528dd5495d5de7fee0972edafd159d0453b6]
#
# patch "packages/bootsplash/bootsplash-native_3.0.7.bb"
# from [1c8a7f14c344e82b1663dacc32d4c29763ff29af]
# to [c428a0ad6f6c5fca5e91efdc78aac5d6ca5234ec]
#
# patch "packages/findutils/findutils_4.2.29.bb"
# from [0bc78266cc3e6188b14e673728b00f4816ca45e4]
# to [484641642c9075f098198e29a57416b0b574e8f9]
#
# patch "packages/free42/free42-vga_1.4.41.bb"
# from [affee0392f2e9a5336abf00c6e4fd71d74c796cc]
# to [a6ade0fcdd09478ecb22e8612d24fa99a5c986c6]
#
# patch "packages/gpgme/gpgme_1.0.0.bb"
# from [7978b9104f64bbd0b63042b1a4fc315f08891292]
# to [4efb9b2188257cb57c38b41a4054c273d6d32d3c]
#
# patch "packages/gpgme/gpgme_1.0.3.bb"
# from [7978b9104f64bbd0b63042b1a4fc315f08891292]
# to [4efb9b2188257cb57c38b41a4054c273d6d32d3c]
#
# patch "packages/gpgme/gpgme_1.1.4.bb"
# from [aa0b3ea4aaa3d040cf4f1e567928d0281dc5af64]
# to [1945518e229ff69cc0f28fb3a1f516569ff9d592]
#
# patch "packages/gpsdrive/gpsdrive_2.10pre2.bb"
# from [93bb980156ef9b9d196e0009f4a6380e9eaa5133]
# to [29a714e888f2ef1c714628caa9619d49cfc6609b]
#
# patch "packages/gpsdrive/gpsdrive_2.10pre3.bb"
# from [e63780f5ca196c284339d860c6e30e64fa95b65e]
# to [fd9c716c886a1f0c00d776ff46083b8cc5c6efea]
#
# patch "packages/initrdscripts/initramfs-kexec_1.0.bb"
# from [c0bc8bdffc0333010b2a64f38e16d9a659238fb0]
# to [477745f4ed2bfacec7191d1080a2179b9f2c159c]
#
# patch "packages/kdepimpi/files/gcc4.patch"
# from [9c22584bb814e5705d876893fe2ee14cc2f0c0d1]
# to [3dd0dae28378e4b37ab861d9f4466ca8d3b81a66]
#
# patch "packages/kdepimpi/files/gcc42.patch"
# from [af202c7b5a77e0f373d182f75dd9ef7763999d40]
# to [1611592b765e4ebc647e6a65fadbff25317aa9b4]
#
# patch "packages/kdepimpi/files/qt-mt.patch"
# from [f1a89c48541638d944a9512dd87c6ca9aa3f7cd5]
# to [2c163b14fff434b1bc2ab67ddbd7cad79839e45f]
#
# patch "packages/kexec/kexec-tools-static_1.101.bb"
# from [674c9eaf4fafd6d5c38088e0bc02792ec9389d12]
# to [d0f22ab3acf2088a1f8f5c9d8c236df7ab851083]
#
# patch "packages/kexec/kexec-tools.inc"
# from [46447a70d4c5e42a305dc4920a1a924741867aca]
# to [26f7178b5fe7c56ce1096f1c04aa5e25320a6474]
#
# patch "packages/kexec/kexec-tools_1.101.bb"
# from [1d9c587e836f1b4b6071adcc2a9f6b91314468d5]
# to [99597c038f5dd47567309c34f3eefbecd95e5ad1]
#
# patch "packages/klibc/klibc-common.inc"
# from [ba81140300a9fbe13c2d1ef4661b42a4368a3b88]
# to [e31a6c551a6ead6e8029e2b0f4cb5117dcf1677f]
#
# patch "packages/klibc/klibc-utils-static_1.5.bb"
# from [0aeaa25067f4778c45bbbd7ec34c5031db9f1f12]
# to [712cc1a9eaaf4de058b8926a6f376e589d0c865c]
#
# patch "packages/klibc/klibc.inc"
# from [cdee53d9d84aed0197c588fae6119d3f6701904c]
# to [53e4f37f521ba3c1a20198a13faa8a95f2f812b8]
#
# patch "packages/klibc/klibc_1.5.bb"
# from [d52cd890178b463fedaaf708ec6a0221604c1c9c]
# to [8afd19f9d2e288ae6198fe88d8c74fb36aa9b9b3]
#
# patch "packages/libxine/libxine-fb_1.0.bb"
# from [73dffac6b8f7d07e4dd71ef60094a9809767d703]
# to [fc3151974c5c92881b17578858d24c3c289d8045]
#
# patch "packages/libxine/libxine-x11_1.0.bb"
# from [047dae9a9fb304d0b88425d4f80a45fd14b4e21b]
# to [01225d1ca79203a58650f9705e2013e16dac5c7c]
#
# patch "packages/libxine/libxine_1.1.0.bb"
# from [c1680bf135560557cf801665aa00e1f00619e237]
# to [9e74c0987d37d121a526263edde2a00ba2d26764]
#
# patch "packages/mozilla/firefox.inc"
# from [ce3d32af7c35197aad91f186be895b364ae58f9b]
# to [2b8653e70c8128f0b821b235f2f0e1fbcc2c8779]
#
# patch "packages/mozilla/firefox_1.0.7.bb"
# from [a8138fce8dfb4fd4ec448e058aecd870575ede96]
# to [f02c0cc9b745dd1b59e3c6948bcb6049880a2178]
#
# patch "packages/mozilla/firefox_2.0.0.3.bb"
# from [0ee74a5aef3cee4364cdc98fcb62c10891e384a5]
# to [9f6ce8af3b3e82e5889f640c7552aed39d0fd930]
#
# patch "packages/prismstumbler/prismstumbler_0.7.3+0.7.4pre1.bb"
# from [2853cbcd850a08bb25348843fd824ec14dda114e]
# to [be915c43601a85e473bfe81da31c8f2179696358]
#
# patch "packages/prismstumbler/prismstumbler_0.7.3.bb"
# from [7c95fdc5aaf6ba665f6546669d9d8c50e2ebc896]
# to [5e07eff37ac1acddc5f9e7b7094acc7b186aa792]
#
# patch "packages/rdesktop/rdesktop_1.3.1.bb"
# from [123c0963c930eec872198d019f1cf1e48eecccf0]
# to [546d9776aaef7f0a511f8a28671dc0a592278cdb]
#
# patch "packages/rdesktop/rdesktop_1.4.1.bb"
# from [a9ab28ff03d914badd10a000f082d6b5351d7abc]
# to [cef9fbbda34cd8ffc2e16eb427b9930989d5121b]
#
# patch "packages/rdesktop/rdesktop_1.5.0.bb"
# from [8168a10aad2470f1e81cde1b8e148b7691e31cb3]
# to [9e4ba7c6bb11cf1c69cc758bdc43b1dd521ba1fd]
#
# patch "packages/subversion/subversion_1.3.1.bb"
# from [6ff7966e96664ef304c72446fb0683610329c0ab]
# to [fc6b3bacecb3d0e9c501b4769a2b8939cb5c0e83]
#
# patch "packages/subversion/subversion_1.4.0.bb"
# from [f9692d80ac97a59fd09b120d0154ab76bc2babb8]
# to [4015c57dfaaf676b54913d1b5d95c71294ef8219]
#
# patch "packages/subversion/subversion_1.4.3.bb"
# from [74cb237892d32ea834e0050c19f66293c1457d23]
# to [d5f16acf511f297993077ccb53ec969f0d3cf6b1]
#
# patch "packages/subversion/subversion_1.4.5.bb"
# from [680bf01cbd49adaec6a24e728327d7aec6fbaa94]
# to [b3247341e42924a7030a8993469f0c0eddeae7cd]
#
# patch "packages/tcltk/tcl_8.4.11.bb"
# from [936521409ee1bef59ddfec2b66559dfbe0af75b1]
# to [477bbc80abd0d76169279a046fc8b4231975f550]
#
# patch "packages/u-boot/u-boot-openmoko_svn.bb"
# from [cc49be056ab89c25407b8dbef14a32c86fca227f]
# to [2feeb29fabb3786b6eea52cabe765729f2ab5568]
#
# patch "packages/uclibc/elf2flt_svn.bb"
# from [376f3f2ab831cad1d7e4af6fdbc4d054ce873500]
# to [5e4764fa17f04ac0f68f4e90559919814f21f2e0]
#
# patch "packages/xmms-embedded/xmms-embedded_20040327.bb"
# from [03a2dbf2670c2ab7fb9f8c7f99f6b5453b7ad33e]
# to [fa97c83984b56db433bad80d69a6a49429af862a]
#
# patch "packages/xorg-app/mkbold-mkitalic-native_0.11.bb"
# from [b1aea18de213f27a02dd941931cb2b273cdc0922]
# to [112bcd39c5d948f13628b2b335a99e2160820e48]
#
============================================================
--- packages/gpgme/gpgme.inc b13cccb8a5bee784f86c9e8c266b18f6ca87022b
+++ packages/gpgme/gpgme.inc b13cccb8a5bee784f86c9e8c266b18f6ca87022b
@@ -0,0 +1,27 @@
+DESCRIPTION = "GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG easier for applications"
+HOMEPAGE = "http://www.gnupg.org/gpgme.html"
+LICENSE = "GPL"
+DEPENDS = "libgpg-error pth libassuan"
+
+SRC_URI = "ftp://ftp.gnupg.org/gcrypt/gpgme/gpgme-${PV}.tar.gz"
+
+EXTRA_OECONF = "--with-pth=${STAGING_DIR}/${HOST_SYS} --without-pth-test --with-gpg=${bindir}/gpg --without-gpgsm"
+
+LEAD_SONAME = "libgpgme.so"
+
+inherit autotools binconfig
+
+do_stage() {
+ autotools_stage_includes
+
+ install -d ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme-pth ${STAGING_LIBDIR}
+ oe_libinstall -C gpgme -so libgpgme-pthread ${STAGING_LIBDIR}
+
+ install -d ${STAGING_DATADIR}/aclocal
+ install -m 0644 gpgme/gpgme.m4 ${STAGING_DATADIR}/aclocal/
+}
+
+FILES_${PN} = "${libdir}/libgpgme*.so.*"
+FILES_${PN}-dev += "${bindir}/gpgme-config"
============================================================
--- packages/kdepimpi/kdepimpi-qte.inc fb2614dc19c44fd71119ef6be827e9c62c67b057
+++ packages/kdepimpi/kdepimpi-qte.inc fb2614dc19c44fd71119ef6be827e9c62c67b057
@@ -0,0 +1,163 @@
+DESCRIPTION = "KDE-Pim Platform Independent - port of KDE Pim to PDA"
+DESCRIPTION_kopi = "Korganizer/PI is a powerful calendar and ToDo Tool"
+DESCRIPTION_kopi-applet = "KDE Pim/PI applet"
+DESCRIPTION_kapi = "KAddressbook/PI is a port of KDE addressbook"
+DESCRIPTION_libmicrokdelibs = "KDE Pim/PI library - microkde"
+DESCRIPTION_libmicrokcal = "KDE Pim/PI library - microkcal"
+DESCRIPTION_libmicrokabc = "KDE Pim/PI library - microkabc"
+DESCRIPTION_libmicrokammu = "KDE Pim/PI fork of libGammu"
+DESCRIPTION_kammu = "KDE Pim/PI fork of gammu"
+
+SECTION = "opie/pim"
+PRIORITY = "optional"
+LICENSE = "GPL"
+HOMEPAGE = "http://www.pi-sync.net/ http://sf.net/projects/kdepimpi/"
+MAINTAINER = "Marcin Juszkiewicz <openembedded at hrw.one.pl>"
+
+# we can't build:
+# kabc/plugins/sharpdtm - wants libsl (Sharp ROM 3.x closed source library)
+# kabc/plugins/ldap - wants ldap libs (?)
+# kabc/plugins/opie - wants libopie1 (we don't plan to have it in OE)
+# kmicromail - conflict with OE libetpan, libmailwrapper/OPIE
+
+PARALLEL_MAKE = ""
+
+S = "${WORKDIR}/kdepim"
+
+EXTRA_QMAKEVARS_POST += " \
+INCLUDEPATH+=../ \
+OBJECTS_DIR=obj/ MOC_DIR=moc/ \
+DESTDIR=${S}/dest \
+LIBS+=-L${S}/dest/ \
+LIBS-=-lzlib \
+LIBS+=-lz \
+"
+# That changes will be needed for KMicroMail/PI to get it build with OE libs
+#
+# LIBS-=-lkmicromailwrapper LIBS+=-lmailwrapper LIBS+=-lopiecore2 \
+
+QMAKE_PROFILES= "all.pro"
+
+SUBDIRS="qtcompat libical/src/libical libical/src/libicalss microkde libkcal libkdepim \
+ kabc korganizer kalarmd kaddressbook kabc/plugins/file kabc/plugins/dir \
+ kabc/formats/binary kabc/plugins/qtopia \
+ gammu/emb/common \
+ gammu/emb/gammu \
+# pwmanager/libcrypt/mpi \
+# pwmanager/libcrypt/error \
+# pwmanager/libcrypt/cipher \
+# pwmanager/libcrypt/zlib \
+# pwmanager/pwmanager \
+ "
+
+inherit palmtop
+
+do_configure_prepend() {
+ mv ${S}/kabc/formats/binary/kabcformat_binaryE.pro ${S}/kabc/formats/binary/binaryE.pro
+ echo -e "TEMPLATE=subdirs\nSUBDIRS=${SUBDIRS}\n" >all.pro
+ for d in ${SUBDIRS}
+ do
+ if [ -f ${d}/`basename ${d}`E.pro ];
+ then
+ mv -f ${d}/`basename ${d}`E.pro ${d}/`basename ${d}`.pro
+ fi
+ done
+}
+
+do_compile() {
+ export KDEPIMDIR=${S}
+ oe_runmake
+}
+
+HEADERS_DIRS = "qtcompat \
+microkde \
+microkde/kdecore \
+microkde/kdeui \
+microkde/kio \
+microkde/kresources \
+microkde/kutils \
+microkde/opie2 \
+kabc \
+libkcal \
+libkdepim "
+
+do_unstage() {
+
+ for dir in ${HEADERS_DIRS};
+ do
+ rm -rf ${STAGING_INCDIR}/kdepimpi/$dir
+ done
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+ do
+ rm -f ${STAGING_LIBDIR}/kdepimpi/$f*
+ done
+}
+
+addtask unstage before do_configure
+
+do_stage() {
+
+ for dir in ${HEADERS_DIRS};
+ do
+ install -d ${STAGING_INCDIR}/kdepimpi/$dir
+ install -m 0644 ${S}/$dir/*.h ${STAGING_INCDIR}/kdepimpi/$dir/
+ done
+
+ for f in libmicrokde libmicrokdepim libmicrokabc libmicrokcal libmicroqtcompat
+ do
+ oe_libinstall -so -C ${S}/dest/ $f ${STAGING_LIBDIR}/kdepimpi/
+ done
+}
+
+do_install() {
+ install -d ${D}${palmtopdir}/bin \
+ ${D}${palmtopdir}/lib \
+ ${D}${palmtopdir}/apps/1Pim \
+ ${D}${palmtopdir}/pics/kdepim/korganizer/icons16 \
+ ${D}${palmtopdir}/pics/kdepim/korganizer/iconsmini \
+ ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons16 \
+ ${D}${palmtopdir}/pics/kdepim/kaddressbook/icons22 \
+ ${D}${palmtopdir}/plugins/applets
+
+ install -m 0644 ${S}/bin/kdepim/korganizer/ko16.png ${D}${palmtopdir}/pics/
+ install -m 0644 ${S}/bin/kdepim/korganizer/ko24.png ${D}${palmtopdir}/pics/
+ install -m 0644 ${S}/bin/kdepim/korgan%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list