Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

10 files changed, 119 insertions, 11 deletions

diff --git a/packages/freesmartphone/fso-abyss/abyss.conf b/packages/freesmartphone/fso-abyss/abyss.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/freesmartphone/fso-abyss/abyss.conf
diff --git a/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf b/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf
new file mode 100644
index 0000000000..2ff579d730
--- /dev/null
+++ b/packages/freesmartphone/fso-abyss/om-gta01/abyss.conf
@@ -0,0 +1,16 @@
+[omuxerd]
+# set to 1, when the first AllocChannel request opens a session
+autoopen = 1
+# set to 1, when the last ReleaseChannel closes the session
+autoclose = 1
+# set to 1, when closing the session should close the program
+autoexit = 1
+
+[session]
+# set 0 for 07.10 basic multiplexing, 1 for advanced
+mode = 1
+# set maximum 07.10 frame size
+framesize = 98
+# configure modem port
+port = /dev/ttySAC0
+speed = 115200
diff --git a/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf b/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf
new file mode 100644
index 0000000000..2ff579d730
--- /dev/null
+++ b/packages/freesmartphone/fso-abyss/om-gta02/abyss.conf
@@ -0,0 +1,16 @@
+[omuxerd]
+# set to 1, when the first AllocChannel request opens a session
+autoopen = 1
+# set to 1, when the last ReleaseChannel closes the session
+autoclose = 1
+# set to 1, when closing the session should close the program
+autoexit = 1
+
+[session]
+# set 0 for 07.10 basic multiplexing, 1 for advanced
+mode = 1
+# set maximum 07.10 frame size
+framesize = 98
+# configure modem port
+port = /dev/ttySAC0
+speed = 115200
diff --git a/packages/freesmartphone/fso-abyss/om-gta03/abyss.conf b/packages/freesmartphone/fso-abyss/om-gta03/abyss.conf
new file mode 100644
index 0000000000..1764c5b798
--- /dev/null
+++ b/packages/freesmartphone/fso-abyss/om-gta03/abyss.conf
@@ -0,0 +1,16 @@
+[omuxerd]
+# set to 1, when the first AllocChannel request opens a session
+autoopen = 1
+# set to 1, when the last ReleaseChannel closes the session
+autoclose = 1
+# set to 1, when closing the session should close the program
+autoexit = 1
+
+[session]
+# set 0 for 07.10 basic multiplexing, 1 for advanced
+mode = 0
+# set maximum 07.10 frame size
+framesize = 98
+# configure modem port
+port = /dev/ttySAC0
+speed = 115200
diff --git a/packages/freesmartphone/fso-abyss_git.bb b/packages/freesmartphone/fso-abyss_git.bb
index 45d2257c72..3cfff7dc9a 100644
--- a/packages/freesmartphone/fso-abyss_git.bb
+++ b/packages/freesmartphone/fso-abyss_git.bb
@@ -4,14 +4,33 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>"
 SECTION = "console/network"
 DEPENDS = "vala-native dbus dbus-glib libgsm0710"
 LICENSE = "GPL"
-PV = "0.2.1+gitr${SRCREV}"
+PV = "0.3.0+gitr${SRCREV}"
 PR = "r0"
 
-SRC_URI = "${FREESMARTPHONE_GIT}/fso-abyss.git;protocol=git;branch=master"
+SRC_URI = "\
+  ${FREESMARTPHONE_GIT}/fso-abyss.git;protocol=git;branch=master \
+  file://abyss.conf \
+"
 S = "${WORKDIR}/git"
 
 inherit autotools
 
-#RCONFLICTS = "gsm0710muxd fso-gsm0710muxd"
+do_install_append() {
+	install -d ${D}${sysconfdir}
+	install -m 0644 ${WORKDIR}/abyss.conf ${D}${sysconfdir}/
+}
 
