From c6184de917b17e4192105fd362ff9352c6daf4a9 Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 23 Mar 2007 17:30:00 +0000 Subject: btxml: clean up bb file (reorder fields). no semantic change, no PR bump. --- packages/btxml/btxml.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'packages') diff --git a/packages/btxml/btxml.bb b/packages/btxml/btxml.bb index b48ebb79f6..d072b85bac 100644 --- a/packages/btxml/btxml.bb +++ b/packages/btxml/btxml.bb @@ -1,9 +1,9 @@ DESCRIPTION = "Bluetooh Download Data from remote phones" -PRIORITY = "optional" -SECTIONS = "apps" -DEPENDS = "bluez-libs" HOMEPAGE = "http://www.saftware.de" +SECTION = "apps" +PRIORITY = "optional" LICENSE = "GPL" +DEPENDS = "bluez-libs" SRC_URI = "http://www.saftware.de/bluetooth/btxml.c" S = "${WORKDIR}" -- cgit v1.2.3 From 8fc5afd475c8c2a1fd4de81937cd736c5931bb7c Mon Sep 17 00:00:00 2001 From: Rolf Leggewie Date: Fri, 23 Mar 2007 17:36:58 +0000 Subject: gpe-bluetooth: unify --- packages/gpe-bluetooth/gpe-bluetooth.inc | 11 +++++++++++ packages/gpe-bluetooth/gpe-bluetooth_0.49.bb | 11 +---------- packages/gpe-bluetooth/gpe-bluetooth_0.51.bb | 14 ++------------ packages/gpe-bluetooth/gpe-bluetooth_0.52.bb | 14 +------------- packages/gpe-bluetooth/gpe-bluetooth_0.53.bb | 14 +------------- packages/gpe-bluetooth/gpe-bluetooth_0.54.bb | 14 ++------------ 6 files changed, 18 insertions(+), 60 deletions(-) create mode 100644 packages/gpe-bluetooth/gpe-bluetooth.inc (limited to 'packages') diff --git a/packages/gpe-bluetooth/gpe-bluetooth.inc b/packages/gpe-bluetooth/gpe-bluetooth.inc new file mode 100644 index 0000000000..c258832c8b --- /dev/null +++ b/packages/gpe-bluetooth/gpe-bluetooth.inc @@ -0,0 +1,11 @@ +DESCRIPTION = "GPE bluetooth support user interface tool." +SECTION = "gpe" +LICENSE = "GPL" +PRIORITY = "optional" +DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" +RDEPENDS = "bluez-utils-dbus blueprobe" + +GPE_TARBALL_SUFFIX= "bz2" +inherit gpe autotools + +FILES_${PN} += '${datadir}/bluez-pin' diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb index f3129fcf17..396beeb014 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.49.bb @@ -1,12 +1,3 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support" -SECTION = "gpe" -PRIORITY = "optional" +require gpe-bluetooth.inc DEPENDS = "gtk+ libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus libcontactsdb" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb index 15d8ccafcc..98cdbc4b7f 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.51.bb @@ -1,16 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support user interface tool." -SECTION = "gpe" -PRIORITY = "optional" -PR = "r1" +require gpe-bluetooth.inc -DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' +PR = "r1" do_configure () { autotools_do_configure diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb index b6dcfcca61..66bc3f0b24 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.52.bb @@ -1,13 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support user interface tool." -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' +require gpe-bluetooth.inc diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb index b6dcfcca61..66bc3f0b24 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.53.bb @@ -1,13 +1 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support user interface tool." -SECTION = "gpe" -PRIORITY = "optional" -PR = "r0" - -DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools - -FILES_${PN} += '${datadir}/bluez-pin' +require gpe-bluetooth.inc diff --git a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb index e664f51959..9164cc4088 100644 --- a/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb +++ b/packages/gpe-bluetooth/gpe-bluetooth_0.54.bb @@ -1,16 +1,6 @@ -LICENSE = "GPL" -DESCRIPTION = "GPE bluetooth support user interface tool." -SECTION = "gpe" -PRIORITY = "optional" -PR = "r1" +require gpe-bluetooth.inc -DEPENDS = "gtk+ libcontactsdb libdisplaymigration libgpewidget openobex libgpevtype bluez-libs sqlite dbus-glib libglade blueprobe bluez-utils-dbus" -RDEPENDS = "bluez-utils-dbus blueprobe" - -GPE_TARBALL_SUFFIX= "bz2" -inherit gpe autotools +PR = "r1" SRC_URI += "file://hciattach-bts.patch;patch=1 \ file://include-sdp_lib.patch;patch=1" - -FILES_${PN} += '${datadir}/bluez-pin' -- cgit v1.2.3 From 476146d7e71bef9a34eb1109be195f4824719974 Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Fri, 30 Mar 2007 08:59:06 +0000 Subject: xournal_0.3.3.bb : add new version and add .desktop file so it shows up as an icon on desktop. remove old versions --- packages/xournal/files/no-printing.diff | 178 -------------------------------- packages/xournal/files/xournal.desktop | 9 ++ packages/xournal/xournal_0.2.bb | 11 -- packages/xournal/xournal_0.3.1.bb | 11 -- packages/xournal/xournal_0.3.3.bb | 17 +++ 5 files changed, 26 insertions(+), 200 deletions(-) delete mode 100644 packages/xournal/files/no-printing.diff create mode 100644 packages/xournal/files/xournal.desktop delete mode 100644 packages/xournal/xournal_0.2.bb delete mode 100644 packages/xournal/xournal_0.3.1.bb create mode 100644 packages/xournal/xournal_0.3.3.bb (limited to 'packages') diff --git a/packages/xournal/files/no-printing.diff b/packages/xournal/files/no-printing.diff deleted file mode 100644 index 7a4724e696..0000000000 --- a/packages/xournal/files/no-printing.diff +++ /dev/null @@ -1,178 +0,0 @@ -diff -ru xournal-0.2/configure.in xournal-0.2.noprint/configure.in ---- xournal-0.2/configure.in 2006-01-29 22:25:10.000000000 +0000 -+++ xournal-0.2.noprint/configure.in 2006-03-17 13:08:01.000000000 +0000 -@@ -10,11 +10,16 @@ - AM_PROG_CC_STDC - AC_HEADER_STDC - --pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0 libgnomeprintui-2.2 >= 2.0.0" -+pkg_modules="gtk+-2.0 >= 2.4.0 libgnomecanvas-2.0 >= 2.4.0" - PKG_CHECK_MODULES(PACKAGE, [$pkg_modules]) - AC_SUBST(PACKAGE_CFLAGS) - AC_SUBST(PACKAGE_LIBS) - -+#PKG_CHECK_MODULES(GNOMEPRINT, libgnomeprintui-2.2 >= 2.0.0 -+#AC_SUBST(GNOMEPRINT_CFLAGS) -+#AC_SUBST(GNOMEPRINT_LIBS) -+AM_CONDITIONAL(ENABLE_PRINTING, false) -+ - AC_OUTPUT([ - Makefile - src/Makefile -diff -ru xournal-0.2/src/main.c xournal-0.2.noprint/src/main.c ---- xournal-0.2/src/main.c 2006-01-29 22:22:52.000000000 +0000 -+++ xournal-0.2.noprint/src/main.c 2006-03-17 13:14:50.000000000 +0000 -@@ -28,7 +28,9 @@ - - void hide_unimplemented(void) - { -+#if ENABLE_PRINTING - gtk_widget_hide(GET_COMPONENT("filePrintOptions")); -+#endif - gtk_widget_hide(GET_COMPONENT("journalFlatten")); - gtk_widget_hide(GET_COMPONENT("papercolorOther")); - gtk_widget_hide(GET_COMPONENT("journalApplyAllPages")); -diff -ru xournal-0.2/src/Makefile.am xournal-0.2.noprint/src/Makefile.am ---- xournal-0.2/src/Makefile.am 2005-12-14 20:54:42.000000000 +0000 -+++ xournal-0.2.noprint/src/Makefile.am 2006-03-17 13:07:47.000000000 +0000 -@@ -7,12 +7,16 @@ - - bin_PROGRAMS = xournal - -+if ENABLE_PRINTING -+PRINT_SOURCE = xo-print.c xo-print.h -+endif -+ - xournal_SOURCES = \ - main.c xournal.h \ - xo-misc.c xo-misc.h \ - xo-file.c xo-file.h \ - xo-paint.c xo-paint.h \ -- xo-print.c xo-print.h \ -+ $(PRINT_SOURCE) \ - xo-support.c xo-support.h \ - xo-interface.c xo-interface.h \ - xo-callbacks.c xo-callbacks.h -diff -ru xournal-0.2/src/xo-callbacks.c xournal-0.2.noprint/src/xo-callbacks.c ---- xournal-0.2/src/xo-callbacks.c 2006-01-29 19:39:22.000000000 +0000 -+++ xournal-0.2.noprint/src/xo-callbacks.c 2006-03-17 13:12:01.000000000 +0000 -@@ -7,7 +7,9 @@ - #include - #include - #include -+#if ENABLE_PRINTING - #include -+#endif - #include - - #include "xournal.h" -@@ -17,7 +19,9 @@ - #include "xo-misc.h" - #include "xo-file.h" - #include "xo-paint.h" -+#if ENABLE_PRINTING - #include "xo-print.h" -+#endif - - void - on_fileNew_activate (GtkMenuItem *menuitem, -@@ -261,7 +265,7 @@ - - } - -- -+#if ENABLE_PRINTING - void - on_filePrint_activate (GtkMenuItem *menuitem, - gpointer user_data) -@@ -407,7 +411,7 @@ - - g_free(filename); - } -- -+#endif - - void - on_fileQuit_activate (GtkMenuItem *menuitem, -diff -ru xournal-0.2/src/xo-callbacks.h xournal-0.2.noprint/src/xo-callbacks.h ---- xournal-0.2/src/xo-callbacks.h 2006-01-26 20:47:00.000000000 +0000 -+++ xournal-0.2.noprint/src/xo-callbacks.h 2006-03-17 13:08:45.000000000 +0000 -@@ -24,6 +24,7 @@ - on_filePrintOptions_activate (GtkMenuItem *menuitem, - gpointer user_data); - -+#if ENABLE_PRINTING - void - on_filePrint_activate (GtkMenuItem *menuitem, - gpointer user_data); -@@ -32,6 +33,8 @@ - on_filePrintPDF_activate (GtkMenuItem *menuitem, - gpointer user_data); - -+#endif -+ - void - on_fileQuit_activate (GtkMenuItem *menuitem, - gpointer user_data); -diff -ru xournal-0.2/src/xo-interface.c xournal-0.2.noprint/src/xo-interface.c ---- xournal-0.2/src/xo-interface.c 2006-01-29 18:58:25.000000000 +0000 -+++ xournal-0.2.noprint/src/xo-interface.c 2006-03-17 13:11:31.000000000 +0000 -@@ -41,10 +41,12 @@ - GtkWidget *fileSave; - GtkWidget *fileSaveAs; - GtkWidget *separator1; -+#if ENABLE_PRINTING - GtkWidget *filePrintOptions; - GtkWidget *image501; - GtkWidget *filePrint; - GtkWidget *filePrintPDF; -+#endif - GtkWidget *separator2; - GtkWidget *fileQuit; - GtkWidget *menuEdit; -@@ -327,6 +329,7 @@ - gtk_container_add (GTK_CONTAINER (menuFile_menu), separator1); - gtk_widget_set_sensitive (separator1, FALSE); - -+#if ENABLE_PRINTING - filePrintOptions = gtk_image_menu_item_new_with_mnemonic ("Print Options"); - gtk_widget_show (filePrintOptions); - gtk_container_add (GTK_CONTAINER (menuFile_menu), filePrintOptions); -@@ -347,6 +350,7 @@ - gtk_widget_show (separator2); - gtk_container_add (GTK_CONTAINER (menuFile_menu), separator2); - gtk_widget_set_sensitive (separator2, FALSE); -+#endif - - fileQuit = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group); - gtk_widget_show (fileQuit); -@@ -1522,6 +1526,7 @@ - g_signal_connect ((gpointer) fileSaveAs, "activate", - G_CALLBACK (on_fileSaveAs_activate), - NULL); -+#if ENABLE_PRINTING - g_signal_connect ((gpointer) filePrintOptions, "activate", - G_CALLBACK (on_filePrintOptions_activate), - NULL); -@@ -1531,6 +1536,7 @@ - g_signal_connect ((gpointer) filePrintPDF, "activate", - G_CALLBACK (on_filePrintPDF_activate), - NULL); -+#endif - g_signal_connect ((gpointer) fileQuit, "activate", - G_CALLBACK (on_fileQuit_activate), - NULL); -@@ -1941,11 +1947,13 @@ - GLADE_HOOKUP_OBJECT (winMain, fileSave, "fileSave"); - GLADE_HOOKUP_OBJECT (winMain, fileSaveAs, "fileSaveAs"); - GLADE_HOOKUP_OBJECT (winMain, separator1, "separator1"); -+#if ENABLE_PRINTING - GLADE_HOOKUP_OBJECT (winMain, filePrintOptions, "filePrintOptions"); - GLADE_HOOKUP_OBJECT (winMain, image501, "image501"); - GLADE_HOOKUP_OBJECT (winMain, filePrint, "filePrint"); - GLADE_HOOKUP_OBJECT (winMain, filePrintPDF, "filePrintPDF"); - GLADE_HOOKUP_OBJECT (winMain, separator2, "separator2"); -+#endif - GLADE_HOOKUP_OBJECT (winMain, fileQuit, "fileQuit"); - GLADE_HOOKUP_OBJECT (winMain, menuEdit, "menuEdit"); - GLADE_HOOKUP_OBJECT (winMain, menuEdit_menu, "menuEdit_menu"); diff --git a/packages/xournal/files/xournal.desktop b/packages/xournal/files/xournal.desktop new file mode 100644 index 0000000000..52dde1e47c --- /dev/null +++ b/packages/xournal/files/xournal.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Version=0.3.3 +Type=Application +Name=Xournal +Comment=Notetaking tool +Exec=/usr/bin/xournal +Icon=/usr/share/xournal/pixmaps/xournal.png +Terminal=false + diff --git a/packages/xournal/xournal_0.2.bb b/packages/xournal/xournal_0.2.bb deleted file mode 100644 index 6a4b6839b4..0000000000 --- a/packages/xournal/xournal_0.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -HOMEPAGE = "http://xournal.sf.net/" -DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." -DEPENDS = "gtk+ libgnomecanvas" -SECTION = "x11" -LICENSE = "GPL" -PR = "r1" - -SRC_URI = "http://xournal.sourceforge.net/xournal-0.2.tar.gz \ - file://no-printing.diff;patch=1" - -inherit autotools pkgconfig diff --git a/packages/xournal/xournal_0.3.1.bb b/packages/xournal/xournal_0.3.1.bb deleted file mode 100644 index 077036b686..0000000000 --- a/packages/xournal/xournal_0.3.1.bb +++ /dev/null @@ -1,11 +0,0 @@ -HOMEPAGE = "http://xournal.sf.net/" -DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." -DEPENDS = "gtk+ libgnomecanvas" -SECTION = "x11" -LICENSE = "GPL" -PR = "r0" - -SRC_URI = "http://xournal.sourceforge.net/xournal-0.3.1.tar.gz \ - " - -inherit autotools pkgconfig diff --git a/packages/xournal/xournal_0.3.3.bb b/packages/xournal/xournal_0.3.3.bb new file mode 100644 index 0000000000..5a8a1b74b7 --- /dev/null +++ b/packages/xournal/xournal_0.3.3.bb @@ -0,0 +1,17 @@ +HOMEPAGE = "http://xournal.sf.net/" +DESCRIPTION = "Xournal is an application for notetaking, sketching, keeping a journal using a stylus." +DEPENDS = "gtk+ libgnomecanvas libgnomeprintui" +SECTION = "x11" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://xournal.sourceforge.net/xournal-${PV}.tar.gz \ + file://xournal.desktop" + +inherit autotools pkgconfig + +do_install_append () { + install -d ${D}${datadir}/applications/ + install -m 0644 ${WORKDIR}/xournal.desktop ${D}${datadir}/applications/ +} + -- cgit v1.2.3 From b0ee85f4869abd55db07bebedcb7dd0d7798b06f Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 30 Mar 2007 09:32:30 +0000 Subject: libxcompoisite: Depends on libxext --- packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb index 4cab60a531..70d0917887 100644 --- a/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb +++ b/packages/xorg-lib/libxcomposite_X11R7.1-0.3.bb @@ -3,7 +3,7 @@ require xorg-lib-common.inc DESCRIPTION = "X Composite extension library." LICENSE= "BSD-X" -DEPENDS += " compositeproto virtual/libx11 libxfixes" +DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" XORG_PN = "libXcomposite" -- cgit v1.2.3 From b061f54b368d934627c98dcc0021c2bd4fde2957 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 09:37:10 +0000 Subject: xserver-kdrive-1.2.0: fix enable-xcalibrate.patch --- .../xserver-kdrive-1.2.0/enable-xcalibrate.patch | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch index aec94a3a6d..c82aa943d2 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch @@ -1,7 +1,7 @@ Index: xorg-server-1.2.0/mi/miinitext.c =================================================================== ---- xorg-server-1.2.0.orig/mi/miinitext.c 2007-03-29 11:32:40.000000000 +0200 -+++ xorg-server-1.2.0/mi/miinitext.c 2007-03-29 11:33:22.000000000 +0200 +--- xorg-server-1.2.0.orig/mi/miinitext.c 2007-01-23 06:39:17.000000000 +0100 ++++ xorg-server-1.2.0/mi/miinitext.c 2007-03-30 11:28:44.000000000 +0200 @@ -372,6 +372,9 @@ #ifdef DMXEXT extern void DMXExtensionInit(INITARGS); @@ -22,3 +22,17 @@ Index: xorg-server-1.2.0/mi/miinitext.c } void +Index: xorg-server-1.2.0/include/kdrive-config.h.in +=================================================================== +--- xorg-server-1.2.0.orig/include/kdrive-config.h.in 2007-03-30 11:31:07.000000000 +0200 ++++ xorg-server-1.2.0/include/kdrive-config.h.in 2007-03-30 11:34:09.000000000 +0200 +@@ -22,6 +22,9 @@ + /* Support tslib touchscreen abstraction library */ + #undef TSLIB + ++/* Build XCalibrate extension */ ++#undef XCALIBRATE ++ + /* Verbose debugging output hilarity */ + #undef DEBUG + -- cgit v1.2.3 From 7359e2a43c49bd48dc5eb662015e5d08bfe46528 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 10:04:35 +0000 Subject: kdrive 1.2.0: bump PR due to patch changes --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index d4c01f240a..b64bfe8ff9 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r2" +PR = "r3" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ -- cgit v1.2.3 From de4e23ce0df2866e7896544a2a8dc0a2d54c2798 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Fri, 30 Mar 2007 10:06:43 +0000 Subject: linux-hackndev: Update palmtx config --- packages/linux/linux-hackndev-2.6/palmtx/defconfig | 572 ++++++++++++--------- packages/linux/linux-hackndev-2.6_svn.bb | 2 +- 2 files changed, 334 insertions(+), 240 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-hackndev-2.6/palmtx/defconfig b/packages/linux/linux-hackndev-2.6/palmtx/defconfig index 536133f6aa..68dcca286d 100644 --- a/packages/linux/linux-hackndev-2.6/palmtx/defconfig +++ b/packages/linux/linux-hackndev-2.6/palmtx/defconfig @@ -1,53 +1,68 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.17-hnd0 -# Thu Dec 14 14:24:35 2006 +# Linux kernel version: 2.6.20-hnd0 +# Wed Mar 28 10:35:44 2007 # CONFIG_ARM=y +# CONFIG_GENERIC_TIME is not set CONFIG_MMU=y +CONFIG_GENERIC_HARDIRQS=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_PROBE=y CONFIG_RWSEM_GENERIC_SPINLOCK=y +# CONFIG_ARCH_HAS_ILOG2_U32 is not set +# CONFIG_ARCH_HAS_ILOG2_U64 is not set CONFIG_GENERIC_HWEIGHT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_ARCH_MTD_XIP=y CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" # # Code maturity level options # CONFIG_EXPERIMENTAL=y CONFIG_BROKEN_ON_SMP=y +CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=y CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set -# CONFIG_BSD_PROCESS_ACCT is not set -CONFIG_SYSCTL=y +# CONFIG_IPC_NS is not set +CONFIG_POSIX_MQUEUE=y +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set +# CONFIG_TASKSTATS is not set +# CONFIG_UTS_NS is not set # CONFIG_AUDIT is not set # CONFIG_IKCONFIG is not set -# CONFIG_MINIMAL_OOPS is not set +CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set -CONFIG_UID16=y +CONFIG_INITRAMFS_SOURCE="" CONFIG_CC_OPTIMIZE_FOR_SIZE=y -# CONFIG_EMBEDDED is not set +CONFIG_SYSCTL=y +CONFIG_EMBEDDED=y +CONFIG_UID16=y +CONFIG_SYSCTL_SYSCALL=y CONFIG_KALLSYMS=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y -CONFIG_ELF_CORE=y +# CONFIG_ELF_CORE is not set CONFIG_BASE_FULL=y CONFIG_FUTEX=y CONFIG_EPOLL=y CONFIG_SHMEM=y -CONFIG_USELIB=y -CONFIG_CORE_DUMP=y CONFIG_SLAB=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_RT_MUTEXES=y # CONFIG_TINY_SHMEM is not set CONFIG_BASE_SMALL=0 # CONFIG_SLOB is not set @@ -60,19 +75,22 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y # CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_KMOD is not set +CONFIG_KMOD=y # # Block layer # +CONFIG_BLOCK=y +# CONFIG_LBD is not set # CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_LSF is not set # # IO Schedulers # CONFIG_IOSCHED_NOOP=y CONFIG_IOSCHED_AS=y -CONFIG_IOSCHED_DEADLINE=y +# CONFIG_IOSCHED_DEADLINE is not set CONFIG_IOSCHED_CFQ=y CONFIG_DEFAULT_AS=y # CONFIG_DEFAULT_DEADLINE is not set @@ -83,18 +101,28 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" # # System Type # +# CONFIG_ARCH_AAEC2000 is not set +# CONFIG_ARCH_INTEGRATOR is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_VERSATILE is not set +# CONFIG_ARCH_AT91 is not set # CONFIG_ARCH_CLPS7500 is not set # CONFIG_ARCH_CLPS711X is not set # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_EBSA110 is not set # CONFIG_ARCH_EP93XX is not set # CONFIG_ARCH_FOOTBRIDGE is not set -# CONFIG_ARCH_INTEGRATOR is not set -# CONFIG_ARCH_IOP3XX is not set +# CONFIG_ARCH_NETX is not set +# CONFIG_ARCH_H720X is not set +# CONFIG_ARCH_IMX is not set +# CONFIG_ARCH_IOP32X is not set +# CONFIG_ARCH_IOP33X is not set +# CONFIG_ARCH_IOP13XX is not set # CONFIG_ARCH_IXP4XX is not set # CONFIG_ARCH_IXP2000 is not set # CONFIG_ARCH_IXP23XX is not set # CONFIG_ARCH_L7200 is not set +# CONFIG_ARCH_PNX4008 is not set CONFIG_ARCH_PXA=y # CONFIG_ARCH_RPC is not set # CONFIG_ARCH_SA1100 is not set @@ -102,12 +130,6 @@ CONFIG_ARCH_PXA=y # CONFIG_ARCH_SHARK is not set # CONFIG_ARCH_LH7A40X is not set # CONFIG_ARCH_OMAP is not set -# CONFIG_ARCH_VERSATILE is not set -# CONFIG_ARCH_REALVIEW is not set -# CONFIG_ARCH_IMX is not set -# CONFIG_ARCH_H720X is not set -# CONFIG_ARCH_AAEC2000 is not set -# CONFIG_ARCH_AT91RM9200 is not set # # Intel PXA2xx Implementations @@ -116,12 +138,14 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_LOGICPD_PXA270 is not set # CONFIG_MACH_MAINSTONE is not set # CONFIG_ARCH_PXA_IDP is not set +# CONFIG_TOSHIBA_TMIO_OHCI is not set # CONFIG_ARCH_ESERIES is not set # CONFIG_MACH_A620 is not set # CONFIG_MACH_A716 is not set +# CONFIG_MACH_A730 is not set # CONFIG_ARCH_H1900 is not set # CONFIG_ARCH_H2200 is not set -# CONFIG_ARCH_H3900 is not set +# CONFIG_MACH_H3900 is not set # CONFIG_MACH_H4000 is not set # CONFIG_MACH_H4700 is not set # CONFIG_MACH_HX2750 is not set @@ -133,27 +157,32 @@ CONFIG_ARCH_PXA=y # CONFIG_MACH_HTCAPACHE is not set # CONFIG_MACH_BLUEANGEL is not set # CONFIG_MACH_HTCBEETLES is not set -# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_HW6900 is not set # CONFIG_ARCH_AXIMX3 is not set +# CONFIG_ARCH_AXIMX5 is not set +# CONFIG_MACH_X50 is not set # CONFIG_ARCH_ROVERP1 is not set # CONFIG_ARCH_ROVERP5P is not set # CONFIG_MACH_XSCALE_PALMLD is not set +# CONFIG_MACH_XSCALE_PALMTREO650 is not set +# CONFIG_MACH_XSCALE_TREO680 is not set +# CONFIG_MACH_T700WX is not set # CONFIG_MACH_TUNGE2 is not set # CONFIG_MACH_T3XSCALE is not set # CONFIG_MACH_XSCALE_PALMTT5 is not set CONFIG_MACH_XSCALE_PALMTX=y -CONFIG_PALMTX_AC97=m -CONFIG_PALMTX_LCD=m # CONFIG_PALMTX_PCMCIA is not set # CONFIG_PALMTX_DEBUG is not set +CONFIG_PALMTX_BATTERY=m +CONFIG_PALMTX_PM=y # CONFIG_MACH_PALMZ72 is not set # CONFIG_MACH_OMAP_PALMTC is not set +# CONFIG_MACH_ZIRE31 is not set +CONFIG_GPIOED=m +CONFIG_GPIOEDNG=m # CONFIG_PXA_SHARPSL is not set +# CONFIG_MACH_TRIZEPS4 is not set CONFIG_PXA27x=y -CONFIG_PXA_RTC_EPOCH=1970 -# CONFIG_SA1100_H3100 is not set -# CONFIG_SA1100_H3600 is not set -# CONFIG_SA1100_H3800 is not set # # Linux As Bootloader @@ -169,19 +198,19 @@ CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV5T=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_TLB_V4WBI=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # # Processor Features # CONFIG_ARM_THUMB=y +# CONFIG_CPU_DCACHE_DISABLE is not set +CONFIG_IWMMXT=y # CONFIG_ARMBOOT_PROC is not set CONFIG_XSCALE_PMU=y # CONFIG_KEXEC is not set -# -# Compaq/iPAQ Platforms -# - # # Compaq/iPAQ Drivers # @@ -189,7 +218,6 @@ CONFIG_XSCALE_PMU=y # # Compaq/HP iPAQ Drivers # -# CONFIG_IPAQ_HAMCOP is not set # # Bus support @@ -203,9 +231,11 @@ CONFIG_XSCALE_PMU=y # # Kernel Features # -# CONFIG_PREEMPT is not set -CONFIG_NO_IDLE_HZ=y +CONFIG_PREEMPT=y +# CONFIG_NO_IDLE_HZ is not set CONFIG_HZ=100 +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set CONFIG_SELECT_MEMORY_MODEL=y CONFIG_FLATMEM_MANUAL=y @@ -215,6 +245,7 @@ CONFIG_FLATMEM=y CONFIG_FLAT_NODE_MEM_MAP=y # CONFIG_SPARSEMEM_STATIC is not set CONFIG_SPLIT_PTLOCK_CPUS=4096 +# CONFIG_RESOURCES_64BIT is not set CONFIG_ALIGNMENT_TRAP=y # @@ -247,13 +278,16 @@ CONFIG_FPE_NWFPE=y CONFIG_BINFMT_ELF=y # CONFIG_BINFMT_AOUT is not set # CONFIG_BINFMT_MISC is not set -# CONFIG_ARTHUR is not set # # Power management options # -# CONFIG_PM is not set -# CONFIG_APM is not set +CONFIG_PM=y +CONFIG_PM_LEGACY=y +# CONFIG_PM_DEBUG is not set +# CONFIG_DPM_DEBUG is not set +# CONFIG_PM_SYSFS_DEPRECATED is not set +CONFIG_APM=y # # Networking @@ -264,12 +298,13 @@ CONFIG_NET=y # Networking options # # CONFIG_NETDEBUG is not set -CONFIG_PACKET=y +CONFIG_PACKET=m # CONFIG_PACKET_MMAP is not set CONFIG_UNIX=y CONFIG_XFRM=y # CONFIG_XFRM_USER is not set -CONFIG_NET_KEY=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_NET_KEY is not set CONFIG_INET=y # CONFIG_IP_MULTICAST is not set # CONFIG_IP_ADVANCED_ROUTER is not set @@ -284,13 +319,19 @@ CONFIG_IP_FIB_HASH=y # CONFIG_INET_IPCOMP is not set # CONFIG_INET_XFRM_TUNNEL is not set # CONFIG_INET_TUNNEL is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=y +CONFIG_INET_XFRM_MODE_TUNNEL=y +CONFIG_INET_XFRM_MODE_BEET=y CONFIG_INET_DIAG=y CONFIG_INET_TCP_DIAG=y # CONFIG_TCP_CONG_ADVANCED is not set -CONFIG_TCP_CONG_BIC=y +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set # CONFIG_IPV6 is not set # CONFIG_INET6_XFRM_TUNNEL is not set # CONFIG_INET6_TUNNEL is not set +# CONFIG_NETWORK_SECMARK is not set # CONFIG_NETFILTER is not set # @@ -316,7 +357,6 @@ CONFIG_TCP_CONG_BIC=y # CONFIG_ATALK is not set # CONFIG_X25 is not set # CONFIG_LAPB is not set -# CONFIG_NET_DIVERT is not set # CONFIG_ECONET is not set # CONFIG_WAN_ROUTER is not set @@ -330,22 +370,22 @@ CONFIG_TCP_CONG_BIC=y # # CONFIG_NET_PKTGEN is not set # CONFIG_HAMRADIO is not set -CONFIG_IRDA=m +CONFIG_IRDA=y # # IrDA protocols # -CONFIG_IRLAN=m -CONFIG_IRNET=m +# CONFIG_IRLAN is not set +# CONFIG_IRNET is not set CONFIG_IRCOMM=m -CONFIG_IRDA_ULTRA=y +# CONFIG_IRDA_ULTRA is not set # # IrDA options # # CONFIG_IRDA_CACHE_LAST_LSAP is not set # CONFIG_IRDA_FAST_RR is not set -CONFIG_IRDA_DEBUG=y +# CONFIG_IRDA_DEBUG is not set # # Infrared-port device drivers @@ -354,29 +394,43 @@ CONFIG_IRDA_DEBUG=y # # SIR device drivers # -CONFIG_IRTTY_SIR=m +# CONFIG_IRTTY_SIR is not set # # Dongle support # -# CONFIG_DONGLE is not set # # Old SIR device drivers # -CONFIG_IRPORT_SIR=m +# CONFIG_IRPORT_SIR is not set # # Old Serial dongle support # -# CONFIG_DONGLE_OLD is not set # # FIR device drivers # -CONFIG_PXA_FICP=m -# CONFIG_BT is not set -# CONFIG_IEEE80211 is not set +CONFIG_PXA_FICP=y +CONFIG_BT=m +# CONFIG_BT_L2CAP is not set +# CONFIG_BT_SCO is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_HCIUART=m +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIVHCI is not set +CONFIG_IEEE80211=m +# CONFIG_IEEE80211_DEBUG is not set +CONFIG_IEEE80211_CRYPT_WEP=m +CONFIG_IEEE80211_CRYPT_CCMP=m +CONFIG_IEEE80211_SOFTMAC=m +# CONFIG_IEEE80211_SOFTMAC_DEBUG is not set +CONFIG_WIRELESS_EXT=y # # Device Drivers @@ -387,7 +441,8 @@ CONFIG_PXA_FICP=m # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -CONFIG_FW_LOADER=y +# CONFIG_FW_LOADER is not set +# CONFIG_SYS_HYPERVISOR is not set # # Connector - unified userspace <-> kernelspace linker @@ -414,10 +469,11 @@ CONFIG_FW_LOADER=y # CONFIG_BLK_DEV_COW_COMMON is not set CONFIG_BLK_DEV_LOOP=y # CONFIG_BLK_DEV_CRYPTOLOOP is not set -CONFIG_BLK_DEV_NBD=m +# CONFIG_BLK_DEV_NBD is not set CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_COUNT=16 CONFIG_BLK_DEV_RAM_SIZE=4096 +CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 CONFIG_BLK_DEV_INITRD=y # CONFIG_CDROM_PKTCDVD is not set # CONFIG_ATA_OVER_ETH is not set @@ -432,6 +488,12 @@ CONFIG_BLK_DEV_INITRD=y # # CONFIG_RAID_ATTRS is not set # CONFIG_SCSI is not set +# CONFIG_SCSI_NETLINK is not set + +# +# Serial ATA (prod) and Parallel ATA (experimental) drivers +# +# CONFIG_ATA is not set # # Multi-device support (RAID and LVM) @@ -463,11 +525,16 @@ CONFIG_NETDEVICES=y # # PHY device support # +# CONFIG_PHYLIB is not set # # Ethernet (10 or 100Mbit) # -# CONFIG_NET_ETHERNET is not set +CONFIG_NET_ETHERNET=y +CONFIG_MII=y +# CONFIG_SMC91X is not set +# CONFIG_DM9000 is not set +# CONFIG_SMC911X is not set # # Ethernet (1000 Mbit) @@ -490,7 +557,7 @@ CONFIG_NETDEVICES=y # Wan interfaces # # CONFIG_WAN is not set -CONFIG_PPP=m +CONFIG_PPP=y # CONFIG_PPP_MULTILINK is not set # CONFIG_PPP_FILTER is not set # CONFIG_PPP_ASYNC is not set @@ -500,6 +567,7 @@ CONFIG_PPP=m # CONFIG_PPP_MPPE is not set # CONFIG_PPPOE is not set # CONFIG_SLIP is not set +CONFIG_SLHC=y # CONFIG_SHAPER is not set # CONFIG_NETCONSOLE is not set # CONFIG_NETPOLL is not set @@ -514,17 +582,17 @@ CONFIG_PPP=m # Input device support # CONFIG_INPUT=y +# CONFIG_INPUT_FF_MEMLESS is not set # # Userland interfaces # -CONFIG_INPUT_MOUSEDEV=y -# CONFIG_INPUT_MOUSEDEV_PSAUX is not set -CONFIG_INPUT_MOUSEDEV_SCREEN_X=320 -CONFIG_INPUT_MOUSEDEV_SCREEN_Y=480 +# CONFIG_INPUT_MOUSEDEV is not set # CONFIG_INPUT_JOYDEV is not set -# CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=m +CONFIG_INPUT_TSDEV=y +CONFIG_INPUT_TSDEV_SCREEN_X=320 +CONFIG_INPUT_TSDEV_SCREEN_Y=480 +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # @@ -537,8 +605,9 @@ CONFIG_INPUT_KEYBOARD=y # CONFIG_KEYBOARD_XTKBD is not set # CONFIG_KEYBOARD_NEWTON is not set # CONFIG_KEYBOARD_STOWAWAY is not set -CONFIG_KEYBOARD_PXA27x=m -CONFIG_KEYBOARD_PALMIR=m +# CONFIG_GPIO_KEYS is not set +CONFIG_KEYBOARD_PXA27x=y +# CONFIG_KEYBOARD_PALMWK is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set CONFIG_INPUT_TOUCHSCREEN=y @@ -547,20 +616,25 @@ CONFIG_INPUT_TOUCHSCREEN=y # CONFIG_TOUCHSCREEN_ELO is not set # CONFIG_TOUCHSCREEN_MTOUCH is not set # CONFIG_TOUCHSCREEN_MK712 is not set -CONFIG_TOUCHSCREEN_WM97XX=m +# CONFIG_TOUCHSCREEN_PENMOUNT is not set +# CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set +# CONFIG_TOUCHSCREEN_TOUCHWIN is not set +# CONFIG_TOUCHSCREEN_ADC is not set +# CONFIG_TOUCHSCREEN_ADC_DEBOUNCE is not set +# CONFIG_TOUCHSCREEN_UCB1400 is not set +CONFIG_TOUCHSCREEN_WM97XX=y # CONFIG_TOUCHSCREEN_WM9705 is not set CONFIG_TOUCHSCREEN_WM9712=y # CONFIG_TOUCHSCREEN_WM9713 is not set -CONFIG_TOUCHSCREEN_WM97XX_PXA=y -CONFIG_TOUCHSCREEN_WM97XX_ACC=y -CONFIG_INPUT_MISC=y -# CONFIG_INPUT_UINPUT is not set +# CONFIG_TOUCHSCREEN_WM97XX_PXA is not set +# CONFIG_INPUT_MISC is not set # # Hardware I/O ports # -CONFIG_SERIO=m -CONFIG_SERIO_SERPORT=m +CONFIG_SERIO=y +CONFIG_SERIO_SERPORT=y +# CONFIG_SERIO_LIBPS2 is not set # CONFIG_SERIO_RAW is not set # CONFIG_GAMEPORT is not set @@ -570,6 +644,7 @@ CONFIG_SERIO_SERPORT=m CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_HW_CONSOLE=y +# CONFIG_VT_HW_CONSOLE_BINDING is not set # CONFIG_SERIAL_NONSTANDARD is not set # @@ -583,63 +658,13 @@ CONFIG_HW_CONSOLE=y CONFIG_SERIAL_PXA=y CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SERIAL_PXA_COUNT=4 +# CONFIG_SERIAL_PXA_IR is not set CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=256 -# -# I2C support -# -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y - -# -# I2C Algorithms -# -# CONFIG_I2C_ALGOBIT is not set -# CONFIG_I2C_ALGOPCF is not set -# CONFIG_I2C_ALGOPCA is not set -CONFIG_I2C_ALGOPXA=y - -# -# I2C Hardware Bus support -# -# CONFIG_I2C_ELV is not set -CONFIG_I2C_PXA=y -CONFIG_I2C_PXA_SLAVE=y -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_PCA_ISA is not set - -# -# Miscellaneous I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_DS1374 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_I2C_ADCM2650 is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCA9539 is not set -# CONFIG_SENSORS_PCA9535 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_MAX6875 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set - -# -# L3 serial bus support -# -# CONFIG_L3 is not set - -# -# Mice -# -# CONFIG_BUSMOUSE is not set - # # IPMI # @@ -649,21 +674,22 @@ CONFIG_I2C_PXA_SLAVE=y # Watchdog Cards # # CONFIG_WATCHDOG is not set -CONFIG_NVRAM=m +CONFIG_HW_RANDOM=m +# CONFIG_NVRAM is not set CONFIG_SA1100_RTC=m # CONFIG_DTLK is not set # CONFIG_R3964 is not set - -# -# Ftape, the floppy tape device driver -# # CONFIG_RAW_DRIVER is not set # # TPM devices # # CONFIG_TCG_TPM is not set -# CONFIG_TELCLOCK is not set + +# +# I2C support +# +# CONFIG_I2C is not set # # SPI support @@ -689,42 +715,19 @@ CONFIG_SPI_PXA2XX=y # # Hardware Monitoring support # -CONFIG_HWMON=m +# CONFIG_HWMON is not set # CONFIG_HWMON_VID is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_ATXP1 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_F71805F is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83792D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set -# CONFIG_SENSORS_W83627EHF is not set -# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Hardware Monitoring - Battery +# +CONFIG_BATTERY_MONITOR=y +# CONFIG_ADC_BATTERY is not set + +# +# L3 serial bus support +# +# CONFIG_L3 is not set # # SoC drivers @@ -733,23 +736,31 @@ CONFIG_HWMON=m # CONFIG_SOC_T7L66XB is not set # CONFIG_SOC_TC6387XB is not set # CONFIG_SOC_TC6393XB is not set +# CONFIG_SOC_SAMCOP is not set +# CONFIG_SOC_HAMCOP is not set # CONFIG_HTC_ASIC2 is not set # CONFIG_HTC_ASIC3 is not set +# CONFIG_HTC_ASIC3_DS1WM is not set +# CONFIG_SOC_TSC2200 is not set # # Misc devices # -CONFIG_BATTERY_MONITOR=m +# CONFIG_BATTCHARGE_MONITOR is not set # # Multimedia Capabilities Port drivers # # CONFIG_MCP is not set +# CONFIG_ADC_ADS7846_SSP is not set +# CONFIG_ADC_AD7877 is not set +# CONFIG_TIFM_CORE is not set # # LED devices # -# CONFIG_NEW_LEDS is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y # # LED drivers @@ -758,13 +769,38 @@ CONFIG_BATTERY_MONITOR=m # # LED Triggers # +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_TIMER=y +# CONFIG_LEDS_TRIGGER_HWTIMER is not set +CONFIG_LEDS_TRIGGER_MMC_CARD=y +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +# CONFIG_LEDS_TRIGGER_SHARED is not set # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L1=y +CONFIG_VIDEO_V4L1_COMPAT=y CONFIG_VIDEO_V4L2=y +# +# Video Capture Adapters +# + +# +# Video Capture Adapters +# +CONFIG_VIDEO_ADV_DEBUG=y +CONFIG_VIDEO_HELPER_CHIPS_AUTO=y +# CONFIG_VIDEO_VIVI is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_PXA_CAMERA is not set + +# +# Radio Adapters +# + # # Digital Video Broadcasting Devices # @@ -773,19 +809,22 @@ CONFIG_VIDEO_V4L2=y # # Graphics support # +CONFIG_FIRMWARE_EDID=y CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y # CONFIG_FB_MACMODES is not set -CONFIG_FB_FIRMWARE_EDID=y -CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set # CONFIG_FB_TILEBLITTING is not set # CONFIG_FB_IMAGEON is not set # CONFIG_FB_S1D13XXX is not set CONFIG_FB_PXA=y -# CONFIG_FB_PXA_PARAMETERS is not set +CONFIG_FB_PXA_PARAMETERS=y +# CONFIG_FB_MBX is not set # CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_VSFB is not set # # Console display driver support @@ -794,43 +833,48 @@ CONFIG_FB_PXA=y CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -# CONFIG_FONTS is not set +CONFIG_FONTS=y CONFIG_FONT_8x8=y -CONFIG_FONT_8x16=y +# CONFIG_FONT_8x16 is not set +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set # # Logo configuration # CONFIG_LOGO=y -CONFIG_LOGO_LINUX_MONO=y -CONFIG_LOGO_LINUX_VGA16=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set CONFIG_LOGO_LINUX_CLUT224=y CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_CLASS_DEVICE=m +CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_DEVICE=y +# CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_CORGI is not set -CONFIG_BACKLIGHT_PXAPWM=m -CONFIG_LCD_CLASS_DEVICE=m -CONFIG_LCD_DEVICE=y +CONFIG_BACKLIGHT_PXAPWM=y # # Sound # -CONFIG_SOUND=m +CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_SEQUENCER=m -# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +# CONFIG_SND_SEQUENCER is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y CONFIG_SND_PCM_OSS_PLUGINS=y -CONFIG_SND_SEQUENCER_OSS=y # CONFIG_SND_DYNAMIC_MINORS is not set # CONFIG_SND_SUPPORT_OLD_API is not set # CONFIG_SND_VERBOSE_PROCFS is not set @@ -840,10 +884,8 @@ CONFIG_SND_SEQUENCER_OSS=y # # Generic devices # -CONFIG_SND_AC97_CODEC=m -CONFIG_SND_AC97_BUS=m +CONFIG_SND_AC97_CODEC=y # CONFIG_SND_DUMMY is not set -# CONFIG_SND_VIRMIDI is not set # CONFIG_SND_MTPAV is not set # CONFIG_SND_SERIAL_U16550 is not set # CONFIG_SND_MPU401 is not set @@ -851,22 +893,25 @@ CONFIG_SND_AC97_BUS=m # # ALSA ARM devices # -# CONFIG_SND_A716 is not set -# CONFIG_SND_H1910 is not set -# CONFIG_SND_H2200 is not set -# CONFIG_SND_H4000 is not set -# CONFIG_SND_HTCMAGICIAN is not set -# CONFIG_SND_HX4700 is not set -# CONFIG_SND_HTCUNIVERSAL is not set -# CONFIG_SND_H5XXX_AK4535 is not set -CONFIG_SND_PXA2xx_I2SOUND=m -CONFIG_SND_PXA2XX_PCM=m -CONFIG_SND_PXA2XX_AC97=m +# CONFIG_SND_PXA2xx_I2SOUND is not set +CONFIG_SND_PXA2XX_PCM=y +CONFIG_SND_PXA2XX_AC97=y + +# +# SoC audio support +# +# CONFIG_SND_SOC is not set # # Open Sound System # # CONFIG_SOUND_PRIME is not set +CONFIG_AC97_BUS=y + +# +# HID Devices +# +CONFIG_HID=y # # USB support @@ -883,17 +928,18 @@ CONFIG_USB_ARCH_HAS_OHCI=y # # USB Gadget Support # -CONFIG_USB_GADGET=m +CONFIG_USB_GADGET=y # CONFIG_USB_GADGET_DEBUG_FILES is not set CONFIG_USB_GADGET_SELECTED=y # CONFIG_USB_GADGET_NET2280 is not set # CONFIG_USB_GADGET_PXA2XX is not set CONFIG_USB_GADGET_PXA27X=y -CONFIG_USB_PXA27X=m +CONFIG_USB_PXA27X=y # CONFIG_USB_PXA27X_DMA is not set # CONFIG_USB_GADGET_GOKU is not set # CONFIG_USB_GADGET_MQ11XX is not set # CONFIG_USB_GADGET_LH7A40X is not set +# CONFIG_USB_GADGET_S3C2410 is not set # CONFIG_USB_GADGET_OMAP is not set # CONFIG_USB_GADGET_AT91 is not set # CONFIG_USB_GADGET_DUMMY_HCD is not set @@ -901,11 +947,11 @@ CONFIG_USB_PXA27X=m # CONFIG_USB_ZERO is not set CONFIG_USB_ETH=m # CONFIG_USB_ETH_RNDIS is not set -CONFIG_USB_GADGETFS=m -CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set -CONFIG_USB_G_SERIAL=m -CONFIG_USB_G_CHAR=m +# CONFIG_USB_GADGETFS is not set +# CONFIG_USB_FILE_STORAGE is not set +# CONFIG_USB_G_SERIAL is not set +# CONFIG_USB_MIDI_GADGET is not set +# CONFIG_USB_G_CHAR is not set # # MMC/SD Card support @@ -914,16 +960,16 @@ CONFIG_MMC=y # CONFIG_MMC_DEBUG is not set CONFIG_MMC_BLOCK=y CONFIG_MMC_PXA=y +# CONFIG_MMC_TIFM_SD is not set # CONFIG_MMC_TMIO is not set # CONFIG_MMC_SAMCOP is not set -# CONFIG_MMC_ASIC3 is not set -# CONFIG_MMC_WBSD_PALMT3 is not set # # Real Time Clock # CONFIG_RTC_LIB=y CONFIG_RTC_CLASS=m +CONFIG_RTC_EPOCH=1970 # # RTC interfaces @@ -931,17 +977,19 @@ CONFIG_RTC_CLASS=m CONFIG_RTC_INTF_SYSFS=m CONFIG_RTC_INTF_PROC=m CONFIG_RTC_INTF_DEV=m +# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set # # RTC drivers # -# CONFIG_RTC_DRV_X1205 is not set -# CONFIG_RTC_DRV_DS1672 is not set -# CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_RS5C348 is not set # CONFIG_RTC_DRV_M48T86 is not set CONFIG_RTC_DRV_SA1100=m # CONFIG_RTC_DRV_TEST is not set +# CONFIG_RTC_DRV_MAX6902 is not set +# CONFIG_RTC_DRV_V3020 is not set # # File systems @@ -950,18 +998,20 @@ CONFIG_EXT2_FS=y # CONFIG_EXT2_FS_XATTR is not set # CONFIG_EXT2_FS_XIP is not set # CONFIG_EXT3_FS is not set +# CONFIG_EXT4DEV_FS is not set # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set # CONFIG_FS_POSIX_ACL is not set # CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set # CONFIG_OCFS2_FS is not set -CONFIG_MINIX_FS=m +# CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set -CONFIG_INOTIFY=y +# CONFIG_INOTIFY is not set # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y -# CONFIG_AUTOFS_FS is not set -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS_FS=y +CONFIG_AUTOFS4_FS=y # CONFIG_FUSE_FS is not set # @@ -984,8 +1034,10 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # Pseudo filesystems # CONFIG_PROC_FS=y +CONFIG_PROC_SYSCTL=y CONFIG_SYSFS=y CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set # CONFIG_HUGETLB_PAGE is not set CONFIG_RAMFS=y # CONFIG_CONFIGFS_FS is not set @@ -994,23 +1046,24 @@ CONFIG_RAMFS=y # Miscellaneous filesystems # # CONFIG_ADFS_FS is not set -CONFIG_AFFS_FS=m +# CONFIG_AFFS_FS is not set # CONFIG_HFS_FS is not set # CONFIG_HFSPLUS_FS is not set # CONFIG_BEFS_FS is not set # CONFIG_BFS_FS is not set # CONFIG_EFS_FS is not set -CONFIG_CRAMFS=m -CONFIG_SQUASHFS=m +# CONFIG_CRAMFS is not set +CONFIG_SQUASHFS=y CONFIG_SQUASHFS_EMBEDDED=y CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 -CONFIG_SQUASHFS_VMALLOC=y +# CONFIG_SQUASHFS_VMALLOC is not set +# CONFIG_SQUASHFS_LZMA is not set # CONFIG_VXFS_FS is not set # CONFIG_HPFS_FS is not set # CONFIG_QNX4FS_FS is not set # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set -CONFIG_UNION_FS=m +# CONFIG_UNION_FS is not set # # Network File Systems @@ -1025,8 +1078,7 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m # CONFIG_RPCSEC_GSS_KRB5 is not set # CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -# CONFIG_SMB_NLS_DEFAULT is not set +# CONFIG_SMB_FS is not set # CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set @@ -1057,7 +1109,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_863 is not set # CONFIG_NLS_CODEPAGE_864 is not set # CONFIG_NLS_CODEPAGE_865 is not set -# CONFIG_NLS_CODEPAGE_866 is not set +CONFIG_NLS_CODEPAGE_866=y # CONFIG_NLS_CODEPAGE_869 is not set # CONFIG_NLS_CODEPAGE_936 is not set # CONFIG_NLS_CODEPAGE_950 is not set @@ -1069,7 +1121,7 @@ CONFIG_NLS_CODEPAGE_437=y # CONFIG_NLS_CODEPAGE_1251 is not set # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -# CONFIG_NLS_ISO8859_2 is not set +CONFIG_NLS_ISO8859_2=y # CONFIG_NLS_ISO8859_3 is not set # CONFIG_NLS_ISO8859_4 is not set # CONFIG_NLS_ISO8859_5 is not set @@ -1079,10 +1131,15 @@ CONFIG_NLS_ISO8859_1=y # CONFIG_NLS_ISO8859_13 is not set # CONFIG_NLS_ISO8859_14 is not set # CONFIG_NLS_ISO8859_15 is not set -# CONFIG_NLS_KOI8_R is not set +CONFIG_NLS_KOI8_R=y # CONFIG_NLS_KOI8_U is not set CONFIG_NLS_UTF8=y +# +# Distributed Lock Manager +# +# CONFIG_DLM is not set + # # Profiling support # @@ -1092,14 +1149,16 @@ CONFIG_NLS_UTF8=y # Kernel hacking # # CONFIG_PRINTK_TIME is not set +CONFIG_ENABLE_MUST_CHECK=y # CONFIG_MAGIC_SYSRQ is not set +# CONFIG_UNUSED_SYMBOLS is not set +# CONFIG_DEBUG_FS is not set +# CONFIG_HEADERS_CHECK is not set # CONFIG_SMALLOOPS is not set # CONFIG_DEBUG_KERNEL is not set CONFIG_LOG_BUF_SHIFT=14 -CONFIG_DEBUG_BUGVERBOSE=y -# CONFIG_DEBUG_FS is not set +# CONFIG_DEBUG_BUGVERBOSE is not set CONFIG_FRAME_POINTER=y -# CONFIG_UNWIND_INFO is not set # CONFIG_DEBUG_USER is not set # @@ -1111,7 +1170,39 @@ CONFIG_FRAME_POINTER=y # # Cryptographic options # -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=y +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_MANAGER=m +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_GF128MUL is not set +CONFIG_CRYPTO_ECB=m +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_TWOFISH is not set +# CONFIG_CRYPTO_SERPENT is not set +CONFIG_CRYPTO_AES=m +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_TEA is not set +CONFIG_CRYPTO_ARC4=m +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_TEST is not set # # Hardware crypto devices @@ -1120,8 +1211,11 @@ CONFIG_FRAME_POINTER=y # # Library routines # +CONFIG_BITREVERSE=y CONFIG_CRC_CCITT=y -CONFIG_CRC16=m +# CONFIG_CRC16 is not set CONFIG_CRC32=y -CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m +# CONFIG_LIBCRC32C is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_PLIST=y +CONFIG_IOMAP_COPY=y diff --git a/packages/linux/linux-hackndev-2.6_svn.bb b/packages/linux/linux-hackndev-2.6_svn.bb index 3eee7171c0..552356e23a 100644 --- a/packages/linux/linux-hackndev-2.6_svn.bb +++ b/packages/linux/linux-hackndev-2.6_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Hack&Dev's Linux kernel for Palm devices." HOMEPAGE = "http://www.hackndev.com/" SECTION = "kernel" LICENSE = "GPL" -PR = "r3" +PR = "r4" COMPATIBLE_MACHINE = "(palmtt3|palmtx|palmld|palmz72)" -- cgit v1.2.3 From e034d2dc97af3615a02b7c4bf5f24ef7b36a0325 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 30 Mar 2007 10:49:22 +0000 Subject: openmoko-libs: split to have libmokoui and libmokojournal packages --- packages/openmoko-base/openmoko-libs_svn.bb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index 3ac18438b1..e7b711e627 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -3,7 +3,7 @@ SECTION = "openmoko/libs" LICENSE = "LGPL" DEPENDS += "gtk+" PV = "0.0.1+svn${SRCDATE}" -PR = "r1" +PR = "r2" inherit openmoko @@ -17,3 +17,8 @@ do_stage() { autotools_stage_all } +PACKAGES =+ "libmokojournal libmokojournal-dev libmokojournal-dbg" + +FILES_libmokojournal = "${libdir}/libmokojournal.so.*" +FILES_libmokojournal-dev = "${libdir}/libmokojournal.so ${libdir}/libmokojournal.*a ${includedir}/${PN}/libmokojournal" +FILES_libmokojournal-dbg = "${libdir}/.debug/libmokojournal.so.*" -- cgit v1.2.3 From 0c8eace2c9c704059d9296a518dbf3c0b2f241f7 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 11:05:28 +0000 Subject: xserver-kdrive-1.2.0: add library order fix for xcalibrate --- .../xserver-kdrive-1.2.0/enable-xcalibrate.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch index c82aa943d2..11931f83d6 100644 --- a/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch +++ b/packages/xorg-xserver/xserver-kdrive-1.2.0/enable-xcalibrate.patch @@ -36,3 +36,16 @@ Index: xorg-server-1.2.0/include/kdrive-config.h.in /* Verbose debugging output hilarity */ #undef DEBUG +Index: xorg-server-1.2.0/configure.ac +=================================================================== +--- xorg-server-1.2.0.orig/configure.ac 2007-03-30 12:47:25.000000000 +0200 ++++ xorg-server-1.2.0/configure.ac 2007-03-30 12:39:01.000000000 +0200 +@@ -1540,7 +1540,7 @@ + ;; + esac + KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.a' +- KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_OS_LIB $KDRIVE_PURE_LIBS $KDRIVE_STUB_LIB $TSLIB_LIBS" ++ KDRIVE_LIBS="$DIX_LIB $KDRIVE_LIB $KDRIVE_PURE_LIBS $KDRIVE_OS_LIB $KDRIVE_STUB_LIB $TSLIB_LIBS" + + # check if we can build Xephyr + PKG_CHECK_MODULES(XEPHYR, x11 xext xfont xau xdmcp, [xephyr="yes"], [xephyr="no"]) -- cgit v1.2.3 From ab2e41a69b24e268c5b68b1df99cd40a314e5538 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 11:16:02 +0000 Subject: kdrive 1.2: bump PR due to patch changes --- packages/xorg-xserver/xserver-kdrive_1.2.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb index b64bfe8ff9..e6cd3b2f30 100644 --- a/packages/xorg-xserver/xserver-kdrive_1.2.0.bb +++ b/packages/xorg-xserver/xserver-kdrive_1.2.0.bb @@ -3,7 +3,7 @@ require xserver-kdrive-common.inc DEPENDS += "libxkbfile libxcalibrate" PE = "1" -PR = "r3" +PR = "r4" SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \ ${KDRIVE_COMMON_PATCHES} \ -- cgit v1.2.3 From 6f13dc66f80d2aa264f58e88c905e63cc65158d1 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 11:29:23 +0000 Subject: sysvinit: merge psplash reboot handling from poky --- packages/sysvinit/sysvinit/angstrom/rc | 54 ++++++++++++++++------------------ packages/sysvinit/sysvinit_2.86.bb | 2 +- 2 files changed, 27 insertions(+), 29 deletions(-) (limited to 'packages') diff --git a/packages/sysvinit/sysvinit/angstrom/rc b/packages/sysvinit/sysvinit/angstrom/rc index e43ddec14b..30b69ad516 100755 --- a/packages/sysvinit/sysvinit/angstrom/rc +++ b/packages/sysvinit/sysvinit/angstrom/rc @@ -1,5 +1,4 @@ #!/bin/sh - # # rc This file is responsible for starting/stopping # services when the runlevel changes. @@ -21,13 +20,12 @@ export VERBOSE startup_progress() { step=$(($step + $step_change)) - - if [ $(($num_steps + $first_step)) -lt 1 ]; then - num_steps="1" - first_step="0" + if [ "$num_steps" != "0" ]; then + progress=$((($step * $progress_size / $num_steps) + $first_step)) + else + progress=$progress_size fi - - progress=$(($step * $progress_size / $num_steps + $first_step)) + #echo "PROGRESS is $progress $runlevel $first_step + ($step of $num_steps) $step_change $progress_size" if type psplash-write >/dev/null 2>&1; then TMPDIR=/mnt/.psplash psplash-write "PROGRESS $progress" || true fi @@ -93,10 +91,10 @@ startup() { case "$runlevel" in 0|6) - # Count down from 0 to -100 and use the entire bar - first_step=0 + # Count down from -100 to 0 and use the entire bar + first_step=-100 progress_size=100 - step_change=-1 + step_change=1 ;; S) # Begin where the initramfs left off and use 2/3 @@ -113,6 +111,17 @@ startup() { ;; esac + num_steps=0 + for s in /etc/rc$runlevel.d/[SK]*; do + case "${s##/etc/rc$runlevel.d/S??}" in + gdm|xdm|kdm|reboot|halt) + break + ;; + esac + num_steps=$(($num_steps + 1)) + done + step=0 + # First, run the KILL scripts. if [ $previous != N ] then @@ -126,18 +135,6 @@ startup() { done fi - num_steps=0 - for s in /etc/rc$runlevel.d/[SK]*; do - case "${s##/etc/rc$runlevel.d/S??}" in - gdm|xdm|kdm|reboot|halt) - break - ;; - esac - num_steps=$(($num_steps + 1)) - done - - step=0 - # Now run the START scripts for this runlevel. for i in /etc/rc$runlevel.d/S* do @@ -170,9 +167,10 @@ startup() { done fi -if [ "x$runlevel" != "xS" ]; then - if type psplash-write >/dev/null 2>&1; then - TMPDIR=/mnt/.psplash psplash-write "QUIT" || true - umount /mnt/.psplash - fi -fi +#Uncomment to cause psplash to exit manually, otherwise it exits when it sees a VC switch +#if [ "x$runlevel" != "xS" ]; then +# if type psplash-write >/dev/null 2>&1; then +# TMPDIR=/mnt/.psplash psplash-write "QUIT" || true +# umount /mnt/.psplash +# fi +#fi diff --git a/packages/sysvinit/sysvinit_2.86.bb b/packages/sysvinit/sysvinit_2.86.bb index a4c4ff8381..c8ce5ba191 100644 --- a/packages/sysvinit/sysvinit_2.86.bb +++ b/packages/sysvinit/sysvinit_2.86.bb @@ -2,7 +2,7 @@ DESCRIPTION = "System-V like init." SECTION = "base" LICENSE = "GPL" HOMEPAGE = "http://freshmeat.net/projects/sysvinit/" -PR = "r33" +PR = "r34" # USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf. # Set PACKAGE_ARCH appropriately. -- cgit v1.2.3 From f5c1c72a24ccd65421665de22dce70089d1cf30c Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 11:36:06 +0000 Subject: openmoko-libs: add eds-dbus dep --- packages/openmoko-base/openmoko-libs_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/openmoko-base/openmoko-libs_svn.bb b/packages/openmoko-base/openmoko-libs_svn.bb index e7b711e627..b478ca2604 100644 --- a/packages/openmoko-base/openmoko-libs_svn.bb +++ b/packages/openmoko-base/openmoko-libs_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based application framework for mobile communication applications" SECTION = "openmoko/libs" LICENSE = "LGPL" -DEPENDS += "gtk+" +DEPENDS += "gtk+ eds-dbus" PV = "0.0.1+svn${SRCDATE}" PR = "r2" -- cgit v1.2.3 From a9784bef976a1bee8cb58f2422fc6e9055ff8090 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 11:42:33 +0000 Subject: matchbox-panel-2: don't replace matchbox-panel, not ready yet. --- packages/matchbox2/matchbox-panel-2_svn.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/matchbox2/matchbox-panel-2_svn.bb b/packages/matchbox2/matchbox-panel-2_svn.bb index 5022afa41a..d166e78a3a 100644 --- a/packages/matchbox2/matchbox-panel-2_svn.bb +++ b/packages/matchbox2/matchbox-panel-2_svn.bb @@ -3,11 +3,10 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+" -RREPLACES_${PN} = "matchbox-panel" RCONFLICTS_${PN} = "matchbox-panel" PV = "0.1+svn${SRCDATE}" -PR = "r4" +PR = "r5" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 582c7a75d0b25062783b087ffcc6cd4a3cd86f4c Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 30 Mar 2007 13:27:13 +0000 Subject: (openmoko-)dates: fix Rconflicts/Rreplaces: they do not replace each other but conflict and only PN --- packages/openmoko-pim/openmoko-dates_svn.bb | 5 ++--- packages/pimlico/dates.inc | 3 +-- packages/pimlico/dates_0.3.1.bb | 2 +- packages/pimlico/dates_svn.bb | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) (limited to 'packages') diff --git a/packages/openmoko-pim/openmoko-dates_svn.bb b/packages/openmoko-pim/openmoko-dates_svn.bb index cc5978f546..af927ddc47 100644 --- a/packages/openmoko-pim/openmoko-dates_svn.bb +++ b/packages/openmoko-pim/openmoko-dates_svn.bb @@ -3,10 +3,9 @@ SECTION = "openmoko/pim" LICENSE = "GPL" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus openmoko-libs" RDEPENDS = "libedata-cal" -RCONFLICTS = "dates" -RREPLACES = "dates" +RCONFLICTS_${PN} = "dates" PV = "0.1+svn${SRCDATE}" -PR = "r7" +PR = "r8" inherit gnome autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/dates.inc b/packages/pimlico/dates.inc index 641ff60aea..4f92b2c767 100644 --- a/packages/pimlico/dates.inc +++ b/packages/pimlico/dates.inc @@ -3,8 +3,7 @@ LICENSE = "LGPL" SECTION = "x11" DEPENDS = "glib-2.0 gtk+ libglade eds-dbus" RDEPENDS = "libedata-cal" -RCONFLICTS = "openmoko-dates" -RREPLACES = "openmoko-dates" +RCONFLICTS_${PN} = "openmoko-dates" inherit autotools pkgconfig gtk-icon-cache diff --git a/packages/pimlico/dates_0.3.1.bb b/packages/pimlico/dates_0.3.1.bb index 731ca31289..176d2b9077 100644 --- a/packages/pimlico/dates_0.3.1.bb +++ b/packages/pimlico/dates_0.3.1.bb @@ -1,5 +1,5 @@ require dates.inc -PR = "r2" +PR = "r3" SRC_URI = "http://projects.o-hand.com/sources/dates/dates-${PV}.tar.gz" diff --git a/packages/pimlico/dates_svn.bb b/packages/pimlico/dates_svn.bb index 956eb3dc64..cac0eb4fae 100644 --- a/packages/pimlico/dates_svn.bb +++ b/packages/pimlico/dates_svn.bb @@ -1,6 +1,6 @@ require dates.inc -PR = "r1" +PR = "r2" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 72841378a42ae082ec6790f3debb66433fc495bc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 13:37:40 +0000 Subject: libopie2 cvs: Deactivate patches applied upstream. --- packages/libopie/libopie2_cvs.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 1979f5e95e..4a3d3c28c5 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -6,9 +6,10 @@ PR = "r6" DEFAULT_PREFERENCE = "-1" SRC_URI = "${HANDHELDS_CVS};module=opie/libopie2 \ - file://exports.patch;patch=1 \ file://include.pro" +# Patches merged upstream, keep for reference (for 1.2.2) # file://ipaq-lcd-rotate-cleanup.patch;patch=1 \ +# file://exports.patch;patch=1 \ SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1" -- cgit v1.2.3 From 29aa31acd126ef0a347c120e8cdd3349417adbb4 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 13:58:41 +0000 Subject: gsmd: add line discipline switch for magician --- packages/gsm/files/magician/default | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/gsm/files/magician/default b/packages/gsm/files/magician/default index fb19d46fd5..a9c3b94b1d 100644 --- a/packages/gsm/files/magician/default +++ b/packages/gsm/files/magician/default @@ -1,7 +1,7 @@ # gsmd This shell script configures for the gsmd init script. -# If you must specify special options, uncomment and modify the next line -GSMD_OPTS="-s 115200 -F" +# Set line Discipline 17 (N_TIHTC), needs ldisc.patch-ed gsmd +GSMD_OPTS="-s 115200 -F -D 17" # If your GSM device needs to be powered up, uncomment and modify the next line #GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" -- cgit v1.2.3 From d6ac2d47a758269528711ece6c5a6f64878e5a1d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 14:01:53 +0000 Subject: gsmd: don't fail if GSM_POW is not set --- packages/gsm/files/gsmd | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd index 4b8db5d5a5..5c78e8178a 100644 --- a/packages/gsm/files/gsmd +++ b/packages/gsm/files/gsmd @@ -16,21 +16,21 @@ RETVAL=0 prog="gsmd" start() { - # FIXME add check whether GSM_POW is set at all, otherwise don't try to power on - # Power on GSM device - # Hack for broken uboot and/or kernel on the neo1973 dmesg -n1 - if [ -e "${GSM_POW}" ] + if [ -n "${GSM_POW}" ] then - echo -n "Powering up GSM device..." - echo "1" > ${GSM_POW} - sleep 1 - echo "done" - else - echo "GSM device not found. Aborting startup" - return false + if [ -e "${GSM_POW}" ] + then + echo -n "Powering up GSM device..." + echo "1" > ${GSM_POW} + sleep 1 + echo "done" + else + echo "GSM device not found. Aborting startup" + return false + fi fi # Start daemons. echo -n "Starting $prog: " -- cgit v1.2.3 From cb09656337463d35f4788874f0b3ab540cf1d40d Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 14:02:09 +0000 Subject: gsmd: bump PR --- packages/gsm/libgsmd_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 910fa26d4d..0b3a29e931 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.0+svn${SRCDATE}" -PR = "r7" +PR = "r8" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ -- cgit v1.2.3 From 7ef937bdbcf17970532f161b2429f086b28ccb40 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Fri, 30 Mar 2007 14:22:16 +0000 Subject: avahi: fix postinst scripts so that they don't break when installing avahi-autoipd before avahi-daemon --- packages/avahi/avahi.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/avahi/avahi.inc b/packages/avahi/avahi.inc index fb71361a1d..72583cb7e9 100644 --- a/packages/avahi/avahi.inc +++ b/packages/avahi/avahi.inc @@ -4,7 +4,7 @@ HOMEPAGE = "http://avahi.org" SECTION = "network" PRIORITY = "optional" LICENSE = "GPL" -PR="r1" +PR="r2" DEPENDS = "expat libdaemon dbus glib-2.0" RRECOMMENDS = "libnss-mdns" @@ -55,8 +55,8 @@ pkg_postinst_avahi-daemon () { if [ "x$D" != "x" ]; then exit 1 fi - grep avahi /etc/group || addgroup avahi - grep avahi /etc/passwd || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi + grep "^avahi:" /etc/group > /dev/null || addgroup avahi + grep "^avahi:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/run/avahi-daemon --no-create-home avahi --ingroup avahi -g Avahi DBUSPID=`pidof dbus-daemon` @@ -70,8 +70,8 @@ pkg_postinst_avahi-autoipd () { if [ "x$D" != "x" ]; then exit 1 fi - grep avahi-autoipd /etc/group || addgroup avahi-autoipd - grep avahi-autoipd /etc/passwd || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" + grep "^avahi-autoipd:" /etc/group > /dev/null || addgroup avahi-autoipd + grep "^avahi-autoipd:" /etc/passwd > /dev/null || adduser --disabled-password --system --home /var/lib/avahi-autoipd --no-create-home avahi-autoipd --ingroup avahi-autoipd -g "Avahi autoip daemon" } pkg_postrm_avahi-daemon () { -- cgit v1.2.3 From c5747068f49e45234934ba5ab067e0a4ee589c2a Mon Sep 17 00:00:00 2001 From: Manuel Teira Date: Fri, 30 Mar 2007 15:35:12 +0000 Subject: liboil: upgrade to .11 to avoid sigill on arm, closes #2067 --- packages/liboil/liboil_0.3.11.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/liboil/liboil_0.3.11.bb (limited to 'packages') diff --git a/packages/liboil/liboil_0.3.11.bb b/packages/liboil/liboil_0.3.11.bb new file mode 100644 index 0000000000..94471a26fc --- /dev/null +++ b/packages/liboil/liboil_0.3.11.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "Liboil is a library of simple functions that are optimized for various CPUs." +HOMEPAGE = "http://liboil.freedesktop.org/" +LICENSE = "various" + +SRC_URI = "http://liboil.freedesktop.org/download/${P}.tar.gz" + +inherit autotools pkgconfig + +do_stage() { + autotools_stage_all +} -- cgit v1.2.3 From a31229ef8c96e6ad6dbe5c7b9c78639354b73ec0 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 15:39:06 +0000 Subject: opie-taskbar: Split startup and general configuration files into own package, opie-init. --- packages/opie-init/.mtn2git_empty | 0 packages/opie-init/opie-init.inc | 43 ++++++++++ packages/opie-init/opie-init/.mtn2git_empty | 0 packages/opie-init/opie-init/akita/.mtn2git_empty | 0 packages/opie-init/opie-init/akita/qpe.conf | 22 +++++ packages/opie-init/opie-init/c7x0/.mtn2git_empty | 0 packages/opie-init/opie-init/c7x0/opie | 85 ++++++++++++++++++++ .../opie-init/opie-init/c7x0/qpe-suspend-resume | 33 ++++++++ packages/opie-init/opie-init/c7x0/qpe.conf | 22 +++++ .../opie-init/htcuniversal/.mtn2git_empty | 0 packages/opie-init/opie-init/htcuniversal/qpe.conf | 22 +++++ packages/opie-init/opie-init/locale.conf | 0 packages/opie-init/opie-init/mnci/.mtn2git_empty | 0 packages/opie-init/opie-init/mnci/opie | 79 ++++++++++++++++++ packages/opie-init/opie-init/mnci/qpe.conf | 25 ++++++ packages/opie-init/opie-init/opie | 90 +++++++++++++++++++++ packages/opie-init/opie-init/opie-reorgfiles | 93 ++++++++++++++++++++++ packages/opie-init/opie-init/opie_defaults | 15 ++++ packages/opie-init/opie-init/qpe.conf | 18 +++++ packages/opie-init/opie-init/simpad/.mtn2git_empty | 0 packages/opie-init/opie-init/simpad/qpe.conf | 18 +++++ packages/opie-init/opie-init/spitz/.mtn2git_empty | 0 packages/opie-init/opie-init/spitz/qpe.conf | 22 +++++ packages/opie-init/opie-init/tosa/.mtn2git_empty | 0 packages/opie-init/opie-init/tosa/qpe.conf | 22 +++++ packages/opie-init/opie-init_cvs.bb | 11 +++ packages/opie-taskbar/opie-taskbar.inc | 35 +------- .../opie-taskbar/opie-taskbar/akita/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/akita/qpe.conf | 22 ----- .../opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/c7x0/opie | 85 -------------------- .../opie-taskbar/c7x0/qpe-suspend-resume | 33 -------- packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf | 22 ----- .../opie-taskbar/htcuniversal/.mtn2git_empty | 0 .../opie-taskbar/htcuniversal/qpe.conf | 22 ----- packages/opie-taskbar/opie-taskbar/locale.conf | 0 .../opie-taskbar/opie-taskbar/mnci/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/mnci/opie | 79 ------------------ packages/opie-taskbar/opie-taskbar/mnci/qpe.conf | 25 ------ packages/opie-taskbar/opie-taskbar/opie | 90 --------------------- packages/opie-taskbar/opie-taskbar/opie-reorgfiles | 93 ---------------------- packages/opie-taskbar/opie-taskbar/opie_defaults | 15 ---- packages/opie-taskbar/opie-taskbar/qpe.conf | 18 ----- .../opie-taskbar/simpad/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/simpad/qpe.conf | 18 ----- .../opie-taskbar/opie-taskbar/spitz/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/spitz/qpe.conf | 22 ----- .../opie-taskbar/opie-taskbar/tosa/.mtn2git_empty | 0 packages/opie-taskbar/opie-taskbar/tosa/qpe.conf | 22 ----- packages/opie-taskbar/opie-taskbar_1.2.2.bb | 10 +-- packages/opie-taskbar/opie-taskbar_cvs.bb | 10 +-- 51 files changed, 626 insertions(+), 615 deletions(-) create mode 100644 packages/opie-init/.mtn2git_empty create mode 100644 packages/opie-init/opie-init.inc create mode 100644 packages/opie-init/opie-init/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/akita/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/akita/qpe.conf create mode 100644 packages/opie-init/opie-init/c7x0/.mtn2git_empty create mode 100755 packages/opie-init/opie-init/c7x0/opie create mode 100644 packages/opie-init/opie-init/c7x0/qpe-suspend-resume create mode 100644 packages/opie-init/opie-init/c7x0/qpe.conf create mode 100644 packages/opie-init/opie-init/htcuniversal/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/htcuniversal/qpe.conf create mode 100644 packages/opie-init/opie-init/locale.conf create mode 100644 packages/opie-init/opie-init/mnci/.mtn2git_empty create mode 100755 packages/opie-init/opie-init/mnci/opie create mode 100644 packages/opie-init/opie-init/mnci/qpe.conf create mode 100755 packages/opie-init/opie-init/opie create mode 100755 packages/opie-init/opie-init/opie-reorgfiles create mode 100644 packages/opie-init/opie-init/opie_defaults create mode 100644 packages/opie-init/opie-init/qpe.conf create mode 100644 packages/opie-init/opie-init/simpad/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/simpad/qpe.conf create mode 100644 packages/opie-init/opie-init/spitz/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/spitz/qpe.conf create mode 100644 packages/opie-init/opie-init/tosa/.mtn2git_empty create mode 100644 packages/opie-init/opie-init/tosa/qpe.conf create mode 100644 packages/opie-init/opie-init_cvs.bb delete mode 100644 packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/akita/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty delete mode 100755 packages/opie-taskbar/opie-taskbar/c7x0/opie delete mode 100644 packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume delete mode 100644 packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/locale.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty delete mode 100755 packages/opie-taskbar/opie-taskbar/mnci/opie delete mode 100644 packages/opie-taskbar/opie-taskbar/mnci/qpe.conf delete mode 100755 packages/opie-taskbar/opie-taskbar/opie delete mode 100755 packages/opie-taskbar/opie-taskbar/opie-reorgfiles delete mode 100644 packages/opie-taskbar/opie-taskbar/opie_defaults delete mode 100644 packages/opie-taskbar/opie-taskbar/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/simpad/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/spitz/qpe.conf delete mode 100644 packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty delete mode 100644 packages/opie-taskbar/opie-taskbar/tosa/qpe.conf (limited to 'packages') diff --git a/packages/opie-init/.mtn2git_empty b/packages/opie-init/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init.inc b/packages/opie-init/opie-init.inc new file mode 100644 index 0000000000..d8003925f6 --- /dev/null +++ b/packages/opie-init/opie-init.inc @@ -0,0 +1,43 @@ +DESCRIPTION = "Opie Startup scripts and config" +SECTION = "opie/base" +PRIORITY = "optional" +LICENSE = "GPL" +#APPNAME = "qpe" + +#S = "${WORKDIR}/launcher" + +#inherit opie +inherit update-rc.d + +INITSCRIPT_NAME = "opie" +INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." + +do_install() { + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/profile.d + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/etc/skel + + install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie + install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ + + install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ + install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ + + if [ -s ${WORKDIR}/locale.conf ]; then + install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ + fi + + case ${MACHINE} in + c7x0) + install -d ${D}${sysconfdir}/apm/event.d/ + install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh + ;; + *) + ;; + esac +} + +FILES_opie-init_append = " ${sysconfdir} ${palmtopdir}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/opie-init/opie-init/.mtn2git_empty b/packages/opie-init/opie-init/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/akita/.mtn2git_empty b/packages/opie-init/opie-init/akita/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/akita/qpe.conf b/packages/opie-init/opie-init/akita/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/akita/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/c7x0/.mtn2git_empty b/packages/opie-init/opie-init/c7x0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/c7x0/opie b/packages/opie-init/opie-init/c7x0/opie new file mode 100755 index 0000000000..84f3b3e673 --- /dev/null +++ b/packages/opie-init/opie-init/c7x0/opie @@ -0,0 +1,85 @@ +#!/bin/sh +# +[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root +[ -z $HOME ] && export HOME=/home/$LOGNAME + +# we need to tinker directly with qws_display until the ODevice +# default (which is now W100:Rot0:0) works flawlessly with rotation +# and survives a suspend/resume cycle +export QWS_DISPLAY=Transformed:Rot0:0 +# export QWS_DISPLAY=W100:Rot0:0 +export QTDIR=/opt/QtPalmtop +export OPIEDIR=/opt/QtPalmtop +export QPEDIR=/opt/QtPalmtop +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib +export PATH=$PATH:$OPIEDIR/bin + +if [ ! -x "$OPIEDIR/bin/qpe" ] ; then + echo Opie not installed + exit 0 +fi + +. /etc/profile + +for conf in $OPIEDIR/etc/skel/*.conf; do + conf_basename=`basename $conf` + if [ ! -e "$HOME/Settings/$conf_basename" ] ; then + echo "Copying default $conf_basename into $HOME/Settings/" + mkdir -p $HOME/Settings/ + cat $conf >$HOME/Settings/$conf_basename + fi +done + +if [ ! -e "$HOME/systeminfo/linkver" ] ; then + mkdir -p $HOME/systeminfo/ + echo "1.13" >$HOME/systeminfo/linkver +fi + +if [ ! -e "/opt/Qtopia" ] ; then + ln -sf /opt/QtPalmtop /opt/Qtopia +fi + +case $1 in +'start') + #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 + + if [ -x "$OPIEDIR/bin/opie-login" ]; then + echo Starting Opie-login.... + $OPIEDIR/bin/opie-login -terminal 2 + else + $OPIEDIR/bin/opie-reorgfiles + if [ -x /usr/bin/ssh-agent ]; then + SSHAGENT=/usr/bin/ssh-agent + else + SSHAGENT="" + fi + + if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then + export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh + fi + echo Starting Opie.... + $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 + fi + + ;; + +'stop') + echo "Stopping Opie..." + killall qpe 2>/dev/null + killall opie-login 2>/dev/null + killall quicklauncher 2>/dev/null + + ;; + +'restart') + $0 stop && $0 start + + ;; + +*) + echo "usage: $0 { start | stop | restart }" + + ;; + +esac + diff --git a/packages/opie-init/opie-init/c7x0/qpe-suspend-resume b/packages/opie-init/opie-init/c7x0/qpe-suspend-resume new file mode 100644 index 0000000000..be37519512 --- /dev/null +++ b/packages/opie-init/opie-init/c7x0/qpe-suspend-resume @@ -0,0 +1,33 @@ +#!/bin/sh + +QTDIR=/opt/QtPalmtop +LD_LIBRARY_PATH=$QTDIR +export LD_LIBRARY_PATH QTDIR +LOGGING=0 +log() { + if [ $LOGGING -eq 1 ]; then + echo "$(date +%y/%m/%d-%H:%m:%S): $@" >> /var/log/qte.log + fi +} + +retcode=1 +tries=3 + +if [ "$1" = suspend ]; then + while [ $retcode -ne 0 -a $tries -gt 0 ]; do + log "-> $QTDIR/bin/qcop QPE/System 'aboutToSuspend()'" + $QTDIR/bin/qcop QPE/System 'aboutToSuspend()' + retcode=$? + tries=`expr $tries - 1` + log "<- Result $retcode" + done +elif [ "$1" = resume ]; then + while [ $retcode -ne 0 -a $tries -gt 0 ]; do + log "-> $QTDIR/bin/qcop QPE/System 'returnFromSuspend()'" + $QTDIR/bin/qcop QPE/System 'returnFromSuspend()' + retcode=$? + tries=`expr $tries - 1` + log "<- Result $retcode" + done +fi + diff --git a/packages/opie-init/opie-init/c7x0/qpe.conf b/packages/opie-init/opie-init/c7x0/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/c7x0/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/htcuniversal/.mtn2git_empty b/packages/opie-init/opie-init/htcuniversal/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/htcuniversal/qpe.conf b/packages/opie-init/opie-init/htcuniversal/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/htcuniversal/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/locale.conf b/packages/opie-init/opie-init/locale.conf new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/mnci/.mtn2git_empty b/packages/opie-init/opie-init/mnci/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/mnci/opie b/packages/opie-init/opie-init/mnci/opie new file mode 100755 index 0000000000..d5e2955b10 --- /dev/null +++ b/packages/opie-init/opie-init/mnci/opie @@ -0,0 +1,79 @@ +#!/bin/sh +# +[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root +[ -z $HOME ] && export HOME=/home/$LOGNAME + +export QTDIR=/opt/QtPalmtop +export OPIEDIR=/opt/QtPalmtop +export QPEDIR=/opt/QtPalmtop +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib +export PATH=$PATH:$OPIEDIR/bin +# export QWS_KEYBOARD=KernelTTY + +if [ ! -x "$OPIEDIR/bin/qpe" ] ; then + echo Opie not installed + exit 0 +fi + +. /etc/profile + +if [ ! -e "$HOME/Settings/qpe.conf" ] ; then + mkdir -p $HOME/Settings + cp $OPIEDIR/etc/skel/* $HOME/Settings +fi + +if [ ! -e "$HOME/systeminfo/linkver" ] ; then + mkdir -p $HOME/systeminfo/ + echo "1.13" >$HOME/systeminfo/linkver +fi + +if [ ! -e "/opt/Qtopia" ] ; then + ln -sf /opt/QtPalmtop /opt/Qtopia +fi + +case $1 in +'start') + if [ -x "$OPIEDIR/bin/opie-login" ]; then + echo Starting Opie-login.... + $OPIEDIR/bin/opie-login -terminal 2 + else + $OPIEDIR/bin/opie-reorgfiles >/dev/null + if [ -x /usr/bin/ssh-agent ]; then + SSHAGENT=/usr/bin/ssh-agent + else + SSHAGENT="" + fi + + if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then + export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh + fi + echo Starting Opie.... + $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 2>/dev/null + fi + + ;; + +'stop') + echo "Stopping Opie..." + killall qpe 2>/dev/null + killall opie-login 2>/dev/null + killall quicklauncher 2>/dev/null + sleep 1 + killall -9 qpe 2>/dev/null + killall -9 opie-login 2>/dev/null + killall -9 quicklauncher 2>/dev/null + + ;; + +'restart') + $0 stop && $0 start + + ;; + +*) + echo "usage: $0 { start | stop | restart }" + + ;; + +esac + diff --git a/packages/opie-init/opie-init/mnci/qpe.conf b/packages/opie-init/opie-init/mnci/qpe.conf new file mode 100644 index 0000000000..8efe771ad0 --- /dev/null +++ b/packages/opie-init/opie-init/mnci/qpe.conf @@ -0,0 +1,25 @@ +[Appearance] +Decoration = libflat.so +FontFamily = vera +FontSize = 10 +FontStyle = Regular +LeftHand = 0 +Style = libflatstyle.so +rotatedir = 0 +[Battery] +[Date] +ClockApplet = 0 +LongOrder = 273 +Separator = . +ShortOrder = 273 +[InputMethod] +current = Multikey +[Keyboard] +[Startup] +FirstUse = 0 +[Time] +AMPM = 0 +MONDAY = 1 +[Volume] +[Wireless] +UpdateFrequency = 2 diff --git a/packages/opie-init/opie-init/opie b/packages/opie-init/opie-init/opie new file mode 100755 index 0000000000..3fe4d0cdf8 --- /dev/null +++ b/packages/opie-init/opie-init/opie @@ -0,0 +1,90 @@ +#!/bin/sh +# +[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root +[ -z $HOME ] && export HOME=/home/$LOGNAME + +export QTDIR=/opt/QtPalmtop +export OPIEDIR=/opt/QtPalmtop +export QPEDIR=/opt/QtPalmtop +export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib +export PATH=$PATH:$OPIEDIR/bin + +if [ ! -x "$OPIEDIR/bin/qpe" ] ; then + echo Opie not installed + exit 0 +fi + +. /etc/profile + +if [ ! -e $TSLIB_TSDEVICE ]; then + export QWS_MOUSE_PROTO=MouseMan:/dev/input/mice +fi + +for conf in $OPIEDIR/etc/skel/*.conf; do + conf_basename=`basename $conf` + if [ ! -e "$HOME/Settings/$conf_basename" ] ; then + echo "Copying default $conf_basename into $HOME/Settings/" + mkdir -p $HOME/Settings/ + cat $conf >$HOME/Settings/$conf_basename + fi +done + +if [ ! -e "$HOME/systeminfo/linkver" ] ; then + mkdir -p $HOME/systeminfo/ + echo "1.13" >$HOME/systeminfo/linkver +fi + +if [ ! -e "/opt/Qtopia" ] ; then + ln -sf /opt/QtPalmtop /opt/Qtopia +fi + +case $1 in +'start') + #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 + + # Turn off psplash if any - sleep is required for anti-race + if [ -e /mnt/.psplash ]; then + TMPDIR=/mnt/.psplash psplash-write "QUIT" || true + sleep 1 + fi + + if [ -x "$OPIEDIR/bin/opie-login" ]; then + echo Starting Opie-login.... + $OPIEDIR/bin/opie-login -terminal 3 + else + $OPIEDIR/bin/opie-reorgfiles + if [ -x /usr/bin/ssh-agent ]; then + SSHAGENT=/usr/bin/ssh-agent + else + SSHAGENT="" + fi + + if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then + export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh + fi + echo Starting Opie.... + $SSHAGENT $OPIEDIR/bin/qpe -terminal 3 + fi + + ;; + +'stop') + echo "Stopping Opie..." + killall qpe 2>/dev/null + killall opie-login 2>/dev/null + killall quicklauncher 2>/dev/null + + ;; + +'restart') + $0 stop && $0 start + + ;; + +*) + echo "usage: $0 { start | stop | restart }" + + ;; + +esac + diff --git a/packages/opie-init/opie-init/opie-reorgfiles b/packages/opie-init/opie-init/opie-reorgfiles new file mode 100755 index 0000000000..96b3e29da4 --- /dev/null +++ b/packages/opie-init/opie-init/opie-reorgfiles @@ -0,0 +1,93 @@ +#!/bin/sh + +APPS=$HOME/Applications +DOCS=$HOME/Documents + +if [ -d $APPS -a "$1" != "-f" ] +then + echo "You seem to already have a $APPS directory." + echo "Assuming it is the Opie Applications directory. Exiting." + exit 0 +fi + +if [ -d $HOME/Apps ] +then + mv $HOME/Apps $APPS +else + mkdir $APPS +fi + +if [ -f $DOCS/addressbook.xml ] +then + if [ -f $APPS/addressbook/addressbook.xml ] + then + echo "$DOCS/addressbook.xml conflicts with $APPS/addressbook/addressbook.xml" + echo "Moving $DOCS/addressbook.xml to $HOME" + mv $DOCS/addressbook.xml $HOME + else + mkdir $APPS/addressbook + mv $DOCS/addressbook.xml $APPS/addressbook + fi +fi + +if [ -f $DOCS/datebooksettings.xml ] +then + echo "$DOCS/datebooksettings.xml is obsolete" + echo "Please re-set your datebook preferences" + rm $DOCS/datebooksettings.xml +fi + +if [ -f $DOCS/datebook.xml ] +then + mkdir $APPS/databook + mv $DOCS/datebook.xml $APPS/databook +fi + +if [ -d $DOCS/qtmail ] +then + mv $DOCS/qtmail $APPS/ +fi + +if [ -f $DOCS/todo.xml ] +then + if [ -f $APPS/todolist/todolist.xml ] + then + mv $DOCS/todo.xml $HOME + echo "$DOCS/todo.xml is superceded by $APPS/todolist/todolist.xml" + echo "$DOCS/todo.xml has been moved to $HOME" + else + echo "NOTE: $DOCS/todo.xml is obsolete. It will move to $APPS/todolist/todolist.xml" + echo "when next you run the latest ToDo application." + fi +fi + +if [ ! -d $APPS/qimpen ] +then + mkdir $APPS/qimpen +fi + +if [ -f $DOCS/asciilower.qpt ] +then + mv $DOCS/asciilower.qpt $APPS/qimpen +fi + +if [ -f $DOCS/asciiupper.qpt ] +then + mv $DOCS/asciiupper.qpt $APPS/qimpen +fi + +if [ -f $DOCS/numeric.qpt ] +then + mv $DOCS/numeric.qpt $APPS/qimpen +fi + +if [ -d "$HOME/.qpe" ] +then + if [ -d "$HOME/Settings" ] + then + mv $HOME/.qpe/* "$HOME/Settings" + rmdir "$HOME/.qpe" + else + mv $HOME/.qpe "$HOME/Settings" + fi +fi diff --git a/packages/opie-init/opie-init/opie_defaults b/packages/opie-init/opie-init/opie_defaults new file mode 100644 index 0000000000..7de76e4276 --- /dev/null +++ b/packages/opie-init/opie-init/opie_defaults @@ -0,0 +1,15 @@ +#!/bin/sh + +MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\(.*\)/\1/;s/^\ //p"`" +KVER="`uname -r | sed -n "s/\([0-9]\)\.\([0-9]\)\..*/\1.\2/p"`" + +case "$MACHINE" in +*Poodle) test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;; +esac + +export QTDIR="/opt/QtPalmtop" +export OPIEDIR="$QTDIR" +export QPEDIR="$QTDIR" +export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPIEDIR/lib" +export PATH="$PATH:$OPIEDIR/bin" + diff --git a/packages/opie-init/opie-init/qpe.conf b/packages/opie-init/opie-init/qpe.conf new file mode 100644 index 0000000000..59bb20c762 --- /dev/null +++ b/packages/opie-init/opie-init/qpe.conf @@ -0,0 +1,18 @@ +[Appearance] +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 9 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 9 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = libphasestyle.so +Text = #000000 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/simpad/.mtn2git_empty b/packages/opie-init/opie-init/simpad/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/simpad/qpe.conf b/packages/opie-init/opie-init/simpad/qpe.conf new file mode 100644 index 0000000000..b10d90b94e --- /dev/null +++ b/packages/opie-init/opie-init/simpad/qpe.conf @@ -0,0 +1,18 @@ +[Appearance] +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 12 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 12 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = libphasestyle.so +Text = #000000 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/spitz/.mtn2git_empty b/packages/opie-init/opie-init/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/spitz/qpe.conf b/packages/opie-init/opie-init/spitz/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/spitz/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init/tosa/.mtn2git_empty b/packages/opie-init/opie-init/tosa/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/opie-init/opie-init/tosa/qpe.conf b/packages/opie-init/opie-init/tosa/qpe.conf new file mode 100644 index 0000000000..e9922e4d86 --- /dev/null +++ b/packages/opie-init/opie-init/tosa/qpe.conf @@ -0,0 +1,22 @@ +[Appearance] +useBigPixmaps = 1 +SmallIconSize = 32 +BigIconSize = 48 +FontFamily = DejaVu_Sans +FontStyle = Regular +FontSize = 16 +FixedFontFamily = DejaVu_Sans_Mono +FixedFontStyle = Regular +FixedFontSize = 14 +Background = #d5d0de +Base = #ffffff +Button = #e3e3e3 +ButtonText = #000000 +Decoration = libliquid.so +Highlight = #52719c +HighlightedText = #ffffff +Style = Windows +Text = #000000 +TabStyle = 1 +[InputMethod] +current = Multikey diff --git a/packages/opie-init/opie-init_cvs.bb b/packages/opie-init/opie-init_cvs.bb new file mode 100644 index 0000000000..b45baeb5ae --- /dev/null +++ b/packages/opie-init/opie-init_cvs.bb @@ -0,0 +1,11 @@ +require ${PN}.inc +PV = "${OPIE_CVS_PV}" +PR = "r0" + +SRC_URI = "file://opie-reorgfiles \ + file://opie \ + file://qpe.conf \ + file://locale.conf \ + file://opie_defaults" + +SRC_URI_append_c7x0 = " file://qpe-suspend-resume" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index 4c357f54b6..8dae3b2484 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -27,10 +27,7 @@ PIXMAP_SIZE_asus730 = "-480x640" PIXMAP_SIZE_htcuniversal= "-480x640" PIXMAP_SIZE_hx4700 = "-480x640" -inherit opie update-rc.d - -INITSCRIPT_NAME = "opie" -INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." +inherit opie do_configure_prepend() { ln -s ${WORKDIR}/calibrate ${S}/calibrate @@ -56,16 +53,13 @@ do_install() { install -d ${D}${palmtopdir}/pics/launcher install -d ${D}${palmtopdir}/pics/logo install -d ${D}${palmtopdir}/pics/RoH/star/ - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/profile.d install -d ${D}${palmtopdir}/etc/colors install -d ${D}${palmtopdir}/etc/skel + install -d ${D}${sysconfdir} install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe - install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/ install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/ - install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ for p in ${PICS} do @@ -80,33 +74,8 @@ do_install() { install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/ install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/ - install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie - install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ - - if [ -s ${WORKDIR}/locale.conf ]; then - install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ - fi - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/ - - case ${MACHINE} in - c7x0) - install -d ${D}${sysconfdir}/apm/event.d/ - install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh - ;; - *) - ;; - esac -} - -updatercd_postinst_mnci() { -if test "x$D" != "x"; then - D="-r $D" -else - D="" # do not autostart at installation time -fi -update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS} } FILES_opie-taskbar_append = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics" diff --git a/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-taskbar/opie-taskbar/c7x0/opie deleted file mode 100755 index 84f3b3e673..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/opie +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh -# -[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root -[ -z $HOME ] && export HOME=/home/$LOGNAME - -# we need to tinker directly with qws_display until the ODevice -# default (which is now W100:Rot0:0) works flawlessly with rotation -# and survives a suspend/resume cycle -export QWS_DISPLAY=Transformed:Rot0:0 -# export QWS_DISPLAY=W100:Rot0:0 -export QTDIR=/opt/QtPalmtop -export OPIEDIR=/opt/QtPalmtop -export QPEDIR=/opt/QtPalmtop -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib -export PATH=$PATH:$OPIEDIR/bin - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -for conf in $OPIEDIR/etc/skel/*.conf; do - conf_basename=`basename $conf` - if [ ! -e "$HOME/Settings/$conf_basename" ] ; then - echo "Copying default $conf_basename into $HOME/Settings/" - mkdir -p $HOME/Settings/ - cat $conf >$HOME/Settings/$conf_basename - fi -done - -if [ ! -e "$HOME/systeminfo/linkver" ] ; then - mkdir -p $HOME/systeminfo/ - echo "1.13" >$HOME/systeminfo/linkver -fi - -if [ ! -e "/opt/Qtopia" ] ; then - ln -sf /opt/QtPalmtop /opt/Qtopia -fi - -case $1 in -'start') - #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 - - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 2 - else - $OPIEDIR/bin/opie-reorgfiles - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi - - if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then - export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh - fi - echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 - fi - - ;; - -'stop') - echo "Stopping Opie..." - killall qpe 2>/dev/null - killall opie-login 2>/dev/null - killall quicklauncher 2>/dev/null - - ;; - -'restart') - $0 stop && $0 start - - ;; - -*) - echo "usage: $0 { start | stop | restart }" - - ;; - -esac - diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume b/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume deleted file mode 100644 index be37519512..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -QTDIR=/opt/QtPalmtop -LD_LIBRARY_PATH=$QTDIR -export LD_LIBRARY_PATH QTDIR -LOGGING=0 -log() { - if [ $LOGGING -eq 1 ]; then - echo "$(date +%y/%m/%d-%H:%m:%S): $@" >> /var/log/qte.log - fi -} - -retcode=1 -tries=3 - -if [ "$1" = suspend ]; then - while [ $retcode -ne 0 -a $tries -gt 0 ]; do - log "-> $QTDIR/bin/qcop QPE/System 'aboutToSuspend()'" - $QTDIR/bin/qcop QPE/System 'aboutToSuspend()' - retcode=$? - tries=`expr $tries - 1` - log "<- Result $retcode" - done -elif [ "$1" = resume ]; then - while [ $retcode -ne 0 -a $tries -gt 0 ]; do - log "-> $QTDIR/bin/qcop QPE/System 'returnFromSuspend()'" - $QTDIR/bin/qcop QPE/System 'returnFromSuspend()' - retcode=$? - tries=`expr $tries - 1` - log "<- Result $retcode" - done -fi - diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf b/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/locale.conf b/packages/opie-taskbar/opie-taskbar/locale.conf deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/mnci/opie b/packages/opie-taskbar/opie-taskbar/mnci/opie deleted file mode 100755 index d5e2955b10..0000000000 --- a/packages/opie-taskbar/opie-taskbar/mnci/opie +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# -[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root -[ -z $HOME ] && export HOME=/home/$LOGNAME - -export QTDIR=/opt/QtPalmtop -export OPIEDIR=/opt/QtPalmtop -export QPEDIR=/opt/QtPalmtop -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib -export PATH=$PATH:$OPIEDIR/bin -# export QWS_KEYBOARD=KernelTTY - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -if [ ! -e "$HOME/Settings/qpe.conf" ] ; then - mkdir -p $HOME/Settings - cp $OPIEDIR/etc/skel/* $HOME/Settings -fi - -if [ ! -e "$HOME/systeminfo/linkver" ] ; then - mkdir -p $HOME/systeminfo/ - echo "1.13" >$HOME/systeminfo/linkver -fi - -if [ ! -e "/opt/Qtopia" ] ; then - ln -sf /opt/QtPalmtop /opt/Qtopia -fi - -case $1 in -'start') - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 2 - else - $OPIEDIR/bin/opie-reorgfiles >/dev/null - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi - - if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then - export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh - fi - echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 2>/dev/null - fi - - ;; - -'stop') - echo "Stopping Opie..." - killall qpe 2>/dev/null - killall opie-login 2>/dev/null - killall quicklauncher 2>/dev/null - sleep 1 - killall -9 qpe 2>/dev/null - killall -9 opie-login 2>/dev/null - killall -9 quicklauncher 2>/dev/null - - ;; - -'restart') - $0 stop && $0 start - - ;; - -*) - echo "usage: $0 { start | stop | restart }" - - ;; - -esac - diff --git a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf b/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf deleted file mode 100644 index 8efe771ad0..0000000000 --- a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf +++ /dev/null @@ -1,25 +0,0 @@ -[Appearance] -Decoration = libflat.so -FontFamily = vera -FontSize = 10 -FontStyle = Regular -LeftHand = 0 -Style = libflatstyle.so -rotatedir = 0 -[Battery] -[Date] -ClockApplet = 0 -LongOrder = 273 -Separator = . -ShortOrder = 273 -[InputMethod] -current = Multikey -[Keyboard] -[Startup] -FirstUse = 0 -[Time] -AMPM = 0 -MONDAY = 1 -[Volume] -[Wireless] -UpdateFrequency = 2 diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie deleted file mode 100755 index 3fe4d0cdf8..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root -[ -z $HOME ] && export HOME=/home/$LOGNAME - -export QTDIR=/opt/QtPalmtop -export OPIEDIR=/opt/QtPalmtop -export QPEDIR=/opt/QtPalmtop -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib -export PATH=$PATH:$OPIEDIR/bin - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -if [ ! -e $TSLIB_TSDEVICE ]; then - export QWS_MOUSE_PROTO=MouseMan:/dev/input/mice -fi - -for conf in $OPIEDIR/etc/skel/*.conf; do - conf_basename=`basename $conf` - if [ ! -e "$HOME/Settings/$conf_basename" ] ; then - echo "Copying default $conf_basename into $HOME/Settings/" - mkdir -p $HOME/Settings/ - cat $conf >$HOME/Settings/$conf_basename - fi -done - -if [ ! -e "$HOME/systeminfo/linkver" ] ; then - mkdir -p $HOME/systeminfo/ - echo "1.13" >$HOME/systeminfo/linkver -fi - -if [ ! -e "/opt/Qtopia" ] ; then - ln -sf /opt/QtPalmtop /opt/Qtopia -fi - -case $1 in -'start') - #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 - - # Turn off psplash if any - sleep is required for anti-race - if [ -e /mnt/.psplash ]; then - TMPDIR=/mnt/.psplash psplash-write "QUIT" || true - sleep 1 - fi - - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 3 - else - $OPIEDIR/bin/opie-reorgfiles - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi - - if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then - export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh - fi - echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 3 - fi - - ;; - -'stop') - echo "Stopping Opie..." - killall qpe 2>/dev/null - killall opie-login 2>/dev/null - killall quicklauncher 2>/dev/null - - ;; - -'restart') - $0 stop && $0 start - - ;; - -*) - echo "usage: $0 { start | stop | restart }" - - ;; - -esac - diff --git a/packages/opie-taskbar/opie-taskbar/opie-reorgfiles b/packages/opie-taskbar/opie-taskbar/opie-reorgfiles deleted file mode 100755 index 96b3e29da4..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie-reorgfiles +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -APPS=$HOME/Applications -DOCS=$HOME/Documents - -if [ -d $APPS -a "$1" != "-f" ] -then - echo "You seem to already have a $APPS directory." - echo "Assuming it is the Opie Applications directory. Exiting." - exit 0 -fi - -if [ -d $HOME/Apps ] -then - mv $HOME/Apps $APPS -else - mkdir $APPS -fi - -if [ -f $DOCS/addressbook.xml ] -then - if [ -f $APPS/addressbook/addressbook.xml ] - then - echo "$DOCS/addressbook.xml conflicts with $APPS/addressbook/addressbook.xml" - echo "Moving $DOCS/addressbook.xml to $HOME" - mv $DOCS/addressbook.xml $HOME - else - mkdir $APPS/addressbook - mv $DOCS/addressbook.xml $APPS/addressbook - fi -fi - -if [ -f $DOCS/datebooksettings.xml ] -then - echo "$DOCS/datebooksettings.xml is obsolete" - echo "Please re-set your datebook preferences" - rm $DOCS/datebooksettings.xml -fi - -if [ -f $DOCS/datebook.xml ] -then - mkdir $APPS/databook - mv $DOCS/datebook.xml $APPS/databook -fi - -if [ -d $DOCS/qtmail ] -then - mv $DOCS/qtmail $APPS/ -fi - -if [ -f $DOCS/todo.xml ] -then - if [ -f $APPS/todolist/todolist.xml ] - then - mv $DOCS/todo.xml $HOME - echo "$DOCS/todo.xml is superceded by $APPS/todolist/todolist.xml" - echo "$DOCS/todo.xml has been moved to $HOME" - else - echo "NOTE: $DOCS/todo.xml is obsolete. It will move to $APPS/todolist/todolist.xml" - echo "when next you run the latest ToDo application." - fi -fi - -if [ ! -d $APPS/qimpen ] -then - mkdir $APPS/qimpen -fi - -if [ -f $DOCS/asciilower.qpt ] -then - mv $DOCS/asciilower.qpt $APPS/qimpen -fi - -if [ -f $DOCS/asciiupper.qpt ] -then - mv $DOCS/asciiupper.qpt $APPS/qimpen -fi - -if [ -f $DOCS/numeric.qpt ] -then - mv $DOCS/numeric.qpt $APPS/qimpen -fi - -if [ -d "$HOME/.qpe" ] -then - if [ -d "$HOME/Settings" ] - then - mv $HOME/.qpe/* "$HOME/Settings" - rmdir "$HOME/.qpe" - else - mv $HOME/.qpe "$HOME/Settings" - fi -fi diff --git a/packages/opie-taskbar/opie-taskbar/opie_defaults b/packages/opie-taskbar/opie-taskbar/opie_defaults deleted file mode 100644 index 7de76e4276..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie_defaults +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\(.*\)/\1/;s/^\ //p"`" -KVER="`uname -r | sed -n "s/\([0-9]\)\.\([0-9]\)\..*/\1.\2/p"`" - -case "$MACHINE" in -*Poodle) test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;; -esac - -export QTDIR="/opt/QtPalmtop" -export OPIEDIR="$QTDIR" -export QPEDIR="$QTDIR" -export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$OPIEDIR/lib" -export PATH="$PATH:$OPIEDIR/bin" - diff --git a/packages/opie-taskbar/opie-taskbar/qpe.conf b/packages/opie-taskbar/opie-taskbar/qpe.conf deleted file mode 100644 index 59bb20c762..0000000000 --- a/packages/opie-taskbar/opie-taskbar/qpe.conf +++ /dev/null @@ -1,18 +0,0 @@ -[Appearance] -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 9 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 9 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = libphasestyle.so -Text = #000000 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf b/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf deleted file mode 100644 index b10d90b94e..0000000000 --- a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf +++ /dev/null @@ -1,18 +0,0 @@ -[Appearance] -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 12 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 12 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = libphasestyle.so -Text = #000000 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index c6151d2327..497bff0953 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r6" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ @@ -10,10 +10,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" + " diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index 41119484c1..6ff5a5ef66 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r6" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -11,10 +11,4 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" + " -- cgit v1.2.3 From f6833e0713ac54ca7dd9017ce012fc12e37d6409 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 15:51:21 +0000 Subject: task-opie: Include opie-init in task-opie-base. --- packages/tasks/task-opie.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-opie.bb b/packages/tasks/task-opie.bb index 616968ea36..c4f493b80d 100644 --- a/packages/tasks/task-opie.bb +++ b/packages/tasks/task-opie.bb @@ -5,7 +5,7 @@ ALLOW_EMPTY = "1" LICENSE = "MIT" PROVIDES = "task-opie-everything" -PR = "r5" +PR = "r6" PACKAGES = "task-opie-applets task-opie-apps task-opie-base \ task-opie-base-applets task-opie-base-apps \ @@ -27,7 +27,7 @@ PACKAGES += "task-opie-everything" # # Dependencies to get the launcher up and running # -RDEPENDS_task-opie-base = "opie-alarm opie-qcop opie-quicklauncher opie-taskbar \ +RDEPENDS_task-opie-base = "opie-init opie-alarm opie-qcop opie-quicklauncher opie-taskbar \ opie-pics opie-sounds opie-freetype ttf-dejavu-sans \ ttf-dejavu-sans-mono" -- cgit v1.2.3 From 5a2b19f3c9fbb5621696b4f20a04e39f251e7df9 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Fri, 30 Mar 2007 16:00:24 +0000 Subject: gammu: updated to 1.10.0 --- packages/gammu/files/.mtn2git_empty | 0 packages/gammu/files/ldflags-again.patch | 13 ++++++ packages/gammu/gammu_1.07.00.bb | 75 ------------------------------- packages/gammu/gammu_1.10.0.bb | 77 ++++++++++++++++++++++++++++++++ 4 files changed, 90 insertions(+), 75 deletions(-) create mode 100644 packages/gammu/files/.mtn2git_empty create mode 100644 packages/gammu/files/ldflags-again.patch delete mode 100644 packages/gammu/gammu_1.07.00.bb create mode 100644 packages/gammu/gammu_1.10.0.bb (limited to 'packages') diff --git a/packages/gammu/files/.mtn2git_empty b/packages/gammu/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gammu/files/ldflags-again.patch b/packages/gammu/files/ldflags-again.patch new file mode 100644 index 0000000000..90311e5f39 --- /dev/null +++ b/packages/gammu/files/ldflags-again.patch @@ -0,0 +1,13 @@ +Index: gammu-1.10.0/cfg/Makefile.glo +=================================================================== +--- gammu-1.10.0.orig/cfg/Makefile.glo 2007-03-30 17:55:18.000000000 +0200 ++++ gammu-1.10.0/cfg/Makefile.glo 2007-03-30 17:55:46.000000000 +0200 +@@ -152,7 +152,7 @@ + + $(TOPDIR)/gammu/gammu-shared: $(COMMON) $(GAMMU) $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) + @echo Linking gammu-shared +- @$(CC) -L$(TOPDIR)/common -lGammu $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared ++ @$(CC) -L$(TOPDIR)/common -lGammu $(LDLIBS) $(GAMMU_CFLAGS) $(GAMMU_LIBS) $(SMSD_LIBS) $(GAMMU) -o $(TOPDIR)/gammu/gammu-shared + + shared: $(TOPDIR)/common/$(LIBGAMMU_FULLNAME) $(TOPDIR)/common/$(LIBGAMMU_STATIC) $(TOPDIR)/gammu/gammu-shared + diff --git a/packages/gammu/gammu_1.07.00.bb b/packages/gammu/gammu_1.07.00.bb deleted file mode 100644 index 49a2f21399..0000000000 --- a/packages/gammu/gammu_1.07.00.bb +++ /dev/null @@ -1,75 +0,0 @@ -DESCRIPTION = "GNU All Mobile Managment Utilities" -SECTION = "console/network" -DEPENDS = "bluez-libs" -LICENSE = "GPL" -HOMEPAGE = "http://mwiacek.com/gsm/soft/gammu.html" -AUTHOR = "Marcin Wiacek " - -SRC_URI = "http://www.mwiacek.com/zips/gsm/gammu/stable/1_0x/gammu-${PV}.tar.gz " - -EXTRA_OECONF = "--disable-mysql" - -inherit autotools - -do_compile () { - oe_runmake shared -} - -do_stage() { - install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ - ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ - ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ - ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku \ - ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ - ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ - ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ - ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \ - ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \ - ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \ - ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \ - ${STAGING_INCDIR}/gammu/protocol/alcatel - - oe_libinstall -so -C common libGammu ${STAGING_LIBDIR} - - install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/ - install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc - install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding - install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone - install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at - install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex - install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia - install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 - install -m 0644 common/phone/nokia/dct4tiku/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4tiku - install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian - install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel - install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service - install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms - install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup - install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device - install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda - install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth - install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial - install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol - install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at - install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex - install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia - install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian - install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel -} - -do_install () { - oe_runmake 'DESTDIR=${D}' installshared -} - -PACKAGES =+ "libgammu" - -FILES_${PN} = "${bindir}/gammu" -FILES_libgammu = "${libdir}/libGammu.so*" - -PACKAGES_DYNAMIC = "gammu-locale-*" - -python populate_packages_prepend () { - help_dir = bb.data.expand('${datadir}/gammu/', d) - - do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu') -} diff --git a/packages/gammu/gammu_1.10.0.bb b/packages/gammu/gammu_1.10.0.bb new file mode 100644 index 0000000000..9e3f611697 --- /dev/null +++ b/packages/gammu/gammu_1.10.0.bb @@ -0,0 +1,77 @@ +DESCRIPTION = "GNU All Mobile Managment Utilities" +SECTION = "console/network" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +HOMEPAGE = "http://www.gammu.org/" + +SRC_URI = "http://dl.cihar.com/gammu/releases/gammu-${PV}.tar.bz2 \ + file://ldflags-again.patch;patch=1" + +EXTRA_OECONF = "--disable-mysql --with-bluedir=${STAGING_DIR}" + +EXTRA_LDFLAGS = "-lbluetooth2" + +inherit autotools + +do_compile () { + oe_runmake shared LDFLAGS='-L${STAGING_LIBDIR} -lbluetooth' +} + +do_stage() { + install -d ${STAGING_INCDIR}/gammu/misc ${STAGING_INCDIR}/gammu/misc/coding \ + ${STAGING_INCDIR}/gammu/phone ${STAGING_INCDIR}/gammu/phone/at \ + ${STAGING_INCDIR}/gammu/phone/obex ${STAGING_INCDIR}/gammu/phone/nokia \ + ${STAGING_INCDIR}/gammu/phone/nokia/dct3 ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 \ + ${STAGING_INCDIR}/gammu/phone/symbian ${STAGING_INCDIR}/gammu/phone/alcatel \ + ${STAGING_INCDIR}/gammu/service ${STAGING_INCDIR}/gammu/service/sms \ + ${STAGING_INCDIR}/gammu/service/backup ${STAGING_INCDIR}/gammu/device \ + ${STAGING_INCDIR}/gammu/device/irda ${STAGING_INCDIR}/gammu/device/bluetoth \ + ${STAGING_INCDIR}/gammu/device/serial ${STAGING_INCDIR}/gammu/protocol \ + ${STAGING_INCDIR}/gammu/protocol/at ${STAGING_INCDIR}/gammu/protocol/obex \ + ${STAGING_INCDIR}/gammu/protocol/nokia ${STAGING_INCDIR}/gammu/protocol/symbian \ + ${STAGING_INCDIR}/gammu/protocol/alcatel + + oe_libinstall -so -C common libGammu ${STAGING_LIBDIR} + + install -m 0644 common/*.h ${STAGING_INCDIR}/gammu/ + install -m 0644 common/misc/*.h ${STAGING_INCDIR}/gammu/misc + install -m 0644 common/misc/coding/*.h ${STAGING_INCDIR}/gammu/misc/coding + install -m 0644 common/phone/*.h ${STAGING_INCDIR}/gammu/phone + install -m 0644 common/phone/at/*.h ${STAGING_INCDIR}/gammu/phone/at + install -m 0644 common/phone/obex/*.h ${STAGING_INCDIR}/gammu/phone/obex + install -m 0644 common/phone/nokia/*.h ${STAGING_INCDIR}/gammu/phone/nokia + install -m 0644 common/phone/nokia/dct3/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct3 + install -m 0644 common/phone/nokia/dct4s40/*.h ${STAGING_INCDIR}/gammu/phone/nokia/dct4s40 + install -m 0644 common/phone/symbian/*.h ${STAGING_INCDIR}/gammu/phone/symbian + install -m 0644 common/phone/alcatel/*.h ${STAGING_INCDIR}/gammu/phone/alcatel + install -m 0644 common/service/*.h ${STAGING_INCDIR}/gammu/service + install -m 0644 common/service/sms/*.h ${STAGING_INCDIR}/gammu/service/sms + install -m 0644 common/service/backup/*.h ${STAGING_INCDIR}/gammu/service/backup + install -m 0644 common/device/*.h ${STAGING_INCDIR}/gammu/device + install -m 0644 common/device/irda/*.h ${STAGING_INCDIR}/gammu/device/irda + install -m 0644 common/device/bluetoth/*.h ${STAGING_INCDIR}/gammu/device/bluetoth + install -m 0644 common/device/serial/*.h ${STAGING_INCDIR}/gammu/device/serial + install -m 0644 common/protocol/*.h ${STAGING_INCDIR}/gammu/protocol + install -m 0644 common/protocol/at/*.h ${STAGING_INCDIR}/gammu/protocol/at + install -m 0644 common/protocol/obex/*.h ${STAGING_INCDIR}/gammu/protocol/obex + install -m 0644 common/protocol/nokia/*.h ${STAGING_INCDIR}/gammu/protocol/nokia + install -m 0644 common/protocol/symbian/*.h ${STAGING_INCDIR}/gammu/protocol/symbian + install -m 0644 common/protocol/alcatel/*.h ${STAGING_INCDIR}/gammu/protocol/alcatel +} + +do_install () { + oe_runmake 'DESTDIR=${D}' installshared +} + +PACKAGES =+ "libgammu" + +FILES_${PN} = "${bindir}/gammu" +FILES_libgammu = "${libdir}/libGammu.so*" + +PACKAGES_DYNAMIC = "gammu-locale-*" + +python populate_packages_prepend () { + help_dir = bb.data.expand('${datadir}/gammu/', d) + + do_split_packages(d, help_dir, file_regex='^gammu_(.*)\.txt$', output_pattern='gammu-locale-%s', description='%s translation for Gammu') +} -- cgit v1.2.3 From 19b86e3f9cbfeb02d41ab676689a88ba5749eba8 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:03:45 +0000 Subject: foonas-init: Remove --- packages/foonas-init/files/initscripts/fixfstab | 91 ---------------------- .../foonas-init/files/initscripts/loadmodules.sh | 11 --- packages/foonas-init/files/initscripts/rmrecovery | 4 - .../foonas-init/files/initscripts/sysconfsetup | 46 ----------- .../foonas-init/files/initscripts/syslog.buffer | 23 ------ packages/foonas-init/files/initscripts/syslog.file | 23 ------ .../foonas-init/files/initscripts/syslog.network | 28 ------- .../foonas-init/files/initscripts/umountinitrd.sh | 34 -------- 8 files changed, 260 deletions(-) delete mode 100644 packages/foonas-init/files/initscripts/fixfstab delete mode 100644 packages/foonas-init/files/initscripts/loadmodules.sh delete mode 100644 packages/foonas-init/files/initscripts/rmrecovery delete mode 100644 packages/foonas-init/files/initscripts/sysconfsetup delete mode 100644 packages/foonas-init/files/initscripts/syslog.buffer delete mode 100644 packages/foonas-init/files/initscripts/syslog.file delete mode 100644 packages/foonas-init/files/initscripts/syslog.network delete mode 100644 packages/foonas-init/files/initscripts/umountinitrd.sh (limited to 'packages') diff --git a/packages/foonas-init/files/initscripts/fixfstab b/packages/foonas-init/files/initscripts/fixfstab deleted file mode 100644 index 67116a12fd..0000000000 --- a/packages/foonas-init/files/initscripts/fixfstab +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh -# validate /etc/fstab against the current UUID list in -# /etc/uuid_by_partition -# -. /etc/default/functions -pfile=/etc/uuid_by_partition - -# -# use debug to find out what is going on -test "$1" = start -o "$1" = debug || exit 0 - -# -# obtain the current list of parititions with UUIDs -newlist="$(uuid_by_partition)" - -if test -r "$pfile" -then - # read the old list - oldlist="$(cat "$pfile")" - # - # if it hasn't changed nothing need be done - test "$newlist" = "$oldlist" && exit 0 - # - # it has changed, but this only matters if - # a previously existing uuid has moved, build - # a list of old device vs new device for every - # uuid which has moved - changedlist="$( - { echo "$oldlist" - echo "$newlist" - } | awk 'device[$2] == ""{device[$2] = $1} - device[$2] != $1{print device[$2], $1}')" - - if test -n "$changedlist" - then - # at least one partition has moved, scan the - # current fstab to see if it has a reference - # to this partition - changedfstab="$( - { echo "$changedlist" - echo '#fstab' - cat /etc/fstab - } | awk 'BEGIN{list=1} - list==1 && $0=="#fstab"{list=0; continue} - list==1{new[$1] = $2; continue} - new[$1] != ""{print $1, new[$1]}')" - - # if this list is not empty edit the fstab - if test -n "$changedfstab" - then - rm -f /tmp/fstab.$$ - # if the edit fails then do not overwrite the old - # partition list - just exit with an error - { echo "$changedlist" - echo '#fstab' - cat /etc/fstab - } | awk 'BEGIN{list=1} - list==1 && $0=="#fstab"{list=0; continue} - list==1{new[$1] = $2; continue} - new[$1] != ""{$1 = new[$1]} - {print}' >/tmp/fstab.$$ || { - if test "$1" = start - then - logger -s "/etc/init.d/fixfstab: /tmp/fstab.$$: awk failed" - else - echo "debug: awk script failed with:" >&2 - echo "$changedlist" >&2 - echo "output in /tmp/fstab.$$" >&2 - fi - exit 1 - } - - if test "$1" = start - then - mv /tmp/fstab.$$ /etc/fstab || { - logger -s "/etc/init.d/fixfstab: /tmp/fstab.$$: update failed" - exit 1 - } - else - echo "debug: fstab changed:" - diff -u /etc/fstab /tmp/fstab.$$ - fi - fi - fi -fi - -# write the new list to the file, only if we -# are doing something... -test "$1" = start && echo "$newlist" >"$pfile" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/loadmodules.sh b/packages/foonas-init/files/initscripts/loadmodules.sh deleted file mode 100644 index c5d44d1067..0000000000 --- a/packages/foonas-init/files/initscripts/loadmodules.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -. /etc/default/modulefunctions # Load module loading logic - -loadnetmods - -loaddiskmods - -loadmiscmods - -exit 0 diff --git a/packages/foonas-init/files/initscripts/rmrecovery b/packages/foonas-init/files/initscripts/rmrecovery deleted file mode 100644 index eec822b154..0000000000 --- a/packages/foonas-init/files/initscripts/rmrecovery +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# Run to remove /.recovery if the boot seems to have succeeded -test -e /.recovery && rm -f /.recovery -exit 0 diff --git a/packages/foonas-init/files/initscripts/sysconfsetup b/packages/foonas-init/files/initscripts/sysconfsetup deleted file mode 100644 index a4f9074d9c..0000000000 --- a/packages/foonas-init/files/initscripts/sysconfsetup +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# This script is run once when the system first boots. Its sole -# purpose is to create /etc/default/sysconf (the overall system -# configuration file) and other files derived from this. -# -# The script runs immediately after S10checkroot.sh - this is the -# point at which the rootfs will be mounted rw even if the kernel -# booted with it ro. -# -# rm or mv the file (/etc/default/sysconf) to recreate it, run this -# script with the reload option to overwrite the system files. The -# configuration files described in sysconf_reload (in -# /sbin/sysconf) will be overwritten on reload. -# -# start: standard startup, do a complete (auto) restore if necessary -# reinit: always do a complete auto restore -# reload: just reload sysconf (no config files!) -# -# /etc/default/functions contains useful utility functions - it's -# in a separate file so that it can be loaded by any script -. /etc/default/functions -load_functions sysconf || exit 1 -# -case "$1" in -start) test -s /etc/default/sysconf || { - if sysconf_read - then - if sysconf_valid - then - sysconf_restore auto - else - sysconf_reload - fi - else - sysconf_default - sysconf_reload - fi - };; - -reload) test -s /etc/default/sysconf || sysconf_read || sysconf_default - sysconf_reload;; - -reinit) sysconf_restore auto;; - -*) ;; -esac diff --git a/packages/foonas-init/files/initscripts/syslog.buffer b/packages/foonas-init/files/initscripts/syslog.buffer deleted file mode 100644 index 9285c02946..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.buffer +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses (only) 'buffer' as the DESTINATION -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= - -for d in $DESTINATION -do - case "$d" in - buffer) doit=1;; - file) exit 0;; - remote) exit 0;; - *) echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -test -n "$doit" -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/syslog.file b/packages/foonas-init/files/initscripts/syslog.file deleted file mode 100644 index 80ee5f0174..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.file +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses 'file' (and, optionally, buffer) as the DESTINATION -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= - -for d in $DESTINATION -do - case "$d" in - buffer) :;; - file) doit=1;; - remote) exit 0;; - *) echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -test -n "$doit" -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/syslog.network b/packages/foonas-init/files/initscripts/syslog.network deleted file mode 100644 index 3d7f4ab8e6..0000000000 --- a/packages/foonas-init/files/initscripts/syslog.network +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Invoke the syslog startup if the configuration -# uses 'remote', or doesn't use 'buffer' or 'file' -DESTINATION= -test -f /etc/syslog.conf && . /etc/syslog.conf -doit= -doneit= - -for d in $DESTINATION -do - case "$d" in - buffer) doneit=1;; - file) doneit=1;; - remote) doit=1;; - *) doit=1 - echo "/etc/syslog.conf: $d: unknown destination" >&2 - exit 1;; - esac -done - -# One of doneit or doit is set unless the DESTINATION value -# is empty (which is probably an error), let syslog handle -# the error. -test \( -n "$doit" -o -z "$doneit" \) -a -x /etc/init.d/syslog && - exec /etc/init.d/syslog "$@" - -exit 0 diff --git a/packages/foonas-init/files/initscripts/umountinitrd.sh b/packages/foonas-init/files/initscripts/umountinitrd.sh deleted file mode 100644 index b590ae68b5..0000000000 --- a/packages/foonas-init/files/initscripts/umountinitrd.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# umount /mnt, which is where the initrd ends up mounted -# if the directory /initrd is not present, if this fails -# then the /initrd is mounted and we want to remount that -# ro - this works round the shutdown -r hang problem -. /etc/default/functions -# -# if we are turnup'ed to disk, then just unmount the initrd all together -# -if [ -e /initrd/dev/.devfsd ]; then - [ "$VERBOSE" = "very" ] && echo "Unmounting initrd..." - umount /initrd/dev - umount /initrd - exit 0 -fi - -while read device directory remainder -do - case "$directory" in - /mnt) echo "InitRD: unmount initrd on /mnt" >&2 - umount /mnt;; - /initrd)# need the device for a remount - ffspart=Flashdisk - ffsdev="$(mtblockdev $ffspart)" - echo "InitRD: remount $ffdev read-only on /initrd" >&2 - if test -n "$ffsdev" -a -b "$ffsdev" - then - mount -o remount,ro "$ffsdev" /initrd - else - echo "Flashdisk: $ffsdev: flash device not found" >&2 - fi;; - esac -done Date: Fri, 30 Mar 2007 16:04:23 +0000 Subject: foonas-image: Remove --- packages/images/foonas-image.bb | 25 ------------------------- 1 file changed, 25 deletions(-) delete mode 100644 packages/images/foonas-image.bb (limited to 'packages') diff --git a/packages/images/foonas-image.bb b/packages/images/foonas-image.bb deleted file mode 100644 index 8dc2370b5e..0000000000 --- a/packages/images/foonas-image.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION = "Foonas image" -LICENSE = "GPL" -PR = "r0" - -inherit image n2100-image turbostation-image lsppchg-image lsppchd-image storcenter-image - -DEPENDS = "${MACHINE_TASK_PROVIDER} makedevs-native mtd-utils-native" - -EXTRA_IMAGECMD_jffs2 += " --pad --eraseblock=${ERASEBLOCK_SIZE} -D ${FOONAS_DEVICE_TABLE}" -IMAGE_LINGUAS = "" - -RDEPENDS = " \ - base-files base-passwd netbase \ - busybox initscripts foonas-init \ - update-modules sysvinit tinylogin \ - module-init-tools-depmod modutils-initscripts \ - ipkg-collateral ipkg ipkg-link \ - libgcc1 diffutils cpio findutils\ - dropbear e2fsprogs-blkid \ - mdadm hdparm mtd-utils udev \ - ${FOONAS_SUPPORT} \ - ${FOONAS_KERNEL} " - -PACKAGE_INSTALL = "${RDEPENDS}" - -- cgit v1.2.3 From 58116a9c2ff841a75490b61eca4065fca3dfed93 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:06:35 +0000 Subject: task-base: Add COMBINED_FEATURES uboot and redboot, DISTRO_FEATURES raid (empty right now) --- packages/tasks/task-base.bb | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb index 4d16501d6b..17fc9a30f5 100644 --- a/packages/tasks/task-base.bb +++ b/packages/tasks/task-base.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -PR = "r21" +PR = "r20" PACKAGES = "task-base \ task-base-oh-minimal \ @@ -38,9 +38,12 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" # irda # pci # pcmcia +# redboot +# uboot # usbgadget # usbhost + DISTRO_CORE_PACKAGE ?= "task-base-core-default" # @@ -62,9 +65,12 @@ RDEPENDS_task-base = "\ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \ ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "uboot", "${task-base-uboot-rdepends}", "",d)} \ + ${@base_contains("COMBINED_FEATURES", "redboot", "${task-base-redboot-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \ + ${@base_contains("DISTRO_FEATURES", "raid", "${task-distro-raid-rdepends}", "",d)} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \ ${MACHINE_EXTRA_RDEPENDS} \ ${DISTRO_EXTRA_RDEPENDS}" @@ -247,6 +253,12 @@ task-base-usbhost-rrecommends = "\ kernel-module-usbserial \ kernel-module-usb-storage " +task-base-uboot-rdepends = "\ + uboot-utils" + +task-base-redboot-rdepends = "\ + fis" + task-distro-ppp-rdepends = "\ ppp \ ppp-dialin" @@ -293,6 +305,8 @@ task-distro-nfs-rrecommends = "\ kernel-module-lockd \ kernel-module-sunrpc" +task-distro-raid-rdepends = "\ + " # Tosort # kernel-module-ipv6 -- cgit v1.2.3 From e88fcc32fd9d0fbf9088f92fc48e14660fe05902 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 16:20:32 +0000 Subject: util-macros: update -native to 1.1.5, needed for R7.2 --- packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb (limited to 'packages') diff --git a/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb new file mode 100644 index 0000000000..64e0550571 --- /dev/null +++ b/packages/xorg-util/util-macros-native_X11R7.1-1.1.5.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "X autotools macros" +SECTION = "x11/libs" +LICENSE= "Xorg" + +SRC_URI = "${XORG_MIRROR}/individual/util/util-macros-1.1.5.tar.bz2 \ + file://unbreak_cross_compile.patch;patch=1 " + +S = "${WORKDIR}/util-macros-1.1.5" + +inherit native autotools pkgconfig + -- cgit v1.2.3 From 71dc066d7015b1b544f64cd4e47b8af483ccbb2b Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:27:55 +0000 Subject: uboot-utils: Update and move to uboot/ --- .../uboot-utils/files/turbostation/fw_env.config | 15 -------- packages/uboot/uboot-utils_1.1.2.bb | 43 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 15 deletions(-) delete mode 100644 packages/uboot-utils/files/turbostation/fw_env.config create mode 100644 packages/uboot/uboot-utils_1.1.2.bb (limited to 'packages') diff --git a/packages/uboot-utils/files/turbostation/fw_env.config b/packages/uboot-utils/files/turbostation/fw_env.config deleted file mode 100644 index 97ce8a87d4..0000000000 --- a/packages/uboot-utils/files/turbostation/fw_env.config +++ /dev/null @@ -1,15 +0,0 @@ -# Configuration file for fw_(printenv/saveenv) utility. -# Up to two entries are valid, in this case the redundand -# environment sector is assumed present. - -# MTD device name Device offset Env. size Flash sector size - -# Primary U-Boot environment. You shouldn't need to touch this. If you touch this, -# you should be *very* sure about what you're doing if you don't have a serial -# cable attached! -# /dev/mtd4 0x00000 0x20000 0x20000 - -# Secondary U-Boot environment. This is a *bit* more safe to modify, but can easily -# render your turbostation unbootable! - -/dev/mtd5 0x00000 0x20000 0x20000 \ No newline at end of file diff --git a/packages/uboot/uboot-utils_1.1.2.bb b/packages/uboot/uboot-utils_1.1.2.bb new file mode 100644 index 0000000000..8a5d7dce3c --- /dev/null +++ b/packages/uboot/uboot-utils_1.1.2.bb @@ -0,0 +1,43 @@ +DESCRIPTION = "U-boot bootloader OS env. access tools for PPC" +SECTION = "bootloaders" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "mtd-utils" +PR = "r5" + +SRC_URI = "${SOURCEFORGE_MIRROR}/u-boot/u-boot-${PV}.tar.bz2 \ + file://fw_env.c.patch;patch=1 \ + file://tools-Makefile.patch;patch=1 \ + file://env-Makefile.patch;patch=1 \ + file://fw_env.config" + +S = "${WORKDIR}/u-boot-${PV}" +EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX}" +TARGET_LDFLAGS = "" + +UBOOT_MACHINE ?= "${MACHINE}_config" + +inherit base + +do_configure() { + : +} + +do_compile () { + oe_runmake Sandpoint8240_config + oe_runmake tools +} + +# install mkimage for the kernel makefile +do_stage() { + install -d ${STAGING_BINDIR_NATIVE} + install -m 755 ${S}/tools/mkimage ${STAGING_BINDIR_NATIVE}/ +} + +do_install () { + install -d ${D}/sbin + install -d ${D}${sysconfdir} + install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_printenv + install -m 755 ${S}/tools/env/fw_printenv ${D}/sbin/fw_setenv +} -- cgit v1.2.3 From 2bc2878dccee1da654d411b66c5a59972194f8dc Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 16:28:25 +0000 Subject: opie-init: Drop reference to OPIE_CVS_PV, use explicit version, these are anyway not in OPIE CVS. --- packages/opie-init/opie-init_1.2.2.bb | 10 ++++++++++ packages/opie-init/opie-init_cvs.bb | 11 ----------- 2 files changed, 10 insertions(+), 11 deletions(-) create mode 100644 packages/opie-init/opie-init_1.2.2.bb delete mode 100644 packages/opie-init/opie-init_cvs.bb (limited to 'packages') diff --git a/packages/opie-init/opie-init_1.2.2.bb b/packages/opie-init/opie-init_1.2.2.bb new file mode 100644 index 0000000000..271ff62e51 --- /dev/null +++ b/packages/opie-init/opie-init_1.2.2.bb @@ -0,0 +1,10 @@ +require ${PN}.inc +PR = "r0" + +SRC_URI = "file://opie-reorgfiles \ + file://opie \ + file://qpe.conf \ + file://locale.conf \ + file://opie_defaults" + +SRC_URI_append_c7x0 = " file://qpe-suspend-resume" diff --git a/packages/opie-init/opie-init_cvs.bb b/packages/opie-init/opie-init_cvs.bb deleted file mode 100644 index b45baeb5ae..0000000000 --- a/packages/opie-init/opie-init_cvs.bb +++ /dev/null @@ -1,11 +0,0 @@ -require ${PN}.inc -PV = "${OPIE_CVS_PV}" -PR = "r0" - -SRC_URI = "file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" -- cgit v1.2.3 From 1650a1f5030b5206eb259c1c7a879cdfb86d2e2d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 16:37:45 +0000 Subject: drm: remove in favour of libdrm --- packages/dri/drm_cvs.bb | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 packages/dri/drm_cvs.bb (limited to 'packages') diff --git a/packages/dri/drm_cvs.bb b/packages/dri/drm_cvs.bb deleted file mode 100644 index 8e219880d0..0000000000 --- a/packages/dri/drm_cvs.bb +++ /dev/null @@ -1,18 +0,0 @@ -SECTION = "x11/base" -LICENSE = "MIT" -SRC_URI = "${FREEDESKTOP_CVS}/dri;module=drm;method=pserver" - -PV = "0.0+cvs${SRCDATE}" -PR = "r3" - -S = "${WORKDIR}/drm" - -inherit autotools pkgconfig - -do_compile() { - oe_runmake -C libdrm -} - -do_stage() { - autotools_stage_all -} -- cgit v1.2.3 From 26ee96a31a0e213fba9543171b048ba9066065ae Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 16:39:46 +0000 Subject: xorg-xserver-common.inc: drm -> libdrm --- packages/xorg-xserver/xorg-xserver-common.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packages') diff --git a/packages/xorg-xserver/xorg-xserver-common.inc b/packages/xorg-xserver/xorg-xserver-common.inc index fcfec6d4f7..634d6eb835 100644 --- a/packages/xorg-xserver/xorg-xserver-common.inc +++ b/packages/xorg-xserver/xorg-xserver-common.inc @@ -8,7 +8,7 @@ PROVIDES = "virtual/xserver" MESA_VER ?= "6.5" DEPENDS = "fontconfig freetype flex-native lbxutil kbproto \ -xf86driproto drm glproto randrproto renderproto fixesproto damageproto \ +xf86driproto libdrm glproto randrproto renderproto fixesproto damageproto \ xcmiscproto xextproto xproto xf86miscproto xf86vidmodeproto xf86bigfontproto \ scrnsaverproto bigreqsproto resourceproto fontsproto inputproto \ xf86dgaproto videoproto compositeproto trapproto recordproto dmxproto \ -- cgit v1.2.3 From 5c15ba55b0f04c46103fe564bb9b732b783578b9 Mon Sep 17 00:00:00 2001 From: Manuel Teira Date: Fri, 30 Mar 2007 16:49:21 +0000 Subject: starling: add SVN version - close #2063 --- packages/starling/starling_svn.bb | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/starling/starling_svn.bb (limited to 'packages') diff --git a/packages/starling/starling_svn.bb b/packages/starling/starling_svn.bb new file mode 100644 index 0000000000..25d445f6ee --- /dev/null +++ b/packages/starling/starling_svn.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "Starling audio player for GPE" +SECTION = "gpe/multimedia" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ libgpewidget gstreamer gst-plugins-good gst-plugins-bad esound sqlite3 libsoup" +RDEPENDS = "esd \ + gst-plugin-audioconvert \ + gst-plugin-esd \ + gst-plugin-typefindfunctions \ + gst-plugin-decodebin \ + gst-plugin-volume" +RRECOMMENDS = "gst-plugin-mad \ + gst-plugin-modplug \ + gst-plugin-ivorbis \ + gst-plugin-tcp" + +PV = "0.1+svn${SRCDATE}" + + +inherit gpe autotools + +SRC_URI = "${GPE_EXTRA_SVN}" + +S = "${WORKDIR}/${PN}" -- cgit v1.2.3 From 5dcc8301f347b05837c88eb7a0d73acbd0900992 Mon Sep 17 00:00:00 2001 From: Oyvind Repvik Date: Fri, 30 Mar 2007 16:51:41 +0000 Subject: linux-linkstationppc: Update defconfig --- packages/linux/linux-linkstationppc/defconfig | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'packages') diff --git a/packages/linux/linux-linkstationppc/defconfig b/packages/linux/linux-linkstationppc/defconfig index b47010f1c7..385f7826f0 100644 --- a/packages/linux/linux-linkstationppc/defconfig +++ b/packages/linux/linux-linkstationppc/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.21-rc1 -# Wed Feb 21 22:29:14 2007 +# Linux kernel version: 2.6.21-rc4 +# Sun Mar 25 15:52:14 2007 # # CONFIG_PPC64 is not set CONFIG_PPC32=y @@ -24,7 +24,7 @@ CONFIG_PPC_UDBG_16550=y # CONFIG_GENERIC_TBSYNC is not set CONFIG_AUDIT_ARCH=y CONFIG_GENERIC_BUG=y -# CONFIG_DEFAULT_UIMAGE is not set +CONFIG_DEFAULT_UIMAGE=y # # Processor support @@ -73,6 +73,7 @@ CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y CONFIG_SYSFS_DEPRECATED=y # CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_SYSCTL=y @@ -700,7 +701,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=2 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -CONFIG_BLK_DEV_INITRD=y CONFIG_CDROM_PKTCDVD=m CONFIG_CDROM_PKTCDVD_BUFFERS=8 # CONFIG_CDROM_PKTCDVD_WCACHE is not set @@ -1574,6 +1574,7 @@ CONFIG_USB_SISUSBVGA=m CONFIG_USB_SISUSBVGA_CON=y # CONFIG_USB_LD is not set # CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set # CONFIG_USB_TEST is not set # @@ -1639,7 +1640,6 @@ CONFIG_RTC_INTF_DEV=y # CONFIG_RTC_DRV_DS1672 is not set # CONFIG_RTC_DRV_DS1742 is not set # CONFIG_RTC_DRV_PCF8563 is not set -# CONFIG_RTC_DRV_PCF8583 is not set CONFIG_RTC_DRV_RS5C372=y # CONFIG_RTC_DRV_M48T86 is not set # CONFIG_RTC_DRV_TEST is not set -- cgit v1.2.3 From 84b73c36e73e10b7fb44c762baebf00763a734a2 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 17:45:20 +0000 Subject: mplayer: add powerpc support --- packages/mplayer/files/powerpc-is-ppc.diff | 11 +++++++++++ packages/mplayer/mplayer_0.0+1.0rc1.bb | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 packages/mplayer/files/powerpc-is-ppc.diff (limited to 'packages') diff --git a/packages/mplayer/files/powerpc-is-ppc.diff b/packages/mplayer/files/powerpc-is-ppc.diff new file mode 100644 index 0000000000..f8143c460e --- /dev/null +++ b/packages/mplayer/files/powerpc-is-ppc.diff @@ -0,0 +1,11 @@ +--- /tmp/configure 2007-03-30 19:40:34.000000000 +0200 ++++ MPlayer-1.0rc1/configure 2007-03-30 19:40:58.795251000 +0200 +@@ -1213,7 +1213,7 @@ + _optimizing='' + ;; + +- ppc) ++ ppc|powerpc) + _def_arch='#define ARCH_POWERPC 1' + _def_dcbzl='#define NO_DCBZL 1' + _target_arch='TARGET_ARCH_POWERPC = yes' diff --git a/packages/mplayer/mplayer_0.0+1.0rc1.bb b/packages/mplayer/mplayer_0.0+1.0rc1.bb index 3a388d21e3..2910cbd0a4 100644 --- a/packages/mplayer/mplayer_0.0+1.0rc1.bb +++ b/packages/mplayer/mplayer_0.0+1.0rc1.bb @@ -20,6 +20,7 @@ SRC_URI = "http://www1.mplayerhq.hu/MPlayer/releases/MPlayer-1.0rc1.tar.bz2 \ file://makefile-nostrip.patch;patch=1 \ ${SOURCEFORGE_MIRROR}/libw100/mplayer-imageon.patch;patch=1 \ file://imageon-video_out.patch;patch=1 \ + file://powerpc-is-ppc.diff;patch=1 \ file://pxa_configure.patch;patch=1 \ file://pxa-video_out.patch;patch=1 " @@ -33,7 +34,7 @@ PACKAGE_ARCH_mencoder_collie = "collie" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PR = "r11" +PR = "r12" PARALLEL_MAKE = "" -- cgit v1.2.3 From d94cd14b70790a834f87ad0f72c7e9e6020b8da9 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Fri, 30 Mar 2007 17:52:49 +0000 Subject: libopie2: Fix packaging of dev/dbg. --- packages/libopie/libopie2.inc | 18 +++++++++--------- packages/libopie/libopie2_1.2.2.bb | 2 +- packages/libopie/libopie2_cvs.bb | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) (limited to 'packages') diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 1e0d4f1b9a..17cc4be40d 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -78,22 +78,22 @@ do_install() { done } -PACKAGES = "libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2" +PACKAGES_prepend = " libopiecore2 libopiedb2 libopiesecurity2 libopiemm2 libopienet2 libopiepim2 libopieui2 libopiebluez2 " DESCRIPTION_libopiecore2 = "Opie Development Platform 1.x Core Library" -FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so*" +FILES_libopiecore2 = "${palmtopdir}/lib/libopiecore2.so.*" DESCRIPTION_libopiedb2 = "Opie Development Platform 1.x Database Library" -FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so*" +FILES_libopiedb2 = "${palmtopdir}/lib/libopiedb2.so.*" DESCRIPTION_libopiemm2 = "Opie Development Platform 1.x Multimedia Library" -FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so*" +FILES_libopiemm2 = "${palmtopdir}/lib/libopiemm2.so.*" DESCRIPTION_libopienet2 = "Opie Development Platform 1.x Network Library" -FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so*" +FILES_libopienet2 = "${palmtopdir}/lib/libopienet2.so.*" DESCRIPTION_libopiepim2 = "Opie Development Platform 1.x PIM Library" -FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so*" +FILES_libopiepim2 = "${palmtopdir}/lib/libopiepim2.so.*" DESCRIPTION_libopieui2 = "Opie Development Platform 1.x User Interface Library" -FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so*" +FILES_libopieui2 = "${palmtopdir}/lib/libopieui2.so.*" DESCRIPTION_libopiesecurity2 = "Opie Development Platform 1.x Security Library" -FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so*" +FILES_libopiesecurity2 = "${palmtopdir}/lib/libopiesecurity2.so.*" DESCRIPTION_libopiebluez2 = "Opie Development Platform 1.x Bluetooth Library" -FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so*" +FILES_libopiebluez2 = "${palmtopdir}/lib/libopiebluez2.so.*" diff --git a/packages/libopie/libopie2_1.2.2.bb b/packages/libopie/libopie2_1.2.2.bb index 1bef43c329..8409e4c523 100644 --- a/packages/libopie/libopie2_1.2.2.bb +++ b/packages/libopie/libopie2_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r1" +PR = "r2" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \ file://include.pro \ diff --git a/packages/libopie/libopie2_cvs.bb b/packages/libopie/libopie2_cvs.bb index 4a3d3c28c5..39376a84fc 100644 --- a/packages/libopie/libopie2_cvs.bb +++ b/packages/libopie/libopie2_cvs.bb @@ -1,7 +1,7 @@ require ${PN}.inc PV = "1.2.2+cvs${SRCDATE}" -PR = "r6" +PR = "r7" DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3 From 5ed24bd44de3235edcb3ef2704d70de610fc1878 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 30 Mar 2007 18:30:00 +0000 Subject: task-openmoko: remove some more matchbox-panel-1 stuff --- packages/tasks/task-openmoko.bb | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'packages') diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb index ece303d62a..7f8b03ce33 100644 --- a/packages/tasks/task-openmoko.bb +++ b/packages/tasks/task-openmoko.bb @@ -5,7 +5,7 @@ PACKAGE_ARCH = "all" LICENSE = "MIT" PROVIDES = "task-openmoko-everything" -PR = "r32" +PR = "r33" PACKAGES = "\ task-openmoko-linux \ @@ -145,11 +145,8 @@ RDEPENDS_task-openmoko-demo = "\ matchbox-stroke \ matchbox-config-gtk \ matchbox-panel-2-applets \ - matchbox-panel-hacks \ matchbox-themes-extra \ matchbox-themes-gtk \ - matchbox-applet-inputmanager \ - matchbox-applet-startup-monitor \ openmoko-panel-battery \ openmoko-panel-clock \ openmoko-panel-demo \ -- cgit v1.2.3