Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2004/12/28 18:12:59+01:00 dyndns.org!reenoo
prismstumbler: add missing RDEPENDS

2004/12/28 17:54:43+01:00 dyndns.org!reenoo
Merge oe-devel@oe-devel.bkbits.net:openembedded
into sugarcube.dyndns.org:/home2/oe/bakery/openembedded

2004/12/28 17:54:16+01:00 dyndns.org!reenoo
bluez: dbus related patches by Koen Kooi

BKrev: 41d19a7bzQdOy-Bt0WC-USN8MFGbJg

diff --git a/packages/bluez-utils/bluez-utils-common_2.11.inc b/packages/bluez-utils/bluez-utils-common_2.11.inc
index e69de29..6cebe42 100644 (file)
--- a/packages/bluez-utils/bluez-utils-common_2.11.inc
+++ b/packages/bluez-utils/bluez-utils-common_2.11.inc
@@ -0,0 +1,28 @@
+DESCRIPTION = "Linux Bluetooth Stack Userland Utilities."
+SECTION = "libs"
+PRIORITY = "optional"
+DEPENDS = "bluez-libs pcmcia-cs"
+RPROVIDES = "bluez-pan bluez-sdp bluez-utils"
+LICENSE = "GPL"
+
+SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
+       file://hcid.conf"
+S = "${WORKDIR}/bluez-utils-${PV}"
+
+EXTRA_OECONF = "--with-bluez-libs=${STAGING_LIBDIR} --with-bluez-includes=${STAGING_INCDIR} --enable-pcmcia --enable-initscripts"
+
+do_install_append() {
+       install -d ${D}/sbin ${D}/bin/
+       mv ${D}${sbindir}/* ${D}/sbin/
+       mv ${D}${bindir}/* ${D}/bin/
+       rmdir ${D}${bindir} ${D}${sbindir}
+       chmod u+s ${D}/sbin/hciattach ${D}/sbin/hciconfig
+       chmod 755 ${D}/etc/pcmcia/bluetooth
+       install -m 0644 ${WORKDIR}/hcid.conf ${D}/etc/bluetooth/
+}
+
+inherit autotools update-rc.d
+
+INITSCRIPT_NAME = "bluetooth"
+INITSCRIPT_PARAMS = "defaults 23 19"
+

diff --git a/packages/bluez-utils/bluez-utils-dbus-2.11/dbus.patch b/packages/bluez-utils/bluez-utils-dbus-2.11/dbus.patch
index e69de29..ecab56b 100644 (file)
--- a/packages/bluez-utils/bluez-utils-dbus-2.11/dbus.patch
+++ b/packages/bluez-utils/bluez-utils-dbus-2.11/dbus.patch
@@ -0,0 +1,52 @@
+--- bluez-utils-2.10/acinclude.m4.old  2004-10-19 22:34:47.000000000 +0100
++++ bluez-utils-2.10/acinclude.m4      2004-10-19 22:50:47.000000000 +0100
+@@ -124,45 +124,14 @@
+ ])
+ 
+ AC_DEFUN([AC_PATH_DBUS], [
+-      dbus_prefix=${prefix}
+-
+-      AC_ARG_WITH(dbus, AC_HELP_STRING([--with-dbus=DIR], [D-BUS library is installed in DIR]), [
+-              if (test "${withval}" != "yes"); then
+-                      dbus_prefix=${withval}
+-              fi
+-      ])
+-
+-      ac_save_CPPFLAGS=$CPPFLAGS
+-      ac_save_LDFLAGS=$LDFLAGS
+-
+-      DBUS_CFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE"
+-      test -d "${dbus_prefix}/include/dbus-1.0" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/include/dbus-1.0"
+-      if (test "${prefix}" = "${bluez_prefix}"); then
+-              test -d "${libdir}/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${libdir}/dbus-1.0/include"
+-      else
+-              test -d "${dbus_prefix}/lib64/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib64/dbus-1.0/include"
+-              test -d "${dbus_prefix}/lib/dbus-1.0/include" && DBUS_CFLAGS="$DBUS_CFLAGS -I${dbus_prefix}/lib/dbus-1.0/include"
+-      fi
+-
++      if pkg-config --exists dbus-1; then
++      dbus_found=yes ; DBUS_CFLAGS="`pkg-config --cflags dbus-1` -DDBUS_API_SUBJECT_TO_CHANGE"
++      DBUS_LIBS="`pkg-config --libs dbus-1`"
+       CPPFLAGS="$CPPFLAGS $DBUS_CFLAGS"
+-      AC_CHECK_HEADER(dbus/dbus.h, dbus_found=yes, dbus_found=no)
+-
+-      DBUS_LIBS=""
+-      if (test "${prefix}" = "${dbus_prefix}"); then
+-              test -d "${libdir}" && DBUS_LIBS="$DBUS_LIBS -L${libdir}"
+-      else
+-              test -d "${dbus_prefix}/lib64" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib64"
+-              test -d "${dbus_prefix}/lib" && DBUS_LIBS="$DBUS_LIBS -L${dbus_prefix}/lib"
+-      fi
+-
+       LDFLAGS="$LDFLAGS $DBUS_LIBS"
+-      AC_CHECK_LIB(dbus-1, dbus_error_init, DBUS_LIBS="$DBUS_LIBS -ldbus-1", dbus_found=no)
+-
+-      CPPFLAGS=$ac_save_CPPFLAGS
+-      LDFLAGS=$ac_save_LDFLAGS
+-
+       AC_SUBST(DBUS_CFLAGS)
+       AC_SUBST(DBUS_LIBS)
++      fi
+ ])
+ 
+ AC_DEFUN([AC_ARG_BLUEZ], [

diff --git a/packages/bluez-utils/bluez-utils-dbus_2.11.bb b/packages/bluez-utils/bluez-utils-dbus_2.11.bb
index e69de29..4189e80 100644 (file)
--- a/packages/bluez-utils/bluez-utils-dbus_2.11.bb
+++ b/packages/bluez-utils/bluez-utils-dbus_2.11.bb
@@ -0,0 +1,6 @@
+include bluez-utils-common_${PV}.inc
+DEPENDS += "dbus"
+SRC_URI += "file://dbus.patch;patch=1"
+PR = "r3"
+EXTRA_OECONF += "--with-dbus"
+

diff --git a/packages/prismstumbler/prismstumbler_0.7.3.bb b/packages/prismstumbler/prismstumbler_0.7.3.bb
index e69de29..6f29742 100644 (file)
--- a/packages/prismstumbler/prismstumbler_0.7.3.bb
+++ b/packages/prismstumbler/prismstumbler_0.7.3.bb
@@ -0,0 +1,56 @@
+SECTION = "x11/network"
+PR = "r2"
+
+PACKAGES = "prismstumbler prismstumbler-frontend"
+DESCRIPTION = "Prismstumbler wireless LAN scanner"
+LICENSE = "GPL"
+MAINTAINER = "Florian Boor <florian.boor@kernelconcepts.de>"
+DEPENDS = "libpcap gtk+ wireless-tools sqlite zlib"
+RDEPENDS = "wireless-tools"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/prismstumbler/${PN}-${PV}.tar.bz2 \
+       file://bogoconf.patch;patch=1 \
+        file://libz.patch;patch=1;pnum=0"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-libpcap=${STAGING_DIR}/${HOST_SYS} --with-sqlite-libs=${STAGING_LIBDIR} --with-sqlite-includes=${STAGING_INCDIR}"
+
+FILES_${PN} = "${bindir}/prismstumbler"
+
+FILES_prismstumbler-frontend = "${bindir}/psfront ${bindir}/pst \
+                              ${datadir}/applications \
+                              ${datadir}/pixmaps ${datadir}/doc/prismstumbler/help.txt \
+                               ${sysconfdir}"
+RDEPENDS_prismstumbler-frontend = "${PN}"
+
+do_configure() {
+  autotools_do_configure
+  cd ${S}/src/gpsd
+  autoreconf
+  rm -f Makefile config.log config.cache
+  ${S}/src/gpsd/configure \
+                    --build=${BUILD_SYS} \
+                    --host=${HOST_SYS} \
+                    --target=${TARGET_SYS} \
+                    --prefix=${prefix} \
+                    --exec_prefix=${exec_prefix} \
+                    --bindir=${bindir} \
+                    --sbindir=${sbindir} \
+                    --libexecdir=${libexecdir} \
+                    --datadir=${datadir} \
+                    --sysconfdir=${sysconfdir} \
+                    --sharedstatedir=${sharedstatedir} \
+                    --localstatedir=${localstatedir} \
+                    --libdir=${libdir} \
+                    --includedir=${includedir} \
+                    --oldincludedir=${oldincludedir} \
+                    --infodir=${infodir} \
+                    --mandir=${mandir} \
+                        ${EXTRA_OECONF} \
+                    $@;
+}
+
+do_install_append() {
+  chmod a+s ${D}/${bindir}/prismstumbler
+}