-FILES_${PN} += "${datadir} ${sysconfdir}"
+PACKAGES =+ "${PN}-config"
+
+FILES_${PN} += "${sysconfdir} ${datadir}"
+RRECOMMENDS_${PN} = "${PN}-config"
+
+FILES_${PN}-config = "\
+  ${sysconfdir}/abyss.conf \
+"
+
+CONFFILES_${PN}-config = "\
+  ${sysconfdir}/abyss.conf \
+"
+
+PACKAGE_ARCH_${PN} = "${BASE_PACKAGE_ARCH}"
diff --git a/packages/freesmartphone/libframeworkd-glib_git.bb b/packages/freesmartphone/libframeworkd-glib_git.bb
index bce8312fcb..79e040ed35 100644
--- a/packages/freesmartphone/libframeworkd-glib_git.bb
+++ b/packages/freesmartphone/libframeworkd-glib_git.bb
@@ -2,15 +2,10 @@ DESCRIPTION = "freesmartphone.org API glib wrapper"
 LICENSE = "LGPL"
 SECTION = "devel"
 DEPENDS = "dbus-glib"
-PV = "0.0.1+gitr${SRCREV}"
+PV = "0.0.2+gitr${SRCREV}"
 PR = "r0"
 
 SRC_URI = "${FREESMARTPHONE_GIT}/libframeworkd-glib.git;protocol=git;branch=master"
 S = "${WORKDIR}/git"
 
-inherit autotools pkgconfig
-
-do_stage() {
-	autotools_stage_all
-}
-
+inherit autotools autotools_stage pkgconfig
diff --git a/packages/perl/libsys-mmap-perl-native_0.13.bb b/packages/perl/libsys-mmap-perl-native_0.13.bb
new file mode 100644
index 0000000000..15eb6308f1
--- /dev/null
+++ b/packages/perl/libsys-mmap-perl-native_0.13.bb
@@ -0,0 +1,5 @@
+SECTION = "libs"
+
+inherit native
+
+require libsys-mmap-perl_${PV}.bb
diff --git a/packages/perl/libsys-mmap-perl_0.13.bb b/packages/perl/libsys-mmap-perl_0.13.bb
new file mode 100644
index 0000000000..e3037a2092
--- /dev/null
+++ b/packages/perl/libsys-mmap-perl_0.13.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "Uses mmap to map in a file as a perl variable."
+SECTION = "libs"
+LICENSE = "Artistic|GPL"
+PR = "r0"
+
+SRC_URI = "http://search.cpan.org/CPAN/authors/id/S/SW/SWALTERS/Sys-Mmap-0.13.tar.gz"
+
+S = "${WORKDIR}/Sys-Mmap-${PV}"
+
+inherit cpan
diff --git a/packages/python/python-pycrypto_git.bb b/packages/python/python-pycrypto_git.bb
new file mode 100644
index 0000000000..9e6eecbebd
--- /dev/null
+++ b/packages/python/python-pycrypto_git.bb
@@ -0,0 +1,13 @@
+DESCRIPTION = "A collection of cryptographic algorithms and protocols"
+SECTION = "devel/python"
+PRIORITY = "optional"
+DEPENDS = "gmp"
+SRCNAME = "pycrypto"
+LICENSE = "pycrypto"
+PR = "ml0"
+
+PV = "2.0.1+gitr${SRCREV}"
+SRC_URI = "git://git.pycrypto.org:9419/crypto/pycrypto-2.x.git;protocol=git;branch=master"
+S = "${WORKDIR}/git"
+
+inherit distutils
diff --git a/packages/qhull/tetgen_1.4.2.bb b/packages/qhull/tetgen_1.4.2.bb
new file mode 100644
index 0000000000..ce6feb54e7
--- /dev/null
+++ b/packages/qhull/tetgen_1.4.2.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "A Quality Tetrahedral Mesh Generator and Three-Dimensional Delaunay Triangulator."
+LICENSE = "MIT"
+
+SRC_URI = "http://www.wias-berlin.de/people/si/tetgen${PV}.tar.gz"
+
+S = "${WORKDIR}/tetgen${PV}"
+
+CXX += " ${LDFLAGS}"
+
+do_configure() {
+	sed -i -e s:ar\ :'${AR}'\ :g makefile 
+}
+
+do_install() {
+	install -d ${D}${bindir}
+	install -m 0755 tetgen ${D}${bindir}/
+}
+