[oe-commits] org.oe.dev merge of '69a166c7072b74d6a2c00aef7ecebacee3e1706a'

[freyther commit]

merge of '69a166c7072b74d6a2c00aef7ecebacee3e1706a'
     and '8b72081ac43d603c1378f0c3e6589903e1fe2231'

Author: freyther at openembedded.org
Branch: org.openembedded.dev
Revision: e2c470f552a532997b876ffa18ffd93c26e93606
ViewMTN: http://monotone.openembedded.org/revision/info/e2c470f552a532997b876ffa18ffd93c26e93606
Files:
1
packages/images/qtopia-core-console-image.bb
packages/tasks/task-qtopia-core-console.bb
classes/cmake.bbclass
classes/nslu2-mirrors.bbclass
classes/nylon-mirrors.bbclass
classes/oplinux-mirrors.bbclass
classes/own-mirrors.bbclass
Diffs:

#
# mt diff -r69a166c7072b74d6a2c00aef7ecebacee3e1706a -re2c470f552a532997b876ffa18ffd93c26e93606
#
# 
# 
# add_file "packages/images/qtopia-core-console-image.bb"
#  content [906f157f28657bb972c65d32109cf46c01a1ce0c]
# 
# add_file "packages/tasks/task-qtopia-core-console.bb"
#  content [0960da1ba6938db735a8e51a2ae64ad87812b894]
# 
# patch "classes/cmake.bbclass"
#  from [02512e3f040f3401c03f13f92d01da77069ce59e]
#    to [1fbe2c1cc0ed7f80d95cd2757472581efd8f9825]
# 
============================================================
--- packages/images/qtopia-core-console-image.bb	906f157f28657bb972c65d32109cf46c01a1ce0c
+++ packages/images/qtopia-core-console-image.bb	906f157f28657bb972c65d32109cf46c01a1ce0c
@@ -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
+
============================================================
--- packages/tasks/task-qtopia-core-console.bb	0960da1ba6938db735a8e51a2ae64ad87812b894
+++ packages/tasks/task-qtopia-core-console.bb	0960da1ba6938db735a8e51a2ae64ad87812b894
@@ -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"
+
+    
============================================================
--- classes/cmake.bbclass	02512e3f040f3401c03f13f92d01da77069ce59e
+++ classes/cmake.bbclass	1fbe2c1cc0ed7f80d95cd2757472581efd8f9825
@@ -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


#
# mt diff -r8b72081ac43d603c1378f0c3e6589903e1fe2231 -re2c470f552a532997b876ffa18ffd93c26e93606
#
# 
# 
# patch "classes/nslu2-mirrors.bbclass"
#  from [14f48c8b57ac3e11a22c359206b6d40e22c52d7d]
#    to [93f621901ea31720a35bd2ace9b0a8097ebd02a7]
# 
# patch "classes/nylon-mirrors.bbclass"
#  from [b47107a4b41af8e060da32e6807ce8a80dc01fae]
#    to [376b7465920814cf2d72d3ad84339ba9443a70ab]
# 
# patch "classes/oplinux-mirrors.bbclass"
#  from [727ef9af24dc675ddd02f7dc0dba95618f6ff722]
#    to [1349196904a1b7eb854816b63b65eb58babc8f0a]
# 
# patch "classes/own-mirrors.bbclass"
#  from [b479f189f6e4ec3bbfc821afce081de6cabe4a0c]
#    to [05ecf9681794553dc30d95ab4fb2422bfb0e1896]
# 
============================================================
--- classes/nslu2-mirrors.bbclass	14f48c8b57ac3e11a22c359206b6d40e22c52d7d
+++ classes/nslu2-mirrors.bbclass	93f621901ea31720a35bd2ace9b0a8097ebd02a7
@@ -1,4 +1,4 @@ MIRRORS_append () {
 MIRRORS_append () {
-ftp://.*/.*/	http://sources.nslu2-linux.org/sources/
-http://.*/.*/	http://sources.nslu2-linux.org/sources/
+ftp://.*/.*	http://sources.nslu2-linux.org/sources/
+https?://.*/.*	http://sources.nslu2-linux.org/sources/
 }
============================================================
--- classes/nylon-mirrors.bbclass	b47107a4b41af8e060da32e6807ce8a80dc01fae
+++ classes/nylon-mirrors.bbclass	376b7465920814cf2d72d3ad84339ba9443a70ab
@@ -1,6 +1,6 @@ ftp://.*/.*/	http://meshcube.org/nylon/s
 MIRRORS_append () {
 ftp://.*/.*/	http://meshcube.org/nylon/stable/sources/
-http://.*/.*/	http://meshcube.org/nylon/stable/sources/
+https?://.*/.*/	http://meshcube.org/nylon/stable/sources/
 ftp://.*/.*/	http://meshcube.org/nylon/unstable/sources/
-http://.*/.*/	http://meshcube.org/nylon/unstable/sources/
+https?://.*/.*/	http://meshcube.org/nylon/unstable/sources/
 }
============================================================
--- classes/oplinux-mirrors.bbclass	727ef9af24dc675ddd02f7dc0dba95618f6ff722
+++ classes/oplinux-mirrors.bbclass	1349196904a1b7eb854816b63b65eb58babc8f0a
@@ -1,14 +1,14 @@ ftp://.*/.*/	http://digital-opsis.com/op
 # Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
 MIRRORS_append () {
 ftp://.*/.*/	http://digital-opsis.com/oplinux/stable/sources/
-http://.*/.*/	http://digital-opsis.com/oplinux/stable/sources/
+https?://.*/.*/	http://digital-opsis.com/oplinux/stable/sources/
 ftp://.*/.*/	http://digital-opsis.com/oplinux/unstable/sources/
-http://.*/.*/	http://digital-opsis.com/oplinux/unstable/sources/
+https?://.*/.*/	http://digital-opsis.com/oplinux/unstable/sources/
 
 ftp://.*/.*/	http://digital-opsis.com/oplinux-uclibc/stable/sources/
-http://.*/.*/	http://digital-opsis.com/oplinux-uclibc/stable/sources/
+https?://.*/.*/	http://digital-opsis.com/oplinux-uclibc/stable/sources/
 ftp://.*/.*/	http://digital-opsis.com/oplinux-uclibc/unstable/sources/
-http://.*/.*/	http://digital-opsis.com/oplinux-uclibc/unstable/sources/
+https?://.*/.*/	http://digital-opsis.com/oplinux-uclibc/unstable/sources/
 }
============================================================
--- classes/own-mirrors.bbclass	b479f189f6e4ec3bbfc821afce081de6cabe4a0c
+++ classes/own-mirrors.bbclass	05ecf9681794553dc30d95ab4fb2422bfb0e1896
@@ -1,4 +1,4 @@ PREMIRRORS() {
 PREMIRRORS() {
-http://.*/.* ${SOURCE_MIRROR_URL}
+https?://.*/.* ${SOURCE_MIRROR_URL}
 ftp://.*/.*  ${SOURCE_MIRROR_URL}
 }