From b19fbe04169b2eda4d8f833fbc548b183e4e9442 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Wed, 4 Apr 2007 12:29:43 +0000 Subject: linux-x86: Deploy bzImage --- packages/linux/linux-x86_2.6.20.bb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb index 5db1563733..4e35164828 100644 --- a/packages/linux/linux-x86_2.6.20.bb +++ b/packages/linux/linux-x86_2.6.20.bb @@ -17,3 +17,11 @@ do_configure_prepend() { install -m 0644 ${WORKDIR}/defconfig ${S}/.config } +do_deploy() { + install -d ${DEPLOY_DIR_IMAGE} + install -m 0644 arch/i386/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} +} + +do_deploy[dirs] = "${S}" + +addtask deploy before do_populate_staging after do_compile -- cgit v1.2.3 From 88c0b219feb00934e45de5e94b55f961c7210845 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 13:24:01 +0000 Subject: ptim-headers: Shared headers for Phone Text Input --- packages/gpephone/ptim-headers_svn.bb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 packages/gpephone/ptim-headers_svn.bb diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb new file mode 100644 index 0000000000..94986852c8 --- /dev/null +++ b/packages/gpephone/ptim-headers_svn.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Phone input method - shared headers" +SECTION = "gpephone" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+" +PV = "0.1+svn-${SRCDATE}" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imheaders" + +S = "${WORKDIR}/imheaders" + +DEFAULT_PREFERENCE = "-1" + +do_starge () { + autotools_do_stage_all +} \ No newline at end of file -- cgit v1.2.3 From da2a25a55186a940d6ce9b399bbc2b268c38bec8 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 13:40:23 +0000 Subject: ptim-headers: fix typo --- packages/gpephone/ptim-headers_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb index 94986852c8..0ff243c7d6 100644 --- a/packages/gpephone/ptim-headers_svn.bb +++ b/packages/gpephone/ptim-headers_svn.bb @@ -13,6 +13,6 @@ S = "${WORKDIR}/imheaders" DEFAULT_PREFERENCE = "-1" -do_starge () { +do_stage () { autotools_do_stage_all } \ No newline at end of file -- cgit v1.2.3 From d79e06819a0f1395395119b09b532dfc6bf246aa Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 13:42:48 +0000 Subject: ptim-headers: fix another typo --- packages/gpephone/ptim-headers_svn.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb index 0ff243c7d6..1d8ce9c4c7 100644 --- a/packages/gpephone/ptim-headers_svn.bb +++ b/packages/gpephone/ptim-headers_svn.bb @@ -14,5 +14,5 @@ S = "${WORKDIR}/imheaders" DEFAULT_PREFERENCE = "-1" do_stage () { - autotools_do_stage_all + autotools_stage_all } \ No newline at end of file -- cgit v1.2.3 From 58bd699b44464bdd8bc1a90d84c5d5a964728e7b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:27:44 +0000 Subject: ptim-manager: Add the Phone Text Input manager module. --- packages/gpephone/ptim-manager_svn.bb | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 packages/gpephone/ptim-manager_svn.bb diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb new file mode 100644 index 0000000000..fe812a21ce --- /dev/null +++ b/packages/gpephone/ptim-manager_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Phone input method manager module" +SECTION = "gpephone" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ ptim-headers libiac" +PV = "0.1+svn-${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=immanager \ + file://gtkmodule-location.patch;patch=1;pnum=0" + +S = "${WORKDIR}/immanager" + +FILES_${PN} += "${libdir}/gtk-2.0/*/immodules/*.so ${libdir}/gtk-2.0/*/immodules/ptim" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/.debug/*.so" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/*.la" + +do_stage () { + autotools_stage_all +} \ No newline at end of file -- cgit v1.2.3 From 41b3c1fccb8850a9447c1e4e4ab120fe63667fd5 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:28:36 +0000 Subject: ptim-manager: Add patch --- packages/gpephone/ptim-manager/.mtn2git_empty | 0 .../gpephone/ptim-manager/gtkmodule-location.patch | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 packages/gpephone/ptim-manager/.mtn2git_empty create mode 100644 packages/gpephone/ptim-manager/gtkmodule-location.patch diff --git a/packages/gpephone/ptim-manager/.mtn2git_empty b/packages/gpephone/ptim-manager/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/ptim-manager/gtkmodule-location.patch b/packages/gpephone/ptim-manager/gtkmodule-location.patch new file mode 100644 index 0000000000..d02166e1ac --- /dev/null +++ b/packages/gpephone/ptim-manager/gtkmodule-location.patch @@ -0,0 +1,21 @@ +--- src/Makefile.am~ 2007-04-05 16:01:29.000000000 +0200 ++++ src/Makefile.am 2007-04-05 16:01:29.000000000 +0200 +@@ -3,7 +3,7 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules ++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules + + INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \ + -I. $(IMMANAGER_CFLAGS) +--- Makefile.am~ 2007-04-05 16:21:36.000000000 +0200 ++++ Makefile.am 2007-04-05 16:21:36.000000000 +0200 +@@ -3,6 +3,6 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-confdir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/ ++confdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/ + conf_DATA = \ + conf/imconfig -- cgit v1.2.3 From e00c88e75b489aff5c24e93b19d3b6ff5fd64189 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:46:36 +0000 Subject: ptim-helper: Phone Text Input helper module. --- packages/gpephone/ptim-helper/.mtn2git_empty | 0 .../gpephone/ptim-helper/gtkmodule-location.patch | 22 +++++++++++++++++++++ packages/gpephone/ptim-helper_svn.bb | 23 ++++++++++++++++++++++ 3 files changed, 45 insertions(+) create mode 100644 packages/gpephone/ptim-helper/.mtn2git_empty create mode 100644 packages/gpephone/ptim-helper/gtkmodule-location.patch create mode 100644 packages/gpephone/ptim-helper_svn.bb diff --git a/packages/gpephone/ptim-helper/.mtn2git_empty b/packages/gpephone/ptim-helper/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/ptim-helper/gtkmodule-location.patch b/packages/gpephone/ptim-helper/gtkmodule-location.patch new file mode 100644 index 0000000000..cd0e469608 --- /dev/null +++ b/packages/gpephone/ptim-helper/gtkmodule-location.patch @@ -0,0 +1,22 @@ +--- src/Makefile.am~ 2007-04-05 16:40:45.000000000 +0200 ++++ src/Makefile.am 2007-04-05 16:40:45.000000000 +0200 +@@ -3,7 +3,7 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/helper ++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/helper + + INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \ + -I. $(IMHELPER_CFLAGS) +--- pixmaps/Makefile.am~ 2007-04-05 16:43:16.000000000 +0200 ++++ pixmaps/Makefile.am 2007-04-05 16:43:16.000000000 +0200 +@@ -1,7 +1,7 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-pixmapsdir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/pixmaps ++pixmapsdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/pixmaps + pixmaps_DATA = \ + next.png \ + prev.png \ diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb new file mode 100644 index 0000000000..3b97fc7027 --- /dev/null +++ b/packages/gpephone/ptim-helper_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Phone input method helper module" +SECTION = "gpephone" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "gtk+ ptim-headers" +PV = "0.1+svn-${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imhelper \ + file://gtkmodule-location.patch;patch=1;pnum=0" + +S = "${WORKDIR}/imhelper" + +FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/helper/*.so ${libdir}/gtk-2.0/*/immodules/ptim/pixmaps" +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/helper/.debug/*.so" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/helper/*.la" + +do_stage () { + autotools_stage_all +} \ No newline at end of file -- cgit v1.2.3 From 7b2921b6a2689ee0a3bb647af56378f3a0a8e00e Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:55:12 +0000 Subject: ptim-engine: New package: Phone Text Input Engine --- packages/gpephone/ptim-engine/.mtn2git_empty | 0 .../gpephone/ptim-engine/gtkmodule-location.patch | 11 +++++++++++ packages/gpephone/ptim-engine_svn.bb | 23 ++++++++++++++++++++++ 3 files changed, 34 insertions(+) create mode 100644 packages/gpephone/ptim-engine/.mtn2git_empty create mode 100644 packages/gpephone/ptim-engine/gtkmodule-location.patch create mode 100644 packages/gpephone/ptim-engine_svn.bb diff --git a/packages/gpephone/ptim-engine/.mtn2git_empty b/packages/gpephone/ptim-engine/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gpephone/ptim-engine/gtkmodule-location.patch b/packages/gpephone/ptim-engine/gtkmodule-location.patch new file mode 100644 index 0000000000..6882f1239d --- /dev/null +++ b/packages/gpephone/ptim-engine/gtkmodule-location.patch @@ -0,0 +1,11 @@ +--- src/Makefile.am~ 2007-04-05 16:49:43.000000000 +0200 ++++ src/Makefile.am 2007-04-05 16:49:43.000000000 +0200 +@@ -3,7 +3,7 @@ + GTK_PREFIX=`pkg-config gtk+-2.0 --variable=libdir` + GTK_BINARY_VERSION=`pkg-config gtk+-2.0 --variable=gtk_binary_version` + +-moduledir = $(GTK_PREFIX)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/engine ++moduledir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/immodules/ptim/engine + + INCLUDES = -DPACKAGE_LOCALE_DIR=\"@datadir@/locale/@PACKAGE_NAME@\" -DSN_API_NOT_YET_FROZEN \ + -I. $(IMENGINE_CFLAGS) diff --git a/packages/gpephone/ptim-engine_svn.bb b/packages/gpephone/ptim-engine_svn.bb new file mode 100644 index 0000000000..286a1edf8d --- /dev/null +++ b/packages/gpephone/ptim-engine_svn.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Phone input method engine" +SECTION = "gpephone" +PRIORITY = "optional" +LICENSE = "LiPS" +DEPENDS = "gtk+ ptim-headers" +PV = "0.1+svn-${SRCDATE}" + +DEFAULT_PREFERENCE = "-1" + +inherit gpephone pkgconfig autotools + +SRC_URI = "svn://projects.linuxtogo.org/svn/gpephone/trunk/source/ptim;module=imengine \ + file://gtkmodule-location.patch;patch=1;pnum=0" + +S = "${WORKDIR}/imengine" + +FILES_${PN} += " ${libdir}/gtk-2.0/*/immodules/ptim/engine/*.so " +FILES_${PN}-dbg += "${libdir}/gtk-2.0/*/immodules/ptim/engine/.debug/*.so" +FILES_${PN}-dev += "${libdir}/gtk-2.0/*/immodules/ptim/engine/*.la" + +do_stage () { + autotools_stage_all +} \ No newline at end of file -- cgit v1.2.3 From 74bf56afe26dbc5d629a4b2f9c7329932e63d17b Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:57:35 +0000 Subject: ptim: Adjust license information. --- packages/gpephone/ptim-headers_svn.bb | 2 +- packages/gpephone/ptim-helper_svn.bb | 2 +- packages/gpephone/ptim-manager_svn.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gpephone/ptim-headers_svn.bb b/packages/gpephone/ptim-headers_svn.bb index 1d8ce9c4c7..304c103505 100644 --- a/packages/gpephone/ptim-headers_svn.bb +++ b/packages/gpephone/ptim-headers_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Phone input method - shared headers" SECTION = "gpephone" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "LiPS" DEPENDS = "gtk+" PV = "0.1+svn-${SRCDATE}" diff --git a/packages/gpephone/ptim-helper_svn.bb b/packages/gpephone/ptim-helper_svn.bb index 3b97fc7027..0d0ac653b5 100644 --- a/packages/gpephone/ptim-helper_svn.bb +++ b/packages/gpephone/ptim-helper_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Phone input method helper module" SECTION = "gpephone" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers" PV = "0.1+svn-${SRCDATE}" diff --git a/packages/gpephone/ptim-manager_svn.bb b/packages/gpephone/ptim-manager_svn.bb index fe812a21ce..b1113636e9 100644 --- a/packages/gpephone/ptim-manager_svn.bb +++ b/packages/gpephone/ptim-manager_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Phone input method manager module" SECTION = "gpephone" PRIORITY = "optional" -LICENSE = "GPL" +LICENSE = "LiPS" DEPENDS = "gtk+ ptim-headers libiac" PV = "0.1+svn-${SRCDATE}" -- cgit v1.2.3 From 4728076e2fdfb6b9444c50a23549ecedcbe09264 Mon Sep 17 00:00:00 2001 From: Florian Boor Date: Thu, 5 Apr 2007 14:59:30 +0000 Subject: task-gpephone: Add PTIM bits. --- packages/tasks/task-gpephone.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb index e03886f0fd..a480a03b86 100644 --- a/packages/tasks/task-gpephone.bb +++ b/packages/tasks/task-gpephone.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition" -PR = "r3" +PR = "r4" LICENSE = "MIT" ALLOW_EMPTY = "1" @@ -67,7 +67,9 @@ RDEPENDS_gpephone-task-base := "\ pango-module-basic-x \ pango-module-basic-fc \ detect-stylus \ - libgtkinput \ + ptim-manager \ + ptim-helper \ + ptim-engine \ ${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus xtscal", "",d)} \ " -- cgit v1.2.3