diff options
-rw-r--r-- | classes/kernel.bbclass | 6 | ||||
-rw-r--r-- | conf/distro/unslung-packages.conf | 1 | ||||
-rw-r--r-- | conf/distro/unslung.conf | 7 | ||||
-rw-r--r-- | packages/bluez/bluez-libs_2.24.bb | 22 | ||||
-rw-r--r-- | packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/bluez/bluez-utils-dbus-2.24/dbus.patch | 53 | ||||
-rw-r--r-- | packages/bluez/bluez-utils-dbus_2.20.bb | 1 | ||||
-rw-r--r-- | packages/bluez/bluez-utils-dbus_2.21.bb | 1 | ||||
-rw-r--r-- | packages/bluez/bluez-utils-dbus_2.24.bb | 7 | ||||
-rw-r--r-- | packages/bluez/bluez-utils-nodbus_2.20.bb | 1 | ||||
-rw-r--r-- | packages/bluez/bluez-utils-nodbus_2.21.bb | 1 | ||||
-rw-r--r-- | packages/bluez/bluez-utils.inc | 1 | ||||
-rw-r--r-- | packages/dbus/dbus_0.60.inc | 1 | ||||
-rw-r--r-- | packages/gnome/gconf-dbus_svn.bb | 75 | ||||
-rw-r--r-- | packages/meta/unslung-image.bb | 6 |
15 files changed, 176 insertions, 7 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index af2d35fc76..86468b6642 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -101,8 +101,10 @@ kernel_do_stage() { mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/ - mkdir -p ${STAGING_KERNEL_DIR}/include/sound - cp -fR include/sound/* ${STAGING_KERNEL_DIR}/include/sound/ + if [ -d include/sound ]; then + mkdir -p ${STAGING_KERNEL_DIR}/include/sound + cp -fR include/sound/* ${STAGING_KERNEL_DIR}/include/sound/ + fi if [ -d drivers/sound ]; then # 2.4 alsa needs some headers from this directory diff --git a/conf/distro/unslung-packages.conf b/conf/distro/unslung-packages.conf index 351e70d543..4cef102535 100644 --- a/conf/distro/unslung-packages.conf +++ b/conf/distro/unslung-packages.conf @@ -29,6 +29,7 @@ ${PKGDIR}/packages/mtd/*.bb \ ${PKGDIR}/packages/nslu2-binary-only/*.bb \ ${PKGDIR}/packages/pkgconfig/*.bb \ ${PKGDIR}/packages/portmap/*.bb \ +${PKGDIR}/packages/python/*.bb \ ${PKGDIR}/packages/quilt/*.bb \ ${PKGDIR}/packages/slugimage/*.bb \ ${PKGDIR}/packages/unzip/*.bb \ diff --git a/conf/distro/unslung.conf b/conf/distro/unslung.conf index 5a88ac9c72..71ee5c7d2f 100644 --- a/conf/distro/unslung.conf +++ b/conf/distro/unslung.conf @@ -48,10 +48,13 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross" PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" -PREFERRED_VERSION_glibc ?= "2.2.5" -PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_VERSION_binutils ?= "2.15.94.0.1" PREFERRED_VERSION_binutils-cross ?= "2.15.94.0.1" +PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4" +PREFERRED_VERSION_gcc-cross ?= "3.4.4" +PREFERRED_VERSION_gcc ?= "3.4.4" +PREFERRED_VERSION_glibc ?= "2.2.5" +PREFERRED_VERSION_glibc-initial ?= "2.2.5" PREFERRED_PROVIDER_virtual/kernel ?= "unslung-kernel" PREFERRED_VERSION_unslung-kernel ?= "2.4.22.l2.3r63" diff --git a/packages/bluez/bluez-libs_2.24.bb b/packages/bluez/bluez-libs_2.24.bb new file mode 100644 index 0000000000..d740bd80a9 --- /dev/null +++ b/packages/bluez/bluez-libs_2.24.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland Libaries." +SECTION = "libs" +PRIORITY = "optional" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://bluez.sourceforge.net/download/bluez-libs-${PV}.tar.gz" + +inherit autotools pkgconfig + +HEADERS = "bluetooth.h bnep.h cmtp.h hci.h hci_lib.h hidp.h l2cap.h rfcomm.h sco.h sdp.h sdp_lib.h" + +do_stage() { + oe_libinstall -a -so -C src libbluetooth ${STAGING_LIBDIR} + + install -d ${STAGING_INCDIR}/bluetooth/ + for f in ${HEADERS} + do + install -m 0644 include/$f ${STAGING_INCDIR}/bluetooth/$f + done +} diff --git a/packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty b/packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/bluez/bluez-utils-dbus-2.24/.mtn2git_empty diff --git a/packages/bluez/bluez-utils-dbus-2.24/dbus.patch b/packages/bluez/bluez-utils-dbus-2.24/dbus.patch new file mode 100644 index 0000000000..d8ec946a0b --- /dev/null +++ b/packages/bluez/bluez-utils-dbus-2.24/dbus.patch @@ -0,0 +1,53 @@ +--- bluez-utils-2.24/acinclude.m4.orig 2006-01-12 08:21:38.000000000 +0100 ++++ bluez-utils-2.24/acinclude.m4 2006-01-12 08:23:18.000000000 +0100 +@@ -131,46 +131,15 @@ + ]) + + 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) +- AC_CHECK_LIB(dbus-1, dbus_message_iter_get_basic, dummy=yes, dbus_found=no) +- +- CPPFLAGS=$ac_save_CPPFLAGS +- LDFLAGS=$ac_save_LDFLAGS +- + AC_SUBST(DBUS_CFLAGS) + AC_SUBST(DBUS_LIBS) ++ fi + ]) + + AC_DEFUN([AC_PATH_FUSE], [ diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb index 3a9baf4ebc..ca3b110d48 100644 --- a/packages/bluez/bluez-utils-dbus_2.20.bb +++ b/packages/bluez/bluez-utils-dbus_2.20.bb @@ -5,6 +5,7 @@ PR = "r9" DEPENDS += "dbus" SRC_URI += "file://dbus.patch;patch=1 \ file://smash.patch;patch=1 \ + file://hciattach_devlength.patch;patch=1 \ file://hcid-alignment-fix.patch;patch=1" EXTRA_OECONF += "--with-dbus" diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb index 7eeb0a269a..bfd3994c24 100644 --- a/packages/bluez/bluez-utils-dbus_2.21.bb +++ b/packages/bluez/bluez-utils-dbus_2.21.bb @@ -5,5 +5,6 @@ PR = "r3" DEPENDS += "dbus" SRC_URI += "file://dbus.patch;patch=1 \ file://smash.patch;patch=1 \ + file://hciattach_devlength.patch;patch=1 \ file://hcid-alignment-fix.patch;patch=1" EXTRA_OECONF += "--with-dbus" diff --git a/packages/bluez/bluez-utils-dbus_2.24.bb b/packages/bluez/bluez-utils-dbus_2.24.bb new file mode 100644 index 0000000000..c05208a024 --- /dev/null +++ b/packages/bluez/bluez-utils-dbus_2.24.bb @@ -0,0 +1,7 @@ +include bluez-utils.inc + +PR = "r0" + +DEPENDS += "dbus" +SRC_URI += "file://dbus.patch;patch=1" +EXTRA_OECONF += "--with-dbus" diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb index 2abe49aab3..3c47a030b2 100644 --- a/packages/bluez/bluez-utils-nodbus_2.20.bb +++ b/packages/bluez/bluez-utils-nodbus_2.20.bb @@ -2,5 +2,6 @@ include bluez-utils.inc PR = "r1" +SRC_URI += "file://hciattach_devlength.patch;patch=1" EXTRA_OECONF += "--without-dbus" diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb index 774549be3d..43c06a9587 100644 --- a/packages/bluez/bluez-utils-nodbus_2.21.bb +++ b/packages/bluez/bluez-utils-nodbus_2.21.bb @@ -2,4 +2,5 @@ include bluez-utils.inc PR = "r1" +SRC_URI += "file://hciattach_devlength.patch;patch=1" EXTRA_OECONF += "--without-dbus" diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc index 9fddc5f759..5babed48dc 100644 --- a/packages/bluez/bluez-utils.inc +++ b/packages/bluez/bluez-utils.inc @@ -8,7 +8,6 @@ LICENSE = "GPL" SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \ file://base.patch;patch=1 \ file://blueboxes.patch;patch=1 \ - file://hciattach_devlength.patch;patch=1 \ file://hcid.conf \ file://bluetooth.default \ file://bluetooth.conf " diff --git a/packages/dbus/dbus_0.60.inc b/packages/dbus/dbus_0.60.inc index 094a9b68d6..70546ed5b1 100644 --- a/packages/dbus/dbus_0.60.inc +++ b/packages/dbus/dbus_0.60.inc @@ -4,7 +4,6 @@ HOMEPAGE = "http://www.freedesktop.org/Software/dbus" DESCRIPTION = "message bus system for applications to talk to one another" LICENSE = "GPL" DEPENDS = "expat glib-2.0 virtual/libintl" -DEFAULT_PREFERENCE = "-1" SRC_URI = "http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \ file://cross.patch;patch=1 \ diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb new file mode 100644 index 0000000000..6199d2fde2 --- /dev/null +++ b/packages/gnome/gconf-dbus_svn.bb @@ -0,0 +1,75 @@ +SECTION = "x11/utils" +DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt" +DESCRIPTION = "Settings daemon using DBUS for communication." +LICENSE = "GPL" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +PROVIDES = "gconf" +RPROVIDES_${PN} = "gconf" +RPROVIDES_${PN}-dev = "gconf-dev" + +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ + file://gconf-dbus-update.patch;patch=1;pnum=0 \ + file://69gconfd-dbus" + +inherit pkgconfig autotools +S = "${WORKDIR}/trunk" + +FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" + +EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" + +HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" + +do_stage() { + oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/gconf/2/gconf/ + ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) + install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 +} + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ + install -d ${D}/${datadir}/dbus-1.0/services/ + install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ +} +SECTION = "x11/utils" +DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt" +DESCRIPTION = "Settings daemon using DBUS for communication." +LICENSE = "GPL" +MAINTAINER = "Florian Boor <florian@kernelconcepts.de>" +PROVIDES = "gconf" +RPROVIDES_${PN} = "gconf" +RPROVIDES_${PN}-dev = "gconf-dev" + +PV = "0.0svn${CVSDATE}" +PR = "r8" + +SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus/branches;module=dbus-0-23-branch;proto=http \ + file://69gconfd-dbus" + +inherit pkgconfig autotools +S = "${WORKDIR}/dbus-0-23-branch" + +FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*" + +EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" + +HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h" + +do_stage() { + oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/gconf/2/gconf/ + ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done ) + install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4 +} + +do_install_append () { + install -d ${D}/${sysconfdir}/X11/Xsession.d + install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ + install -d ${D}/${datadir}/dbus-1.0/services/ + install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/ +} diff --git a/packages/meta/unslung-image.bb b/packages/meta/unslung-image.bb index 265986be50..2aa03a3e49 100644 --- a/packages/meta/unslung-image.bb +++ b/packages/meta/unslung-image.bb @@ -6,10 +6,14 @@ IMAGE_BASENAME = "unslung" IMAGE_LINGUAS = "" USE_DEVFS = "1" -DEPENDS = "unslung-kernel unslung-rootfs \ +DEPENDS = "virtual/kernel unslung-rootfs \ glibc slingbox ipkg cpio findutils \ ${UNSLUNG_EXTRA_DEPENDS}" +RDEPENDS = "kernel unslung-rootfs \ + glibc slingbox ipkg cpio findutils \ + ${UNSLUNG_EXTRA_RDEPENDS}" + IPKG_INSTALL = "unslung-rootfs \ libc6-unslung slingbox ipkg cpio findutils \ ${UNSLUNG_EXTRA_INSTALL}" |