summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHolger Freyther <zecke@selfish.org>2008-01-21 11:11:58 +0000
committerHolger Freyther <zecke@selfish.org>2008-01-21 11:11:58 +0000
commit1e7cdf063e1166e4d6c2b383801f5e529071c603 (patch)
treef3d41732eee82b846e0c94edb19fde5faf0c0496
parent3074e69fa414fe2745798492fd7a6e76ff37fe84 (diff)
parent9a39065a3235418bf94dde6e4f8a418472068717 (diff)
merge of '69a166c7072b74d6a2c00aef7ecebacee3e1706a'
and '8b72081ac43d603c1378f0c3e6589903e1fe2231'
-rw-r--r--classes/cmake.bbclass5
-rw-r--r--packages/images/qtopia-core-console-image.bb19
-rw-r--r--packages/tasks/task-qtopia-core-console.bb13
3 files changed, 36 insertions, 1 deletions
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index cec74349dc..823635c24d 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -1,7 +1,10 @@
+DEPENDS += " cmake-native "
+
+# We want the staging and installing functions from autotools
inherit autotools
cmake_do_configure() {
- cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
+ cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
}
EXPORT_FUNCTIONS do_configure
diff --git a/packages/images/qtopia-core-console-image.bb b/packages/images/qtopia-core-console-image.bb
new file mode 100644
index 0000000000..62382cd11f
--- /dev/null
+++ b/packages/images/qtopia-core-console-image.bb
@@ -0,0 +1,19 @@
+#QtopiaCore 'console' image
+#gives you a small images with ssh access
+
+ANGSTROM_EXTRA_INSTALL ?= ""
+DISTRO_SSH_DAEMON ?= "dropbear"
+DEPENDS = "task-boot"
+
+IMAGE_INSTALL = "task-boot \
+ util-linux-mount util-linux-umount \
+ ${DISTRO_SSH_DAEMON} \
+ angstrom-version \
+ task-qtopia-core-console \
+ "
+
+export IMAGE_BASENAME = "trolltech-qtopia-core-console-image"
+IMAGE_LINGUAS = ""
+
+inherit image
+
diff --git a/packages/tasks/task-qtopia-core-console.bb b/packages/tasks/task-qtopia-core-console.bb
new file mode 100644
index 0000000000..ff0bbc6d12
--- /dev/null
+++ b/packages/tasks/task-qtopia-core-console.bb
@@ -0,0 +1,13 @@
+HOMEPAGE = "http://www.trolltech.com"
+LICENSE = "MIT"
+
+inherit task
+
+DESCRIPTION_task-qtopia-core-console = "QtopiaCore Core libraries for XML, SQL, Network, Containers and others."
+RDEPENDS_task-qtopia-core-console = "\
+ libqtopiacorecore4 \
+ libqtopiacorenetwork4 \
+ libqtopiacorexml4 \
+ libqtopiacoresql4"
+
+