[oe-commits] org.oe.dev merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'
hrw commit
openembedded-commits at lists.openembedded.org
Thu Jul 5 17:06:59 UTC 2007
merge of '6ecc6574ba0db38196a290448aaaf3706bcacee3'
and '7314baf01ff720449ddb034e256e260501df588f'
Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: c7b00a5a1f451becbb37d892f30c9dca3e0a9068
ViewMTN: http://monotone.openembedded.org/revision.psp?id=c7b00a5a1f451becbb37d892f30c9dca3e0a9068
Files:
1
packages/bluez/bluez-utils/02dtl1_cs.sh
packages/opie-init/opie-init/c7x0/opie
packages/opie-init/opie-init/mnci/opie
packages/bluez/bluez-dtl1-workaround_1.0.bb
packages/opie-multikey/files/fix-rpath.patch
packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch
packages/uclibc/files/errno_values.h.patch
packages/uclibc/files/termios.h.patch
packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb
classes/kernel.bbclass
classes/opie.bbclass
classes/palmtop.bbclass
conf/bitbake.conf
conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
conf/machine/h2200.conf
packages/bluez/bluez-utils.inc
packages/bluez/bluez-utils_3.11.bb
packages/bluez/bluez-utils_3.12.bb
packages/bluez/bluez-utils_3.4.bb
packages/bluez/bluez-utils_3.7.bb
packages/bluez/bluez-utils_3.8.bb
packages/glib-2.0/glib-2.0_2.12.12.bb
packages/glib-2.0/glib.inc
packages/gpephone/xoo-vm_0.7-20070204.bb
packages/gtkmm/gtkmm.inc
packages/libopie/libopie2.inc
packages/libopie/libopie2_cvs.bb
packages/libopietooth/libopietooth1.inc
packages/libopietooth/libopietooth1_cvs.bb
packages/libqpe/libqpe-opie.inc
packages/libqpe/libqpe-opie_cvs.bb
packages/libqtaux/libqtaux2.inc
packages/linux/linux-rp_2.6.21.bb
packages/linux/linux-x86-2.6.20/i486-defconfig
packages/linux/linux-x86_2.6.20.bb
packages/opie-alarm/opie-alarm/01opiealarm
packages/opie-alarm/opie-alarm.inc
packages/opie-alarm/opie-alarm_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-multikey/opie-multikey_cvs.bb
packages/opie-networksettings/opie-networksettings.inc
packages/opie-networksettings/opie-networksettings_cvs.bb
packages/opie-qcop/opie-qcop.inc
packages/opie-qcop/opie-qcop_cvs.bb
packages/opie-qss/opie-qss.inc
packages/opie-qss/opie-qss_cvs.bb
packages/opie-quicklauncher/opie-quicklauncher.inc
packages/opie-quicklauncher/opie-quicklauncher_cvs.bb
packages/opie-taskbar/opie-taskbar.inc
packages/opie-taskbar/opie-taskbar_cvs.bb
packages/opie-ttf-support/opie-ttf-support_1.1.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
packages/tasks/task-base.bb
packages/uclibc/uclibc_0.9.29.bb
packages/udev/udev_092.bb
packages/udev/udev_097.bb
packages/udev/udev_100.bb
contrib/feed-browser/includes/functions.inc
contrib/feed-browser/index.php
contrib/feed-browser/update.php
Diffs:
#
# mt diff -r6ecc6574ba0db38196a290448aaaf3706bcacee3 -rc7b00a5a1f451becbb37d892f30c9dca3e0a9068
#
#
#
# delete "packages/bluez/bluez-utils/02dtl1_cs.sh"
#
# delete "packages/opie-init/opie-init/c7x0/opie"
#
# delete "packages/opie-init/opie-init/mnci/opie"
#
# add_file "packages/bluez/bluez-dtl1-workaround_1.0.bb"
# content [4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f]
#
# add_file "packages/opie-multikey/files/fix-rpath.patch"
# content [c1275cf0c3e1eac9898ee5c1bb9b3ff0ba0f0486]
#
# add_file "packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch"
# content [3149f72c0600716f90b9ece4df7300b28f3c5dee]
#
# add_file "packages/uclibc/files/errno_values.h.patch"
# content [449baeeb6e48f88f75f07d09cdee9bd3ffcba48e]
#
# add_file "packages/uclibc/files/termios.h.patch"
# content [a49212a1ef49d0a938f6687ab867600f05b3f1a4]
#
# add_file "packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb"
# content [97dfedad01f8662328b1032c806286a00f75caa0]
#
# patch "classes/kernel.bbclass"
# from [b3df4a5e97f27bbbdeedf06373b1f8a115c48333]
# to [2e82e59b9e169550dbe74e03b862098d7257369f]
#
# patch "classes/opie.bbclass"
# from [2653571d91e93ff5043997740e80656344ad35d8]
# to [441638d80c7d1595e6037940f20b24b8bca48ebd]
#
# patch "classes/palmtop.bbclass"
# from [47dee0d1bcbc560241a59d1d1689a90ca8e37b3f]
# to [56d2e8dc703cfb39ea14ec0fc013546fcd6a20bb]
#
# patch "conf/bitbake.conf"
# from [4481b02aa24ad52f996889ffadf4f12e9912c116]
# to [28be7aa3c03959211fa8fff38d1903e1ec2dd8de]
#
# patch "conf/distro/include/preferred-opie-versions-1.2.3-pre.inc"
# from [5f9b174bd679d8f5b634fdcde2cddde0853a9369]
# to [5045ef2e767e1eb852ad651743f8406528e34237]
#
# patch "conf/machine/h2200.conf"
# from [06be039ceb7fc91de15ca6a3389483ee6372798f]
# to [ff1f7205bab8be68726927066f32d2c9dbc19f32]
#
# patch "packages/bluez/bluez-utils.inc"
# from [41deef17c0f5dace32506f5702ea35539c41bff6]
# to [13716750ab0571681b9e8449ea1ce394c881897e]
#
# patch "packages/bluez/bluez-utils_3.11.bb"
# from [4af7630dc6fbe7919102fbb2e9e88a08b5ef7b10]
# to [0b6adc1cba101361b308c4adcb33d6ec603c6be6]
#
# patch "packages/bluez/bluez-utils_3.12.bb"
# from [c9a40ce5190424b1ede28c8cc855bb8d094a3186]
# to [bff8a6de03a41e1f81fd85fc8e43f72ae0ccc458]
#
# patch "packages/bluez/bluez-utils_3.4.bb"
# from [6e23c5824e702fbbaab762244716ebfd9bcdcc4b]
# to [4bef33e5c1517513f7fef04b79b32f580b615259]
#
# patch "packages/bluez/bluez-utils_3.7.bb"
# from [7644ffe67fd0cf94cfed472498a4263e024d4de3]
# to [997459c635cbd92f7c2b398e5962dd23bf5c9623]
#
# patch "packages/bluez/bluez-utils_3.8.bb"
# from [dd085c7f50957785f015790ff90f72a6eab37cf1]
# to [4bef33e5c1517513f7fef04b79b32f580b615259]
#
# patch "packages/glib-2.0/glib-2.0_2.12.12.bb"
# from [2816061c0061c8373ee760be7e88620e243cbc2a]
# to [030996100e8c5110ee7690dae2a49a7cef321ecf]
#
# patch "packages/glib-2.0/glib.inc"
# from [07cceb9af55dc0d2d4fe2a1e1889a66327fdc4c8]
# to [09c2d1615f7c249f8ab1c68778bafbc98293ff6b]
#
# patch "packages/gpephone/xoo-vm_0.7-20070204.bb"
# from [5228f8e9c69a2d20caea19ae8d355fdf2a5295bb]
# to [75d7ab96fd0fb00311b37907ddb10da84d8bef4e]
#
# patch "packages/gtkmm/gtkmm.inc"
# from [5daa50929bf91d353c37e24808bdcf6ffe37866c]
# to [c99e2e2f13acddd410f35d4c40468e00186e71fb]
#
# patch "packages/libopie/libopie2.inc"
# from [1473fa57b6e31b62c32c3f467f79fb57b52dc658]
# to [46a70b5412163b8031b130f39a8726cfbb93dd6b]
#
# patch "packages/libopie/libopie2_cvs.bb"
# from [66b355cdaf0863882ba11282e95ea14ad73da233]
# to [5bb0e0ab2a48fe329bb2f0f14bf1d5f9e3b8af87]
#
# patch "packages/libopietooth/libopietooth1.inc"
# from [c21cf9e9a7e0dea60da73327864bd21d66ad8e8a]
# to [e59ef172e1966dd379dcb4b605c11edc65d8ba97]
#
# patch "packages/libopietooth/libopietooth1_cvs.bb"
# from [d5762ce00b24d296f0b7f5a2706bea8fc623480e]
# to [4b37cb3e703e6e899c9ae8fe5bd1ac58dbbb0147]
#
# patch "packages/libqpe/libqpe-opie.inc"
# from [3346fde77506aea54b8d7d57c5fe1dcae017a6ca]
# to [c1bd05f4b3fca2a8fb673bea16b9192a4c6a1dc3]
#
# patch "packages/libqpe/libqpe-opie_cvs.bb"
# from [f96cc1aefe160f38dd0536ab17ca7a8896d39937]
# to [66eb84a06f4f226608fdaccbcc077ac5fb2e540e]
#
# patch "packages/libqtaux/libqtaux2.inc"
# from [5250f41cd924ff8df098caa6a7e0729af80c2553]
# to [0c427ee2ab568405ca1b63c3b4c07177b5963b94]
#
# patch "packages/linux/linux-rp_2.6.21.bb"
# from [a52ed332d359bc91a192a08cf926d94a67787424]
# to [cbbdd4376b6cb43e5460b02f28a25c2a29323db7]
#
# patch "packages/linux/linux-x86-2.6.20/i486-defconfig"
# from [eaeef6226e5d7f2bff7c3cadede34d438f45330a]
# to [cff3c0080167dd8eefe97ec8f9ba2f6e1b60269d]
#
# patch "packages/linux/linux-x86_2.6.20.bb"
# from [0f6a1d20b4dcd3f8f28bcd7434bd8c778f6494de]
# to [3221d944ae3c2cbf3030007c7cc3d0ac8f0ff3f0]
#
# patch "packages/opie-alarm/opie-alarm/01opiealarm"
# from [f4c0fab007d8b54c9b69608c97748164b7fdcd10]
# to [f904dc9959b3d5118cc391b82d0fd5d5ff16ffc2]
#
# patch "packages/opie-alarm/opie-alarm.inc"
# from [4a1a59205a8611a22b1346bc7f42b353e20d5652]
# to [07de57bed4ed8e3cb6e9d63ab283f3914598dc35]
#
# patch "packages/opie-alarm/opie-alarm_cvs.bb"
# from [1796ca94836c627bd6abf2690d14a343efbdf8ee]
# to [aadc0b4fc4280abbdfd3f206d4d8e240fbb48621]
#
# patch "packages/opie-init/opie-init/opie"
# from [939a977703c5c993189c8355d175b621bfe71969]
# to [93b7f76dcb458b0a64b1675729ab077b8f12daf6]
#
# patch "packages/opie-init/opie-init.inc"
# from [5fcdf1ce5c56a1de2a9bf4ff41be0f31abe3b52d]
# to [d712bf62a00db9475cc0d6bc511012e02a6ae815]
#
# patch "packages/opie-init/opie-init_1.2.2.bb"
# from [c2c9de8c7dd613b8f7b3b095200bb476c7bddaf9]
# to [1780c7093e5c02aea9b70522d452841ba424f856]
#
# patch "packages/opie-multikey/opie-multikey_cvs.bb"
# from [2254fb5be4ca2f2ed96362209f6d3ba3a030ab1a]
# to [eeeb85a14c02e906b881fe457e35e8b763c7a532]
#
# patch "packages/opie-networksettings/opie-networksettings.inc"
# from [97e2373b09df75c93aea7b014dfd9090f50fe171]
# to [eb022a472b604f09c97ffb9d451798e9451c16fa]
#
# patch "packages/opie-networksettings/opie-networksettings_cvs.bb"
# from [fdf639c975afaedf8b2ce6fc7b065b61b9205e7d]
# to [68708b9ebf72a6e166db6c397ee9a0419886312d]
#
# patch "packages/opie-qcop/opie-qcop.inc"
# from [5a2b1a1f0ec2d69a4d4c851c4d6ac6c50ca0a49d]
# to [fcf1b2682b07002f61b4f423c9ba3de8f1267a93]
#
# patch "packages/opie-qcop/opie-qcop_cvs.bb"
# from [c2097d44582c668bbb719ae77cb032333a4a58de]
# to [13db751dc05218bcda19c0254130a3083f6f6137]
#
# patch "packages/opie-qss/opie-qss.inc"
# from [24500a4faeeb7c466f109bbac2d55ad32a0de673]
# to [35451379dab7f75ba605b88c3ff29bb4f09d8641]
#
# patch "packages/opie-qss/opie-qss_cvs.bb"
# from [197567cb76e69706001149dcace45820034867bb]
# to [f270446f9bf86f9676a307c3f33e54275536b6d6]
#
# patch "packages/opie-quicklauncher/opie-quicklauncher.inc"
# from [08c19f70c27a55e7af90b65ca9f2bbf5a36a8f55]
# to [48fe0abf27157f260e622aa3abfa2c54ea2a92ed]
#
# patch "packages/opie-quicklauncher/opie-quicklauncher_cvs.bb"
# from [d844e5142763e1aa87b5ceba214d3ba4a89a8606]
# to [f9d1805249f9ed2056460ce0eb86fc1977af98e3]
#
# patch "packages/opie-taskbar/opie-taskbar.inc"
# from [5e37066e544b2568997efb629a7497162c167149]
# to [612634b0a0376dfe1e4b563804c51987a32320b0]
#
# patch "packages/opie-taskbar/opie-taskbar_cvs.bb"
# from [6e4c569e12d7cb8d875e488eac41f12c82db84a9]
# to [0081cd5790b5ddf838977339678872f2b347b50c]
#
# patch "packages/opie-ttf-support/opie-ttf-support_1.1.bb"
# from [485a535dc2b358d5755ccec0f9697b159b0bb964]
# to [4dc8b9267c72d84126fbce18970082e888865a36]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [77b17aa1d6610e4d5c33ba805a1fef052f47a292]
# to [0e2d31bd18afd0af1299d429093ac3e9f7267767]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [f87b668c5dc754048758ef15a98e30583eb4067b]
# to [ea3847c6b0e7010eb2a471918cdea3a7aa68f032]
#
# patch "packages/tasks/task-base.bb"
# from [3514d4e6a1530da85764ea0064424f2cb95b4e98]
# to [6b16edd2133933a5f4f6922ccb991374fbed6a1a]
#
# patch "packages/uclibc/uclibc_0.9.29.bb"
# from [4747e0d84e923f3e2393759e6b97315cedfb9b8a]
# to [a0c7d07639a2581b3d3ac3d18b716e2ea54fecca]
#
# patch "packages/udev/udev_092.bb"
# from [9c280c1d2cc7237d3dd3cc93dd6a6861334b7786]
# to [3b1cae0e753955c3ad4b534712c7f13582d9a938]
#
# patch "packages/udev/udev_097.bb"
# from [8d341ef0c55e6945df0f9050797bba9644b6d15b]
# to [1944d7e0e7e54cc38dcca0c59c66c7080828011f]
#
# patch "packages/udev/udev_100.bb"
# from [cf318dbe137533d51d411b1f6361520cd7e366a3]
# to [3a32c3de3de21597a8c1984dbf4e9892cafda3b0]
#
============================================================
--- packages/bluez/bluez-dtl1-workaround_1.0.bb 4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f
+++ packages/bluez/bluez-dtl1-workaround_1.0.bb 4c6fcb5bb6c7d3609982c2cc79d0fcf39e8f820f
@@ -0,0 +1,17 @@
+DESCRIPTION = "A nasty hack for for dtl1-cs driver to workaround suspend/resume."
+SECTION = "console"
+PRIORITY = "optional"
+LICENSE = "GPL"
+PR = "r1"
+
+SRC_URI = "file://02dtl1_cs.sh"
+
+do_install() {
+ install -d ${D}${sysconfdir}/apm/event.d/
+ install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
+}
+
+#Package 02dtl1_cs.sh, which is a nasty hack to get dtl1c_cs cards working with suspend/resume
+FILES_${PN} += "${sysconfdir}/apm/"
+
+PACKAGE_ARCH = "all"
============================================================
--- packages/opie-multikey/files/fix-rpath.patch c1275cf0c3e1eac9898ee5c1bb9b3ff0ba0f0486
+++ packages/opie-multikey/files/fix-rpath.patch c1275cf0c3e1eac9898ee5c1bb9b3ff0ba0f0486
@@ -0,0 +1,11 @@
+--- multikey/multikey.pro.org 2005-06-16 01:54:51.000000000 +0300
++++ multikey/multikey.pro 2007-07-04 21:02:52.000000000 +0300
+@@ -11,7 +11,7 @@
+ INCLUDEPATH += $(OPIEDIR)/include
+ DEPENDPATH += ../../launcher
+ LIBS += -lqpe -L$(OPIEDIR)/plugins/inputmethods -lqpickboard -lqtaux2 -lopiecore2 -lopieui2
+-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/kbdlocks-runtime.patch 3149f72c0600716f90b9ece4df7300b28f3c5dee
+++ packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch 3149f72c0600716f90b9ece4df7300b28f3c5dee
@@ -0,0 +1,35 @@
+--- launcher/taskbar.h.org 2004-08-23 00:35:22.000000000 +0300
++++ launcher/taskbar.h 2007-07-04 19:23:54.000000000 +0300
+@@ -84,6 +84,7 @@
+ LockKeyState* lockState;
+ StartMenu *sm;
+ bool resizeRunningApp;
++ bool showKbdLockState;
+ };
+
+
+--- launcher/taskbar.cpp.org 2005-07-04 01:13:00.000000000 +0300
++++ launcher/taskbar.cpp 2007-07-04 19:24:48.000000000 +0300
+@@ -213,12 +213,9 @@
+ (void)new SafeMode( this );
+ #endif
+
+- // ## make customizable in some way?
+-#ifdef OPIE_TASKBAR_LOCK_KEY_STATE
+- lockState = new LockKeyState( this );
+-#else
+ lockState = 0;
+-#endif
++ if ( showKbdLockState )
++ lockState = new LockKeyState( this );
+
+ #if defined(Q_WS_QWS)
+ #if !defined(QT_NO_COP)
+@@ -388,6 +385,7 @@
+ Config cfg( "Launcher" );
+ cfg.setGroup( "InputMethods" );
+ resizeRunningApp = cfg.readBoolEntry( "Resize", true );
++ showKbdLockState = cfg.readBoolEntry( "ShowKbdLocks", true );
+ }
+
+ #include "taskbar.moc"
============================================================
--- packages/uclibc/files/errno_values.h.patch 449baeeb6e48f88f75f07d09cdee9bd3ffcba48e
+++ packages/uclibc/files/errno_values.h.patch 449baeeb6e48f88f75f07d09cdee9bd3ffcba48e
@@ -0,0 +1,21 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h
+===================================================================
+--- uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2002-08-23 20:48:19.000000000 +0200
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/errno_values.h 2007-07-01 22:11:53.000000000 +0200
+@@ -134,4 +134,16 @@
+ #define ENOMEDIUM 123 /* No medium found */
+ #define EMEDIUMTYPE 124 /* Wrong medium type */
+
++/* the following errornumbers are only in 2.6 */
++
++#define ECANCELED 125 /* Operation Canceled */
++#define ENOKEY 126 /* Required key not available */
++#define EKEYEXPIRED 127 /* Key has expired */
++#define EKEYREVOKED 128 /* Key has been revoked */
++#define EKEYREJECTED 129 /* Key was rejected by service */
++
++/* for robust mutexes */
++#define EOWNERDEAD 130 /* Owner died */
++#define ENOTRECOVERABLE 131 /* State not recoverable */
++
+ #endif /* _BITS_ERRNO_VALUES_H */
============================================================
--- packages/uclibc/files/termios.h.patch a49212a1ef49d0a938f6687ab867600f05b3f1a4
+++ packages/uclibc/files/termios.h.patch a49212a1ef49d0a938f6687ab867600f05b3f1a4
@@ -0,0 +1,22 @@
+Index: uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h
+===================================================================
+--- uClibc-0.9.29.orig/libc/sysdeps/linux/common/bits/termios.h 2006-02-13 09:41:37.000000000 +0100
++++ uClibc-0.9.29/libc/sysdeps/linux/common/bits/termios.h 2007-07-03 00:41:27.000000000 +0200
+@@ -156,7 +156,6 @@
+ #endif
+ #define B57600 0010001
+ #define B115200 0010002
+-#if 0 /* limited on uClibc, keep in sync w/ cfsetspeed.c */
+ #define B230400 0010003
+ #define B460800 0010004
+ #define B500000 0010005
+@@ -171,9 +170,6 @@
+ #define B3500000 0010016
+ #define B4000000 0010017
+ #define __MAX_BAUD B4000000
+-#else
+-#define __MAX_BAUD B115200
+-#endif
+ #ifdef __USE_MISC
+ # define CIBAUD 002003600000 /* input baud rate (not used) */
+ # define CMSPAR 010000000000 /* mark or space (stick) parity */
============================================================
--- packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb 97dfedad01f8662328b1032c806286a00f75caa0
+++ packages/udev/udev-hostap-cs-vcc-workaround_1.0.bb 97dfedad01f8662328b1032c806286a00f75caa0
@@ -0,0 +1,12 @@
+DESCRIPTION = "A hack to force VCC to 5v for hostap_cs cards. This will fry your \
+card one sweet day."
+PR = "r1"
+
+SRC_URI = " file://50-hostap_cs.rules "
+
+do_install() {
+ install -d ${D}${sysconfdir}/udev/rules.d/
+ install -m 0644 ${WORKDIR}/50-hostap_cs.rules ${D}${sysconfdir}/udev/rules.d/50-hostap_cs.rules
+}
+
+PACKAGE_ARCH = "all"
============================================================
--- classes/kernel.bbclass b3df4a5e97f27bbbdeedf06373b1f8a115c48333
+++ classes/kernel.bbclass 2e82e59b9e169550dbe74e03b862098d7257369f
@@ -183,6 +183,11 @@ ALLOW_EMPTY_kernel-image = "1"
ALLOW_EMPTY_kernel-base = "1"
ALLOW_EMPTY_kernel-image = "1"
+# Userspace workarounds for kernel modules issues
+# This is shame, fix the kernel instead!
+DEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+RDEPENDS_kernel-module-dtl1-cs = "bluez-dtl1-workaround"
+
pkg_postinst_kernel-image () {
if [ ! -e "$D/lib/modules/${KERNEL_VERSION}" ]; then
mkdir -p $D/lib/modules/${KERNEL_VERSION}
============================================================
--- classes/opie.bbclass 2653571d91e93ff5043997740e80656344ad35d8
+++ classes/opie.bbclass 441638d80c7d1595e6037940f20b24b8bca48ebd
@@ -80,6 +80,7 @@ python opie_do_opie_install() {
D = "%s/image" % bb.data.getVar( "WORKDIR", d, True )
WORKDIR = bb.data.getVar( "WORKDIR", d, True )
palmtopdir = bb.data.getVar( "palmtopdir", d, True )
+ gnubindir = bb.data.getVar( "bindir", d, True )
APPDESKTOP = bb.data.getVar( "APPDESKTOP", d, True ) or "%s/%s" % ( WORKDIR, desktopdir )
if desktopdir is not None:
@@ -89,11 +90,12 @@ python opie_do_opie_install() {
os.system( "install -d %s%s%s/" % ( D, palmtopdir, bindir ) )
if APPTYPE == "binary":
- os.system( "install -m 0755 %s/%s %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
+ os.system( "install -d %s%s/" % ( D, gnubindir ) )
+ os.system( "install -m 0755 %s/%s %s%s/" % ( S, APPNAME, D, gnubindir ) )
elif APPTYPE == "quicklaunch":
os.system( "install -m 0755 %s/lib%s.so %s%s%s/" % ( S, APPNAME, D, palmtopdir, bindir ) )
- os.system( "install -d %s%s/bin/" % ( D, palmtopdir ) )
- os.system( "ln -sf %s/bin/quicklauncher %s%s/bin/%s" % ( palmtopdir, D, palmtopdir, APPNAME ) )
+ os.system( "install -d %s%s/" % ( D, gnubindir ) )
+ os.system( "ln -sf %s/quicklauncher %s%s/%s" % ( gnubindir, D, gnubindir, APPNAME ) )
%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -r7314baf01ff720449ddb034e256e260501df588f -rc7b00a5a1f451becbb37d892f30c9dca3e0a9068
#
#
#
# patch "contrib/feed-browser/includes/functions.inc"
# from [f33374987037202cd21d7f82a93b7da3f0c573a9]
# to [3059992209c9a86a48ebdb97976bf8060a3cdcba]
#
# patch "contrib/feed-browser/index.php"
# from [0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf]
# to [bf33048c4a2921597d0181c9b565ff0e73cd2b97]
#
# patch "contrib/feed-browser/update.php"
# from [0a6696349338576e60018f0f8fbbf645cec91913]
# to [9b418cf2e8cefddae617ffd8e121293445ea1ee1]
#
============================================================
--- contrib/feed-browser/includes/functions.inc f33374987037202cd21d7f82a93b7da3f0c573a9
+++ contrib/feed-browser/includes/functions.inc 3059992209c9a86a48ebdb97976bf8060a3cdcba
@@ -1,7 +1,7 @@
<?php
/*
- * (c) Koen Kooi 2006
- * (c) Marcin Juszkiewicz 2006
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
@@ -112,19 +112,28 @@ function searchletter($searchletter = ''
}
else
{
- $ipkgoutput .= sprintf(" <a href='?action=letter&g=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
+ $ipkgoutput .= sprintf(" <a href='?letter=%s' title='packages which names begins with \"%s\"'>%s</a> |", $letter, $letter, $letter );
}
}
- $ipkgoutput .= " <a href='?action=letter&g=z' title='packages which names begins with \"z\"'>z</a></div>";
+ $ipkgoutput .= " <a href='?letter=z' title='packages which names begins with \"z\"'>z</a></div>";
return $ipkgoutput;
}
-function searchpkg ($searchword)
+function searchpkg ($searchword, $searcharch = '')
{
- if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC"))
+ $query = "SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ";
+
+ if(!empty($searcharch))
{
+ $query .= " AND p_arch='{$searcharch}' ";
+ }
+
+ $query .= 'ORDER BY p_name ASC';
+
+ if($result = db_query($query))
+ {
return generate_list_of_packages($result);
}
}
@@ -149,7 +158,7 @@ function generate_list_of_packages($quer
}
$ipkgoutput .= sprintf
- ("<tr><td><a href='?action=details&pnm=%s'>%s</a></td><td><a href=\"?action=section&section=%s\">%s</a></td><td> %s</td></tr>\n",
+ ("<tr><td><a href='?pkgname=%s'>%s</a></td><td><a href=\"?section=%s\">%s</a></td><td> %s</td></tr>\n",
urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], htmlentities($package['p_desc']));
}
@@ -194,7 +203,7 @@ function pkgdetails ($package)
if($package['packages.p_section'])
{
- $details .= sprintf ("\n<dt>Section:</dt><dd><a href='?action=section&section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
+ $details .= sprintf ("\n<dt>Section:</dt><dd><a href='?section=%s'>%s</a></dd>", $package['packages.p_section'],$package['packages.p_section']);
}
if($package['packages.p_depends'])
@@ -310,7 +319,7 @@ function addlinks ($input)
{
// find position of string in line
$pos = strpos ($input, $element, $offset);
- $link = sprintf("<a href=\"?action=details&pnm=%s\">$element</a>", urlencode ($element));
+ $link = sprintf("<a href=\"?pkgname=%s\">$element</a>", urlencode ($element));
// replace element with a link
$input = substr_replace ($input, $link, $pos, strlen ($element));
@@ -361,7 +370,7 @@ function sectionslist()
foreach($sections as $section_name1=>$item)
{
- $output .= sprintf ("<li><a href='?action=section&section=%s' title='%s'>%s</a>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a>",
urlencode($section_name1),
urlencode($section_name1),
$section_name1);
@@ -373,7 +382,7 @@ function sectionslist()
foreach($item as $section_name2=>$subitem)
{
$section_name = "{$section_name1}/{$section_name2}";
- $output .= sprintf ("<li><a href='?action=section&section=%s' title='%s'>%s</a>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a>",
urlencode($section_name),
urlencode($section_name),
$section_name2);
@@ -385,7 +394,7 @@ function sectionslist()
foreach($subitem as $section_name3=>$subitem2)
{
$section_name = "{$section_name1}/{$section_name2}/{$section_name3}";
- $output .= sprintf ("<li><a href='?action=section&section=%s' title='%s'>%s</a></li>",
+ $output .= sprintf ("<li><a href='?section=%s' title='%s'>%s</a></li>",
urlencode($section_name),
urlencode($section_name),
$section_name3);
@@ -411,8 +420,12 @@ function check_database()
function check_database()
{
- if($db = sqlite_open(DB_FILENAME))
+ $db_exists = FALSE;
+
+ if(file_exists(DB_FILENAME) AND $db = sqlite_open(DB_FILENAME))
{
+ $db_exists = TRUE;
+
//initialize db
if (db_table_exists ($db, 'packages') === FALSE)
{
@@ -443,15 +456,28 @@ function check_database()
f_name varchar(32),
f_uri varchar(100),
f_type varchar(16)
- )");
+ f_comments varchar(500))");
insert_feeds ($db) ;
}
sqlite_close($db);
}
+
+ return $db_exists;
}
+function read_vars_from_get($array_of_vars)
+{
+ foreach($array_of_vars as $name_of_var)
+ {
+ $GLOBALS[$name_of_var] = '';
+ if(isset($_GET[$name_of_var]))
+ {
+ $GLOBALS[$name_of_var] = $_GET[$name_of_var];
+ }
+ }
+}
?>
============================================================
--- contrib/feed-browser/index.php 0b5bfe48e5be2823cc55d1688b30f73ac2c85dcf
+++ contrib/feed-browser/index.php bf33048c4a2921597d0181c9b565ff0e73cd2b97
@@ -1,8 +1,8 @@
<?php
/*
- * (c) Koen Kooi 2006
- * (c) Marcin Juszkiewicz 2006
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This php script is intended to do the following:
*
@@ -33,45 +33,31 @@ require_once 'includes/functions.inc';
require_once 'includes/config.inc';
require_once 'includes/functions.inc';
-check_database();
-
-$name = '';
-
-if(isset($_GET['name']))
+if(!check_database())
{
- $name = $_GET['name'];
+ die("Database not found and cannot be created.");
}
-$action = '';
+read_vars_from_get(array('name', 'arch', 'pkgsearch', 'letter', 'pkgname', 'section'));
-if(isset($_GET['action']))
+$ipkgoutput = '';
+
+if(!empty($section))
{
- $action = $_GET['action'];
+ $ipkgoutput = searchsection($section);
}
-
-switch($action)
+elseif(!empty($letter))
{
- case "details":
- $ipkgoutput = pkgdetails ($_GET['pnm']);
- break;
-
- case "search":
- $ipkgoutput = searchpkg ("%{$name}%");
- break;
-
- case "section":
- $ipkgoutput = searchsection($_GET['section']);
- break;
-
- case "letter":
- $letter = $_GET['g'];
- $ipkgoutput = searchpkg ("{$letter}%");
- break;
-
- default:
- $ipkgoutput = searchpkg("a");
- break;
+ $ipkgoutput = searchpkg("{$letter}%", $arch);
}
+elseif(!empty($pkgname))
+{
+ $ipkgoutput = pkgdetails($pkgname);
+}
+elseif(!empty($pkgsearch))
+{
+ $ipkgoutput = searchpkg("%{$pkgsearch}%", $arch);
+}
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -88,8 +74,24 @@ switch($action)
<form action="" method="get">
<fieldset>
<label for="name">Package name</label>
- <input type="text" name="name" value="<?php echo $name; ?>" />
- <input type="hidden" name="action" value="search" />
+ <input type="text" name="pkgsearch" value="<?php echo $name; ?>" />
+ <select name="arch">
+ <option value="" selected="selected">all architectures</option>
+ <option value="all">noarch</option>
+ <option value="arm-oabi">arm OABI</option>
+ <option value="armv4t">armv4t EABI</option>
+ <option value="armv5te">armv5te EABI</option>
+ <option value="armv5teb">armv5teb EABI</option>
+ <option value="armv6">armv6 EABI</option>
+ <option value="avr32">avr32</option>
+ <option value="bfin">blackfin</option>
+ <option value="i486">i486</option>
+ <option value="i586">i586</option>
+ <option value="i686">i686</option>
+ <option value="iwmmxt">iwmmxt</option>
+ <option value="ppc603e">ppc603e</option>
+ <option value="sparc">sparc</option>
+ </select>
<input type="submit" value="Search" />
</fieldset>
</form>
============================================================
--- contrib/feed-browser/update.php 0a6696349338576e60018f0f8fbbf645cec91913
+++ contrib/feed-browser/update.php 9b418cf2e8cefddae617ffd8e121293445ea1ee1
@@ -1,5 +1,7 @@
<?php
-/* (c) Koen Kooi 2006
+/*
+ * (c) Koen Kooi 2006, 2007
+ * (c) Marcin Juszkiewicz 2006, 2007
*
* This program is free software; you can redistribute it and/or modify it under
* the terms of the GNU General Public License as published by the Free
@@ -37,7 +39,10 @@ require_once 'includes/functions.inc';
Description: IPv4 link-local address allocator
*/
-check_database();
+if(!check_database())
+{
+ die("Database not found and cannot be created.");
+}
$feeds = db_query("SELECT f_id, f_name, f_uri FROM feeds");
More information about the Openembedded-commits
mailing list