[oe-commits] org.oe.dev merge of '9a0ea0926b71ceec737d423255d8fce2074cc8b7'
rwhitby commit
openembedded-commits at lists.openembedded.org
Sun Jul 8 07:58:07 UTC 2007
merge of '9a0ea0926b71ceec737d423255d8fce2074cc8b7'
and 'd09a058c828caa5cc998c14c1f6b4611136f07fe'
Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: ecca9e62d3b19e42cb09d54766c2633bb3023046
ViewMTN: http://monotone.openembedded.org/revision.psp?id=ecca9e62d3b19e42cb09d54766c2633bb3023046
Files:
1
packages/linux/fsg3-kernel_2.6.18.bb
conf/machine/fsg3be.conf
packages/opie-dvorak/files
packages/opie-keyboard/files
packages/ntp/ntp-4.2.2p3/tickadj.c.patch
packages/obexftp/files/iconv.patch
packages/opie-alarm/opie-alarm/dirdefines.patch
packages/opie-dvorak/files/fix-rpath.patch
packages/opie-keyboard/files/fix-rpath.patch
packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch
classes/opie.bbclass
packages/glibc/files/etc/ld.so.conf
packages/glibc/glibc-2.2.5/etc/ld.so.conf
packages/glibc/glibc-2.3.2/etc/ld.so.conf
packages/glibc/glibc-2.4/etc/ld.so.conf
packages/glibc/glibc-cvs/etc/ld.so.conf
packages/kdepimpi/kdepimpi-base.inc
packages/kdepimpi/kdepimpi_2.2.7.bb
packages/kdepimpi/pwmpi.inc
packages/konqueror/konqueror-embedded_20070212.bb
packages/ntp/ntp_4.2.2p3.bb
packages/obexftp/obexftp_0.20.bb
packages/opie-alarm/opie-alarm_cvs.bb
packages/opie-autorotateapplet/opie-autorotateapplet.inc
packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb
packages/opie-batteryapplet/opie-batteryapplet.inc
packages/opie-batteryapplet/opie-batteryapplet_cvs.bb
packages/opie-brightnessapplet/opie-brightnessapplet.inc
packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb
packages/opie-clipboardapplet/opie-clipboardapplet.inc
packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb
packages/opie-clockapplet/opie-clockapplet.inc
packages/opie-clockapplet/opie-clockapplet_cvs.bb
packages/opie-dvorak/opie-dvorak.inc
packages/opie-dvorak/opie-dvorak_cvs.bb
packages/opie-handwriting/opie-handwriting.inc
packages/opie-handwriting/opie-handwriting_cvs.bb
packages/opie-init/opie-init/opie
packages/opie-init/opie-init.inc
packages/opie-init/opie-init_1.2.2.bb
packages/opie-irdaapplet/opie-irdaapplet.inc
packages/opie-irdaapplet/opie-irdaapplet_cvs.bb
packages/opie-keyboard/opie-keyboard.inc
packages/opie-keyboard/opie-keyboard_cvs.bb
packages/opie-keyview/opie-keyview.inc
packages/opie-keyview/opie-keyview_cvs.bb
packages/opie-lockapplet/opie-lockapplet.inc
packages/opie-lockapplet/opie-lockapplet_cvs.bb
packages/opie-mailapplet/opie-mailapplet_cvs.bb
packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb
packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb
packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb
packages/opie-memoryapplet/opie-memoryapplet.inc
packages/opie-memoryapplet/opie-memoryapplet_cvs.bb
packages/opie-multikey/opie-multikey.inc
packages/opie-multikey/opie-multikey_cvs.bb
packages/opie-multikeyapplet/opie-multikeyapplet.inc
packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb
packages/opie-pcmciaapplet/opie-pcmciaapplet.inc
packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb
packages/opie-pickboard/opie-pickboard.inc
packages/opie-pickboard/opie-pickboard_cvs.bb
packages/opie-screenshotapplet/opie-screenshotapplet.inc
packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/opie-tinykate/opie-tinykate.inc
packages/opie-unikeyboard/opie-unikeyboard.inc
packages/opie-unikeyboard/opie-unikeyboard_cvs.bb
packages/opie-volumeapplet/opie-volumeapplet.inc
packages/opie-volumeapplet/opie-volumeapplet_cvs.bb
packages/qpf-fonts/files/update-qtfontdir
packages/qpf-fonts/qpf-font-common_1.0.bb
packages/tasks/task-base.bb
Diffs:
#
# mt diff -r9a0ea0926b71ceec737d423255d8fce2074cc8b7 -recca9e62d3b19e42cb09d54766c2633bb3023046
#
#
#
# add_file "packages/linux/fsg3-kernel_2.6.18.bb"
# content [ce39fe5171bf38acd7aea7c3116494648d56f9b4]
#
# patch "conf/machine/fsg3be.conf"
# from [614fcd1196db4ea73e6ea013cbc9b15381004779]
# to [0985b6fc93f5ebf67761f503ee5b6aaa1b35d3e2]
#
============================================================
--- packages/linux/fsg3-kernel_2.6.18.bb ce39fe5171bf38acd7aea7c3116494648d56f9b4
+++ packages/linux/fsg3-kernel_2.6.18.bb ce39fe5171bf38acd7aea7c3116494648d56f9b4
@@ -0,0 +1,22 @@
+# Kernel for Freecom FSG-3
+#
+# This bitbake file pulls patches and the defconfig straight
+# from the NSLU2-Linux SVN repository. Information about this
+# repository can be found at:
+# http://trac.nslu2-linux.org/kernel/
+#
+# The revision that is pulled from SVN is specified below
+IXP4XX_KERNEL_SVN_REV = "898"
+#
+# The directory containing the patches to be applied is
+# specified below
+IXP4XX_KERNEL_PATCH_DIR = "2.6.18-fsg3"
+#
+# Increment the number below (i.e. the digits after PR) when
+# the changes in SVN between revisions include changes in the
+# patches applied to the kernel, rather than simply defconfig
+# changes
+PR = "r1.${IXP4XX_KERNEL_SVN_REV}"
+
+require ixp4xx-kernel.inc
+require ixp4xx-kernel-svnpatch.inc
============================================================
--- conf/machine/fsg3be.conf 614fcd1196db4ea73e6ea013cbc9b15381004779
+++ conf/machine/fsg3be.conf 0985b6fc93f5ebf67761f503ee5b6aaa1b35d3e2
@@ -10,13 +10,14 @@ OVERRIDES = "local:${MACHINE}:ixp4xxbe:i
OVERRIDES = "local:${MACHINE}:ixp4xxbe:ixp4xx:${DISTRO}:${TARGET_OS}:${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
-require conf/machine/include/ixp4xx.conf
-
# Match the vendor's latest kernel
-PREFERRED_VERSION_ixp4xx-kernel = "2.6.18"
+PREFERRED_PROVIDER_virtual/kernel ?= "fsg3-kernel"
+PREFERRED_VERSION_fsg3-kernel = "2.6.18"
KERNEL_CCSUFFIX = "-3.4.4+csl-arm-2005q3"
PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "gcc-cross-kernel-3.4.4"
PREFERRED_VERSION_virtual/${TARGET_PREFIX}gcc-3.4.4+csl-arm-2005q3 = "csl-arm-2005q3"
+require conf/machine/include/ixp4xx.conf
+
# No room for jffs2 - the rootfs needs to be installed directly to disk
IMAGE_FSTYPES = "tar.gz"
#
# mt diff -rd09a058c828caa5cc998c14c1f6b4611136f07fe -recca9e62d3b19e42cb09d54766c2633bb3023046
#
#
#
# add_dir "packages/opie-dvorak/files"
#
# add_dir "packages/opie-keyboard/files"
#
# add_file "packages/ntp/ntp-4.2.2p3/tickadj.c.patch"
# content [494ebb057688fef34bcf767bad768b5563fe8cfe]
#
# add_file "packages/obexftp/files/iconv.patch"
# content [25e8a86e111c7a9bf5dea96abfd1ab46176c8e4c]
#
# add_file "packages/opie-alarm/opie-alarm/dirdefines.patch"
# content [18a87ea43ad331d054fcb78c95f6da867a9c7b2a]
#
# add_file "packages/opie-dvorak/files/fix-rpath.patch"
# content [80ef89fabf32f6bf724a517e2c8b182049a2faf7]
#
# add_file "packages/opie-keyboard/files/fix-rpath.patch"
# content [d6c5f3c1f91119af69f831b4f0105983131ce1cf]
#
# add_file "packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch"
# content [ea55d2e26ae2b028f7f4deb26fc7787b2ae9f059]
#
# patch "classes/opie.bbclass"
# from [441638d80c7d1595e6037940f20b24b8bca48ebd]
# to [3520a2c069712e9db8ce48af55f65b869bd6b9fd]
#
# patch "packages/glibc/files/etc/ld.so.conf"
# from [a5d9210c654a72300ca1f4297722dc4ff8ab1b4d]
# to [f121cfac68db7d77f815ba3ae19f4d0e9d71e9a9]
#
# patch "packages/glibc/glibc-2.2.5/etc/ld.so.conf"
# from [204927a34482cb8cd69c381809c20402b91ba993]
# to [f065f8c10cd9ceda936d9c0a894c74bd4fa43cc8]
#
# patch "packages/glibc/glibc-2.3.2/etc/ld.so.conf"
# from [204927a34482cb8cd69c381809c20402b91ba993]
# to [f065f8c10cd9ceda936d9c0a894c74bd4fa43cc8]
#
# patch "packages/glibc/glibc-2.4/etc/ld.so.conf"
# from [204927a34482cb8cd69c381809c20402b91ba993]
# to [f065f8c10cd9ceda936d9c0a894c74bd4fa43cc8]
#
# patch "packages/glibc/glibc-cvs/etc/ld.so.conf"
# from [204927a34482cb8cd69c381809c20402b91ba993]
# to [f065f8c10cd9ceda936d9c0a894c74bd4fa43cc8]
#
# patch "packages/kdepimpi/kdepimpi-base.inc"
# from [a7b42f098bd064fabb4acf4a0d6adaadf317e6c1]
# to [ede0b8f85fda46ba2efefb1270028763c8537951]
#
# patch "packages/kdepimpi/kdepimpi_2.2.7.bb"
# from [1812ef579a9511787f6477d94f929712b573e766]
# to [0349a4cb14b6823831790a11e39cfeff149c58a3]
#
# patch "packages/kdepimpi/pwmpi.inc"
# from [013d2bdf6810268ead46e33f3d49fb420335e642]
# to [6dde5a9e5862c767ecac6a5668097d76ed4c77fc]
#
# patch "packages/konqueror/konqueror-embedded_20070212.bb"
# from [69369052605125939c21fb95e60be4df696d1db9]
# to [4b7b9152573fa0cb5af1e59387644f90358278dc]
#
# patch "packages/ntp/ntp_4.2.2p3.bb"
# from [6101494a76d050c7b395badf7ba8e05640523149]
# to [18d53e60ac76e13f601d6679f6b944f33aba70c4]
#
# patch "packages/obexftp/obexftp_0.20.bb"
# from [c55f1af56071cfbe2fd0843c1abd7a675d5daae6]
# to [c9341b7a2f8d1c46e28b8c3722e4dcce91a91cb0]
#
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
# from [aadc0b4fc4280abbdfd3f206d4d8e240fbb48621]
# to [ab53754a45a99c30cb4df8437d42d73aad9d163e]
#
# patch "packages/opie-autorotateapplet/opie-autorotateapplet.inc"
# from [cf73bc38f4ac687c7ad443d3f6ad84725846ff00]
# to [c646d982da2a335ecc5b418a8aebb8c3b09801f3]
#
# patch "packages/opie-autorotateapplet/opie-autorotateapplet_cvs.bb"
# from [820b8d1820b477db9f80260976dfd0619cc15e3d]
# to [464cc26760b553797e59a43d5ae6fc1cab1c3287]
#
# patch "packages/opie-batteryapplet/opie-batteryapplet.inc"
# from [c78df99929597e8ec64fe74a1e8ae0070751cfc8]
# to [1444e913e204b40b5f1c935d424eb7da5e132a37]
#
# patch "packages/opie-batteryapplet/opie-batteryapplet_cvs.bb"
# from [ad94134a1a09fd3c6b301829d5aefa295e3f7b16]
# to [98834174646bca1009d2c5daecff0dc367e69088]
#
# patch "packages/opie-brightnessapplet/opie-brightnessapplet.inc"
# from [62de16971a1b48a77621ad4114ecde3f3d531152]
# to [15c8e1bdc6e1632784366b90cae5549d39907bee]
#
# patch "packages/opie-brightnessapplet/opie-brightnessapplet_cvs.bb"
# from [357dae7d139a82674e61fc590023e5dafda6b4ca]
# to [d0ce0a3066cf0ed6b578bdaa47957e8549a58c50]
#
# patch "packages/opie-clipboardapplet/opie-clipboardapplet.inc"
# from [a2fd4da60d76023937067d1bf162fd0d5ad5ae50]
# to [3ce21f73aa68c4fa51699a27e0c481cf50ff7347]
#
# patch "packages/opie-clipboardapplet/opie-clipboardapplet_cvs.bb"
# from [5f85267bdc44bc101b449251825a6d0c2f4d27f7]
# to [2f64025da464e3779ae8aa50766b345a668ed576]
#
# patch "packages/opie-clockapplet/opie-clockapplet.inc"
# from [2955c4bdf74243549278ab58f85a0bbe8e312305]
# to [5e613749b1afcf926560f357c8cd3fedd4cd4144]
#
# patch "packages/opie-clockapplet/opie-clockapplet_cvs.bb"
# from [2d71329701cc9d032cf6612fb4c94178275c70fc]
# to [2c069ebdc8d5d4a2da3c6bf31ea1ee857166ccf9]
#
# patch "packages/opie-dvorak/opie-dvorak.inc"
# from [9f6ea781f5c962c033391eb3677e734f930a4a0b]
# to [9f99624ce70248f0d6ece81420c6ca33021f42b0]
#
# patch "packages/opie-dvorak/opie-dvorak_cvs.bb"
# from [8f4ee9e171bf1cf5c4b42ea7c8fe1d7a88559220]
# to [b7e83e92b18dc1bb83c5c6f3f6c170e9f0e100e1]
#
# patch "packages/opie-handwriting/opie-handwriting.inc"
# from [b54050ecba304245cba311e24450b0928f6ecb44]
# to [d8cc03a760e3f477e46b2ca41c2060be51792b02]
#
# patch "packages/opie-handwriting/opie-handwriting_cvs.bb"
# from [3fe5acc760918d2967eb71f26a4a7c08b726f119]
# to [ba4eeb1e18966225dae4917b50f9a972d98130cd]
#
# patch "packages/opie-init/opie-init/opie"
# from [93b7f76dcb458b0a64b1675729ab077b8f12daf6]
# to [ebc43845a60caf99bac63f0ee8c562214647dee3]
#
# patch "packages/opie-init/opie-init.inc"
# from [d712bf62a00db9475cc0d6bc511012e02a6ae815]
# to [da1d91d206c32ff77ba2deaf8a1a89d534ef5545]
#
# patch "packages/opie-init/opie-init_1.2.2.bb"
# from [1780c7093e5c02aea9b70522d452841ba424f856]
# to [b0754cbb7d57493eac37a80949bab489ffddc0e1]
#
# patch "packages/opie-irdaapplet/opie-irdaapplet.inc"
# from [ee8b7dacb81e56a612b5c4aa8225ae8524b8e71d]
# to [06b5615d0710b0afba000b7a9d22c3bfbc219127]
#
# patch "packages/opie-irdaapplet/opie-irdaapplet_cvs.bb"
# from [1e718aff97398e878d897b20f3aeaaa65c1770a3]
# to [fd382bab0b18b6a59dcc5af4f3670033351e8f98]
#
# patch "packages/opie-keyboard/opie-keyboard.inc"
# from [e33f6839599638f3da65eb77597bd39b9805e53f]
# to [9aa5e2261617a930ad1c18040c026784a8a6f640]
#
# patch "packages/opie-keyboard/opie-keyboard_cvs.bb"
# from [b0d6785c582eedcd7e61fa81ce9425706b24c423]
# to [9598a6775d246bf310ac42f466b9847f35af1351]
#
# patch "packages/opie-keyview/opie-keyview.inc"
# from [54693c468b724c21e0c4c76a4b111c55ee4da0a7]
# to [a87f9ad688f57be5dc1aae440afd1fe9467916d6]
#
# patch "packages/opie-keyview/opie-keyview_cvs.bb"
# from [415d8e42e55cff8f8b725a8765d53960d8e22bda]
# to [9fc2c16264959ed377dd555aa4579fde8281508b]
#
# patch "packages/opie-lockapplet/opie-lockapplet.inc"
# from [a3bce711d4392238d77423b0be7c64f9623d3ccd]
# to [508b3ebdbbe5e0faeb5ec659b4230aecdb0c74d3]
#
# patch "packages/opie-lockapplet/opie-lockapplet_cvs.bb"
# from [fa851eef2cdd76b8e57d98e491d63ac0bfa3200b]
# to [8f1fcbdf63e68d952477dcea3e1c8d404f151a2c]
#
# patch "packages/opie-mailapplet/opie-mailapplet_cvs.bb"
# from [c5c5b76ccb080fa8526811d602f7e2015718092f]
# to [4ab069c546408679615dc745db720ead69960091]
#
# patch "packages/opie-mediaplayer1-libmadplugin/opie-mediaplayer1-libmadplugin_cvs.bb"
# from [75755bfb810095d7f5498c30f0d46c7ce86d142a]
# to [6045a18bba4a9fca7e8227e6742c0c8f5352b4b4]
#
# patch "packages/opie-mediaplayer1-libtremorplugin/opie-mediaplayer1-libtremorplugin_cvs.bb"
# from [d9ddcb03e334c7d37177403db08c4bd66dbfbef2]
# to [2f6b1f689e924424711365d6f8f0ffdc344618e1]
#
# patch "packages/opie-mediaplayer1-libwavplugin/opie-mediaplayer1-libwavplugin_cvs.bb"
# from [645e9dc38053130db29f7504b41af4031a60fe3b]
# to [e47267b95c4e2d7989c4e8c7d14a41af34693522]
#
# patch "packages/opie-memoryapplet/opie-memoryapplet.inc"
# from [fc5a56625301e91dc9a73ff7a037f1772e004733]
# to [3c8a7e8008438cd18402f840d91044f7501a40e5]
#
# patch "packages/opie-memoryapplet/opie-memoryapplet_cvs.bb"
# from [df114946aa3e1e4ea7037cc3a08d79c9067c2e10]
# to [971e9aae06edd1bf142fc3ba0d7eb38f976893fa]
#
# patch "packages/opie-multikey/opie-multikey.inc"
# from [2dad10b917e9192a7bdd78f73d7250ba8c38c55d]
# to [e11157e9e56aa7d2276ed24630b572e8243416f0]
#
# patch "packages/opie-multikey/opie-multikey_cvs.bb"
# from [eeeb85a14c02e906b881fe457e35e8b763c7a532]
# to [b7e2ee6d6fca8ec45a55a26fbf1c26212279c1bd]
#
# patch "packages/opie-multikeyapplet/opie-multikeyapplet.inc"
# from [e70415e140b696bdb5ca4da6ed54c385d2b32592]
# to [09bb10c4b09349989c8d3c58b53daea34b79775e]
#
# patch "packages/opie-multikeyapplet/opie-multikeyapplet_cvs.bb"
# from [a21ecb9655edf8c806e731b7b68481a0de0b8f03]
# to [f862114a2d0ebd4cf8a3f9209be2d1b27e1869e5]
#
# patch "packages/opie-pcmciaapplet/opie-pcmciaapplet.inc"
# from [4eb576754d7724b7e10d0815d6241014f715fffc]
# to [c4fb00be47680dfd9c107f36dcdf6cc0d8251993]
#
# patch "packages/opie-pcmciaapplet/opie-pcmciaapplet_cvs.bb"
# from [26537db0865959e51a2d042dbbdbe1fc065687fc]
# to [30d3e68e5d94babaaef208cef2e5d2cd78c039d9]
#
# patch "packages/opie-pickboard/opie-pickboard.inc"
# from [6c3348bebba171cf6a821b2dc53aee06cabc933e]
# to [a1dda378c833453ad71b6ecfe8526eac4b5b22b2]
#
# patch "packages/opie-pickboard/opie-pickboard_cvs.bb"
# from [bf9f080733292ca5b8f2f33b0b1e343d77eea012]
# to [e496e63e15c6604e194971f17897e6bc661e48cd]
#
# patch "packages/opie-screenshotapplet/opie-screenshotapplet.inc"
# from [448165938e51d35a48d3ee57b742f724edd8db0e]
# to [7fdcbc0fdca9fdcbf8e7ab9a3e4b06da90f793c1]
#
# patch "packages/opie-screenshotapplet/opie-screenshotapplet_cvs.bb"
# from [ba177df0b9d2b509edc102817d8617a5372629d9]
# to [abc18809d885ca6f6a712a784ffc9497b88136de]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [6ab03fd59add9cd0437b756d1e8d70378db9023c]
# to [a271a76cff4b213a30069374a7c367ba10d00d16]
#
# patch "packages/opie-tinykate/opie-tinykate.inc"
# from [c12614ddbe5c9e9a8ae68eaf37689b6d51639795]
# to [d1330e8b584ba8267e1805282644b1adab3d3f61]
#
# patch "packages/opie-unikeyboard/opie-unikeyboard.inc"
# from [53d0322da06fde15299a1712f9891f40a4a49fd5]
# to [f4f05d80d4385e33ad35f9d6f93362f7e8cf3154]
#
# patch "packages/opie-unikeyboard/opie-unikeyboard_cvs.bb"
# from [1b8595a897cbc0a08d0090f3853e446efbd4cbb5]
# to [50f680b33494ba660dee7ea849305369b6b5c196]
#
# patch "packages/opie-volumeapplet/opie-volumeapplet.inc"
# from [b3dd53cdcf8f7f06ed2a95df93d5f4703a146f34]
# to [304c790006e6607adce30c1edce2ddf982372623]
#
# patch "packages/opie-volumeapplet/opie-volumeapplet_cvs.bb"
# from [01a7fc1c3a3b0b8094a0379a6ff1190a6fc4fb8e]
# to [2880176909b492f80b4ccf3a92bcf1482bfb1862]
#
# patch "packages/qpf-fonts/files/update-qtfontdir"
# from [0ffc203708c8b47f49fbcfcb74224e88592a5825]
# to [5c709c3939225b46257facf90d34ee9cb46c7d8f]
#
# patch "packages/qpf-fonts/qpf-font-common_1.0.bb"
# from [bec271059e6ea98a8f1c3b63644f7f3f17eee110]
# to [c89270e85a0fe6989f90dbd638f36e2b07d62343]
#
# patch "packages/tasks/task-base.bb"
# from [6b16edd2133933a5f4f6922ccb991374fbed6a1a]
# to [8063e1b226de759fef34b1a23b3845f05b89bb7c]
#
============================================================
--- packages/ntp/ntp-4.2.2p3/tickadj.c.patch 494ebb057688fef34bcf767bad768b5563fe8cfe
+++ packages/ntp/ntp-4.2.2p3/tickadj.c.patch 494ebb057688fef34bcf767bad768b5563fe8cfe
@@ -0,0 +1,32 @@
+Index: ntp-4.2.2p3-r0/ntp-4.2.2p3/util/tickadj.c
+===================================================================
+--- ntp-4.2.2p3/util/tickadj.c 2004-02-25 06:58:33.000000000 +0100
++++ ntp-4.2.2p3/util/tickadj.c 2007-07-07 01:00:54.000000000 +0200
+@@ -21,7 +21,8 @@
+ # include <unistd.h>
+ #endif /* HAVE_UNISTD_H */
+
+-#ifdef HAVE___ADJTIMEX /* Linux */
++/* proper handling here has been moved to upstream ntp bugzilla */
++#ifdef linux
+
+ #include <sys/timex.h>
+ struct timex txc;
+@@ -91,7 +92,7 @@
+ }
+
+ if (!errflg) {
+- if (__adjtimex(&txc) < 0)
++ if (adjtimex(&txc) < 0)
+ perror("adjtimex");
+ else if (!quiet)
+ printf("tick = %ld\ntick_adj = %d\n",
+@@ -146,7 +147,7 @@
+ #endif
+ }
+
+- if (__adjtimex(&txc) < 0)
++ if (adjtimex(&txc) < 0)
+ {
+ perror("adjtimex");
+ }
============================================================
--- packages/obexftp/files/iconv.patch 25e8a86e111c7a9bf5dea96abfd1ab46176c8e4c
+++ packages/obexftp/files/iconv.patch 25e8a86e111c7a9bf5dea96abfd1ab46176c8e4c
@@ -0,0 +1,24 @@
+--- obexftp-0.20/obexftp/Makefile.am 2007-06-27 20:33:20.000000000 +0200
++++ obexftp-0.20/obexftp/Makefile.am 2007-06-27 20:35:05.000000000 +0200
+@@ -4,12 +4,6 @@
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/includes
+
+-LDADD = @OPENOBEX_LIBS@
+-# @BLUETOOTH_LIBS@ \
+-# @USB_LIBS@ \
+-# ../multicobex/libmulticobex.la \
+-# ../bfb/libbfb.la
+-
+ obexftpincludedir = $(includedir)/obexftp
+
+ libobexftp_la_SOURCES = object.c object.h \
+@@ -23,6 +17,8 @@
+ uuid.h \
+ object.h
+
++libobexftp_la_LIBADD = @OPENOBEX_LIBS@ @LIBICONV@
++
+ libobexftp_la_LDFLAGS = -version-info $(OBEXFTP_VERSION)
+
+ EXTRA_DIST = client.i
============================================================
--- packages/opie-alarm/opie-alarm/dirdefines.patch 18a87ea43ad331d054fcb78c95f6da867a9c7b2a
+++ packages/opie-alarm/opie-alarm/dirdefines.patch 18a87ea43ad331d054fcb78c95f6da867a9c7b2a
@@ -0,0 +1,21 @@
+diff --git a/opiealarm.c b/opiealarm.c
+index 422865c..b948ef2 100644
+--- a/opiealarm.c
++++ b/opiealarm.c
+@@ -367,13 +367,13 @@ int resume ( int resuspend )
+
+ setenv ( "LOGNAME", "root", 1 );
+ setenv ( "HOME", "/root", 1 );
+- setenv ( "LD_LIBRARY_PATH", "/opt/QtPalmtop/lib", 1 );
+- setenv ( "QTDIR", "/opt/QtPalmtop", 1 );
++ setenv ( "LD_LIBRARY_PATH", OPIE_LIBDIR, 1 );
++ setenv ( "QTDIR", OPIE_QTDIR, 1 );
+
+ remove_pidfile ( );
+
+ // no need for system() since this process is no longer useful anyway
+- execv ( "/opt/QtPalmtop/bin/qcop", argv );
++ execv ( OPIE_BINDIR "/qcop", argv );
+
+ perror ( "exec for qcop failed" );
+ return 5;
============================================================
--- packages/opie-dvorak/files/fix-rpath.patch 80ef89fabf32f6bf724a517e2c8b182049a2faf7
+++ packages/opie-dvorak/files/fix-rpath.patch 80ef89fabf32f6bf724a517e2c8b182049a2faf7
@@ -0,0 +1,13 @@
+diff --git a/dvorak.pro b/dvorak.pro
+index b659ab5..c1cf861 100644
+--- a/dvorak.pro
++++ b/dvorak.pro
+@@ -9,7 +9,7 @@ DESTDIR = ../../plugins/inputmethods
+ INCLUDEPATH += $(OPIEDIR)/include
+ DEPENDPATH += ../../launcher
+ LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
+-QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
++QMAKE_LFLAGS += -Wl,-rpath,${palmtopdir}/plugins/inputmethods
+ VERSION = 1.0.0
+
+ include( $(OPIEDIR)/include.pro )
============================================================
--- packages/opie-keyboard/files/fix-rpath.patch d6c5f3c1f91119af69f831b4f0105983131ce1cf
+++ packages/opie-keyboard/files/fix-rpath.patch d6c5f3c1f91119af69f831b4f0105983131ce1cf
@@ -0,0 +1,13 @@
+diff --git a/keyboard.pro b/keyboard.pro
+index 3a9e075..52bc10d 100644
+--- a/keyboard.pro
++++ b/keyboard.pro
+@@ -9,7 +9,7 @@ DESTDIR = ../../plugins/inputmethods
+ INCLUDEPATH += $(OPIEDIR)/include
+ DEPENDPATH += ../../launcher
+ LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard
+-QMAKE_LFLAGS += -Wl,-rpath,/opt/QtPalmtop/plugins/inputmethods
++QMAKE_LFLAGS += -Wl,-rpath,${palmtopdir}/plugins/inputmethods
+ VERSION = 1.0.0
+
+ include( $(OPIEDIR)/include.pro )
============================================================
--- packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch ea55d2e26ae2b028f7f4deb26fc7787b2ae9f059
+++ packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch ea55d2e26ae2b028f7f4deb26fc7787b2ae9f059
@@ -0,0 +1,12 @@
+diff --git a/serverapp.cpp b/serverapp.cpp
+index 0e92040..b933340 100644
+--- a/serverapp.cpp
++++ b/serverapp.cpp
+@@ -763,6 +763,7 @@ void ServerApplication::restart()
+ for ( int fd = 3; fd < 100; fd++ )
+ close( fd );
+ execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL );
++ execl( OPIE_BINDIR "/qpe", "qpe", NULL );
+ exit( 1 );
+ #endif
+ }
============================================================
--- classes/opie.bbclass 441638d80c7d1595e6037940f20b24b8bca48ebd
+++ classes/opie.bbclass 3520a2c069712e9db8ce48af55f65b869bd6b9fd
@@ -21,7 +21,8 @@ DEPENDS_prepend = "${@["l%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list