eibd: Add recipe for git version based on pu branch

- Improved packaging, Sourcecode of examples are packaged separately

4 files changed, 40 insertions, 10 deletions

diff --git a/recipes/eibd/eibd.inc b/recipes/eibd/eibd.inc
index e509764f64..fabf6fcf30 100644
--- a/recipes/eibd/eibd.inc
+++ b/recipes/eibd/eibd.inc
@@ -6,11 +6,10 @@ LICENSE = "GPLv2"
 DEPENDS = " pthsem libxml2"
 DEPENDS_append_linux-uclibc = " argp-standalone "
 DEPENDS_append_linux-uclibceabi = " argp-standalone "
+INC_PR = "r1"
 
 SRC_URI += " file://eibd "
 
-S = "${WORKDIR}/bcusdk-${PV}"
-
 inherit autotools update-rc.d
 
 EXTRA_OECONF = " --with-pth=yes --without-pth-test \
@@ -32,25 +31,29 @@ do_install_prepend() {
         install -m 0755 ${WORKDIR}/eibd ${D}${sysconfdir}/init.d/eibd
 }
 
-PACKAGES =+ "eibd-server eibd-clients libeibclient-dev"
+PACKAGES = "eibd-client-sources libeibclient eibd-server eibd-server-dbg \
+            eibd-clients-dbg eibd-clients libeibclient-dev libeibclient-dbg"
 
 FILES_eibd-server = "${bindir}/eibnetsearch ${bindir}/findknxusb \
                      ${bindir}/eibd ${bindir}/bcuaddrtab \
                      ${bindir}/eibnetdescribe ${bindir}/bcuread \
                      ${sysconfdir}/init.d/eibd  "
+FILES_eibd-server-dbg = "${bindir}/.debug/eibd"
+FILES_eibd-client-sources = "${datadir}/bcusdk/*"
 FILES_eibd-clients = "${bindir}/*"
+FILES_eibd-clients-dbg = "${bindir}/.debug"
+FILES_libeibclient = "\
+                     ${libdir}/lib*${SOLIBS} \
+                     ${base_libdir}/*${SOLIBS} "
 FILES_libeibclient-dev = "\
                      ${includedir} \
-                     ${libdir}/lib*.so \
                      ${libdir}/*.la \
-                     ${libdir}/*.a \
-                     ${libdir}/*.o \
-                     ${libdir}/pkgconfig \
-                     /lib/*.a \
-                     /lib/*.o \
-                     ${datadir}/aclocal"
+                     ${libdir}/*.a "
+FILES_libeibclient-dbg = "${libexecdir}/.debug ${libdir}/.debug \
+                          ${base_libdir}/.debug "
 
 DESCRIPTION_eibd-clients = "Simple example programs to perform management tasks on a EIB system."
+DESCRIPTION_libeibclient = "A client library written in C to access the EIB bus over eibd."
 DESCRIPTION_libeibclient-dev = "A client library written in C to access the EIB bus over eibd."
 DESCRIPTION_eibd-server = "eibd is a daemon which supports connection to an EIB (KNX) network over various \
 interfaces. It provides its services over TCP/IP or Unix domain sockets. \
diff --git a/recipes/eibd/eibd_0.0.4.bb b/recipes/eibd/eibd_0.0.4.bb
index 49e082c8c1..21e953bc46 100644
--- a/recipes/eibd/eibd_0.0.4.bb
+++ b/recipes/eibd/eibd_0.0.4.bb
@@ -1,3 +1,7 @@
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/bcusdk-${PV}"
+
 SRC_URI = "http://www.auto.tuwien.ac.at/~mkoegler/eib/bcusdk_${PV}.tar.gz "
 
 require eibd.inc
diff --git a/recipes/eibd/eibd_git.bb b/recipes/eibd/eibd_git.bb
new file mode 100644
index 0000000000..c4a53554df
--- /dev/null
+++ b/recipes/eibd/eibd_git.bb
@@ -0,0 +1,12 @@
+SRCREV = "c13fffff4d95067acd45ae51e075b0bf71b01dee"
+PV = "0.0.4+gitr${SRCREV}"
+PR = "${INC_PR}.0"
+
+S = "${WORKDIR}/git"
+
+#SRC_URI = "git://bcusdk.git.sourceforge.net/gitroot/bcusdk/bcusdk;protocol=git;branch=master"
+SRC_URI = "git://bcusdk.git.sourceforge.net/gitroot/bcusdk/bcusdk;protocol=git;branch=pu"
+
+SRC_URI += "file://disable-python-pascal.patch"
+
+require eibd.inc
diff --git a/recipes/eibd/files/disable-python-pascal.patch b/recipes/eibd/files/disable-python-pascal.patch
new file mode 100644
index 0000000000..1c21f4240b
--- /dev/null
+++ b/recipes/eibd/files/disable-python-pascal.patch
@@ -0,0 +1,11 @@
+Index: git/eibd/client/Makefile.am
+===================================================================
+--- git.orig/eibd/client/Makefile.am	2009-12-22 13:56:03.697239503 +0100
++++ git/eibd/client/Makefile.am	2009-12-22 13:57:40.315118547 +0100
+@@ -4,5 +4,5 @@ else
+ BUILDJAVA = 
+ endif
+ 
+-SUBDIRS=def c $(BUILDJAVA) php perl cs python pascal .
++SUBDIRS=def c $(BUILDJAVA) php perl cs .
+