diff options
-rw-r--r-- | conf/checksums.ini | 20 | ||||
-rw-r--r-- | conf/distro/angstrom-2008.1.conf | 1 | ||||
-rw-r--r-- | recipes/bluez/bluez4_4.35.bb | 66 | ||||
-rw-r--r-- | recipes/bluez/obexd_0.10.bb | 10 | ||||
-rw-r--r-- | recipes/gnome/gnome-bluetooth_2.27.1.bb | 5 | ||||
-rw-r--r-- | recipes/gnome/gnome-panel_2.24.0.bb | 5 | ||||
-rw-r--r-- | recipes/linux/linux-2.6.28/atngw100/defconfig (renamed from recipes/linux/linux-2.6.28/atngw100/atngw100_defconfig) | 133 | ||||
-rw-r--r-- | recipes/openobex/openobex-1.5/libusb_crosscompile_check.patch | 11 | ||||
-rw-r--r-- | recipes/openobex/openobex_1.5.bb | 22 |
9 files changed, 258 insertions, 15 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini index f3a85f47d4..65ab2f233c 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -2706,6 +2706,14 @@ sha256=5a2e6e83062699fb01babfb5b211054e01dde097d3b31767135be5447bb05bde md5=53a3347a1c38971bee4c4016b45bcf6d sha256=f6cfceb541a10849805f853b790bc8343309e7b21078a9c18a7a6a8cf2f94e3b +[http://www.kernel.org/pub/linux/bluetooth/bluez-4.34.tar.gz] +md5=2435f7a932cdeecce01211e06142795f +sha256=1c46b6e219aec9bbd3286e9366de7e6dd05f68ed33b7487fbd211397c890fc40 + +[http://www.kernel.org/pub/linux/bluetooth/bluez-4.35.tar.gz] +md5=5919d6383cd9446f8b90fdca748dc961 +sha256=e5e592de95f50a1569d3e4a95c8b955a2535e265e24869e3ce30e19b0949b465 + [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz] md5=2aa806940d2c841e57a9b2ab7302b750 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0 @@ -14866,6 +14874,10 @@ sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380 md5=64921b5ff5cdadbccfcd3820f03be7d8 sha256=58a5ea16d499fe06f90fcbf1d687d1235d2cb9bc28bf979867bd3faadf38fc3f +[http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2] +md5=e921200f074ca97184e150ef5a4af825 +sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1 + [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2] md5=e921200f074ca97184e150ef5a4af825 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1 @@ -17134,6 +17146,10 @@ sha256=c80d9ea7ebca32b63ea23d2a52ac799cff32f8f30c66b491d2b8f93da05585e4 md5=b79146369fc76a61d6d4056a937c71c8 sha256=b69a259795762881a5384072085bb501d77c6fb974e0b7a16ca573565ffe3629 +[http://www.kernel.org/pub/linux/bluetooth/obexd-0.10.tar.gz] +md5=b9fbc1386b24f59b36aeb9d764c11fb5 +sha256=8ed452371010117e183ade4e1e3ae4b489485b792722bf3b97b817cf0ed66ac8 + [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz] md5=085b9edc0504c0d79e7479a54e2018c5 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e @@ -17394,6 +17410,10 @@ sha256=3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23 md5=feaa5dfe5151c0e70e8f868fa4648a43 sha256=3a80ba2524c66a46db3ac17a788a759015a1f79de6a495fcdf3a316e19fe7c23 +[http://www.kernel.org/pub/linux/bluetooth/openobex-1.5.tar.gz] +md5=0d83dc86445a46a1b9750107ba7ab65c +sha256=e602047570799a47ecb028420bda8f2cef41310e5a99d084de10aa9422935e65 + [http://www.openpbx.org/releases/openpbx.org-1.2_rc3.tar.gz] md5=e270c40626dfa2131cc39dd1352b46f9 sha256=934e1e5438c46927236f1f3254265e94c7e38e7c0e02d92abb7efc4e03ce91e9 diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf index e3e36d5c59..37cb8f068a 100644 --- a/conf/distro/angstrom-2008.1.conf +++ b/conf/distro/angstrom-2008.1.conf @@ -163,6 +163,7 @@ PREFERRED_PROVIDER_ntp ?= "ntp" PREFERRED_PROVIDER_hotplug = "udev" PREFERRED_PROVIDER_libxss = "libxss" PREFERRED_PROVIDER_bluez-utils-dbus = "bluez-utils" +PREFERRED_PROVIDER_bluez-libs = "bluez4" # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" diff --git a/recipes/bluez/bluez4_4.35.bb b/recipes/bluez/bluez4_4.35.bb new file mode 100644 index 0000000000..fec1411d00 --- /dev/null +++ b/recipes/bluez/bluez4_4.35.bb @@ -0,0 +1,66 @@ +DESCRIPTION = "Linux Bluetooth Stack Userland V4" +SECTION = "libs" +PRIORITY = "optional" +DEPENDS = "gst-plugins-base alsa-lib libusb-compat dbus-glib" +HOMEPAGE = "http://www.bluez.org" +LICENSE = "GPL" + +# For angstrom we want this to replace at least bluez-libs +PROVIDES_append_angstrom = " bluez-libs" + +PR = "r1" + +SRC_URI = "\ + http://www.kernel.org/pub/linux/bluetooth/bluez-${PV}.tar.gz \ + file://fix-dfutool-usb-declaration-mismatch.patch;patch=1 \ + file://sbc-thumb.patch;patch=1 \ + file://bluetooth.conf \ +" +S = "${WORKDIR}/bluez-${PV}" + +inherit autotools_stage +AUTOTOOLS_STAGE_PKGCONFIG = "1" + +EXTRA_OECONF = "\ + --enable-gstreamer \ + --enable-alsa \ + --enable-usb \ + --enable-netlink \ + --enable-tools \ + --enable-bccmd \ + --enable-hid2hci \ + --enable-dfutool \ + --enable-hidd \ + --enable-pandd \ + --enable-dund \ + --disable-cups \ + --enable-test \ + --enable-manpages \ + --enable-configfiles \ + --enable-initscripts \ + --disable-pcmciarules \ +" + +do_install_append() { + install -m 0644 ${S}/audio/audio.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/network/network.conf ${D}/${sysconfdir}/bluetooth/ + install -m 0644 ${S}/input/input.conf ${D}/${sysconfdir}/bluetooth/ + # at_console doesn't really work with the current state of OE, so punch some more holes so people can actually use BT + install -m 0644 ${WORKDIR}/bluetooth.conf ${D}/${sysconfdir}/dbus-1/system.d/ +} + +PACKAGES =+ "gst-plugin-bluez libasound-module-bluez" + +FILES_gst-plugin-bluez = "${libdir}/gstreamer-0.10/lib*.so" +FILES_libasound-module-bluez = "${libdir}/alsa-lib/lib*.so" +FILES_${PN} += "${libdir}/bluetooth/plugins/*.so" +FILES_${PN}-dev += "\ + ${libdir}/bluetooth/plugins/*.la \ + ${libdir}/alsa-lib/*.la \ + ${libdir}/gstreamer-0.10/*.la \ +" + +FILES_${PN}-dbg += "\ + ${libdir}/bluetooth/plugins/.debug \ + ${libdir}/*/.debug \ +" diff --git a/recipes/bluez/obexd_0.10.bb b/recipes/bluez/obexd_0.10.bb new file mode 100644 index 0000000000..e1cc6ce8ff --- /dev/null +++ b/recipes/bluez/obexd_0.10.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "OBEX Server and Client" +DEPENDS = "openobex glib-2.0 dbus bluez4" + +LICENSE = "GPLv2" + +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/obexd-${PV}.tar.gz" + +inherit autotools_stage + +FILES_${PN} += "${datadir}/dbus-1/" diff --git a/recipes/gnome/gnome-bluetooth_2.27.1.bb b/recipes/gnome/gnome-bluetooth_2.27.1.bb index 9a435c7f9c..5cf5e296a8 100644 --- a/recipes/gnome/gnome-bluetooth_2.27.1.bb +++ b/recipes/gnome/gnome-bluetooth_2.27.1.bb @@ -1,11 +1,12 @@ LICENSE = "GPL" SECTION = "x11/gnome" -PR = "r1" +PR = "r2" inherit autotools gnome pkgconfig -DEPENDS = "gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +DEPENDS = "obexd gconf-dbus gtk+ dbus-glib libunique libnotify hal bluez4 gnome-keyring" +RDEPENDS += "obexd" RCONFLICTS_${PN} = "bluez-gnome" do_configure_prepend() { diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb index 743e0fafd7..473bea405c 100644 --- a/recipes/gnome/gnome-panel_2.24.0.bb +++ b/recipes/gnome/gnome-panel_2.24.0.bb @@ -5,6 +5,8 @@ inherit gnome pkgconfig SRC_URI += "file://scrollkeeper.patch;patch=1" +SRC_URI += "file://idl-sysroot.patch;patch=1" + do_configure_prepend() { sed -i -e s:help:: ${S}/Makefile.am } @@ -16,7 +18,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*" FILES_${PN} =+ "${datadir}/gnome* \ ${datadir}/icons" -EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2" +export SYSROOT = "${STAGING_DIR_HOST}" +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}" EXTRA_OECONF = "--disable-scrollkeeper" do_stage() { diff --git a/recipes/linux/linux-2.6.28/atngw100/atngw100_defconfig b/recipes/linux/linux-2.6.28/atngw100/defconfig index 5751a4108d..cc40243403 100644 --- a/recipes/linux/linux-2.6.28/atngw100/atngw100_defconfig +++ b/recipes/linux/linux-2.6.28/atngw100/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.28 -# Sat Apr 11 22:20:53 2009 +# Sun Apr 12 11:36:16 2009 # CONFIG_AVR32=y CONFIG_GENERIC_GPIO=y @@ -131,10 +131,6 @@ CONFIG_CPU_AT32AP7000=y CONFIG_BOARD_ATNGW100=y # CONFIG_BOARD_FAVR_32 is not set # CONFIG_BOARD_MIMC200 is not set -# CONFIG_BOARD_ATSTK1002 is not set -# CONFIG_BOARD_ATSTK1003 is not set -# CONFIG_BOARD_ATSTK1004 is not set -# CONFIG_BOARD_ATSTK1006 is not set # CONFIG_BOARD_ATNGW100_EVKLCD10X is not set CONFIG_LOADER_U_BOOT=y @@ -796,7 +792,7 @@ CONFIG_JBD=y CONFIG_FS_MBCACHE=y # CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -# CONFIG_FS_POSIX_ACL is not set +CONFIG_FS_POSIX_ACL=y CONFIG_FILE_LOCKING=y # CONFIG_XFS_FS is not set # CONFIG_OCFS2_FS is not set @@ -806,7 +802,7 @@ CONFIG_INOTIFY_USER=y # CONFIG_QUOTA is not set # CONFIG_AUTOFS_FS is not set # CONFIG_AUTOFS4_FS is not set -# CONFIG_FUSE_FS is not set +CONFIG_FUSE_FS=y # # CD-ROM/DVD Filesystems @@ -822,7 +818,9 @@ CONFIG_MSDOS_FS=m CONFIG_VFAT_FS=m CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set # # Pseudo filesystems @@ -868,10 +866,30 @@ CONFIG_MINIX_FS=m # CONFIG_SYSV_FS is not set # CONFIG_UFS_FS is not set CONFIG_NETWORK_FILESYSTEMS=y -# CONFIG_NFS_FS is not set -# CONFIG_NFSD is not set +CONFIG_NFS_FS=m +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +CONFIG_NFS_V4=y +CONFIG_NFSD=m +CONFIG_NFSD_V3=y +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +CONFIG_LOCKD=m +CONFIG_LOCKD_V4=y +CONFIG_EXPORTFS=m +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +# CONFIG_SUNRPC_REGISTER_V4 is not set +CONFIG_RPCSEC_GSS_KRB5=m +# CONFIG_RPCSEC_GSS_SPKM3 is not set # CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_WEAK_PW_HASH is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_DEBUG2 is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -986,7 +1004,98 @@ CONFIG_FRAME_POINTER=y # CONFIG_SECURITY is not set # CONFIG_SECURITYFS is not set # CONFIG_SECURITY_FILE_CAPABILITIES is not set -# CONFIG_CRYPTO is not set +CONFIG_CRYPTO=m + +# +# Crypto core or helper +# +# CONFIG_CRYPTO_FIPS is not set +CONFIG_CRYPTO_ALGAPI=m +CONFIG_CRYPTO_ALGAPI2=m +CONFIG_CRYPTO_AEAD2=m +CONFIG_CRYPTO_BLKCIPHER=m +CONFIG_CRYPTO_BLKCIPHER2=m +CONFIG_CRYPTO_HASH2=m +CONFIG_CRYPTO_RNG2=m +CONFIG_CRYPTO_MANAGER=m +CONFIG_CRYPTO_MANAGER2=m +# CONFIG_CRYPTO_GF128MUL is not set +# CONFIG_CRYPTO_NULL is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set + +# +# Authenticated Encryption with Associated Data +# +# CONFIG_CRYPTO_CCM is not set +# CONFIG_CRYPTO_GCM is not set +# CONFIG_CRYPTO_SEQIV is not set + +# +# Block modes +# +CONFIG_CRYPTO_CBC=m +# CONFIG_CRYPTO_CTR is not set +# CONFIG_CRYPTO_CTS is not set +# CONFIG_CRYPTO_ECB is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set + +# +# Hash modes +# +# CONFIG_CRYPTO_HMAC is not set +# CONFIG_CRYPTO_XCBC is not set + +# +# Digest +# +# CONFIG_CRYPTO_CRC32C is not set +# CONFIG_CRYPTO_MD4 is not set +CONFIG_CRYPTO_MD5=m +# CONFIG_CRYPTO_MICHAEL_MIC is not set +# CONFIG_CRYPTO_RMD128 is not set +# CONFIG_CRYPTO_RMD160 is not set +# CONFIG_CRYPTO_RMD256 is not set +# CONFIG_CRYPTO_RMD320 is not set +# CONFIG_CRYPTO_SHA1 is not set +# CONFIG_CRYPTO_SHA256 is not set +# CONFIG_CRYPTO_SHA512 is not set +# CONFIG_CRYPTO_TGR192 is not set +# CONFIG_CRYPTO_WP512 is not set + +# +# Ciphers +# +# CONFIG_CRYPTO_AES is not set +# CONFIG_CRYPTO_ANUBIS is not set +# CONFIG_CRYPTO_ARC4 is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +CONFIG_CRYPTO_DES=m +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_KHAZAD is not set +# CONFIG_CRYPTO_SALSA20 is not set +# CONFIG_CRYPTO_SEED is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_TEA is not set +# CONFIG_CRYPTO_TWOFISH is not set + +# +# Compression +# +# CONFIG_CRYPTO_DEFLATE is not set +# CONFIG_CRYPTO_LZO is not set + +# +# Random Number Generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_CRYPTO_HW=y # # Library routines diff --git a/recipes/openobex/openobex-1.5/libusb_crosscompile_check.patch b/recipes/openobex/openobex-1.5/libusb_crosscompile_check.patch new file mode 100644 index 0000000000..1177dfeac9 --- /dev/null +++ b/recipes/openobex/openobex-1.5/libusb_crosscompile_check.patch @@ -0,0 +1,11 @@ +--- /tmp/acinclude.m4 2009-04-12 10:32:15.000000000 +0200 ++++ openobex-1.5/acinclude.m4 2009-04-12 10:32:38.000000000 +0200 +@@ -158,7 +158,7 @@ + ;; + *) + PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no)) +- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb") ++ REQUIRES="libusb" + ;; + esac + AC_SUBST(USB_CFLAGS) diff --git a/recipes/openobex/openobex_1.5.bb b/recipes/openobex/openobex_1.5.bb new file mode 100644 index 0000000000..ab69cf18e9 --- /dev/null +++ b/recipes/openobex/openobex_1.5.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "The Openobex project is an open source implementation of the \ +Object Exchange (OBEX) protocol." +HOMEPAGE = "http://openobex.triq.net" +SECTION = "libs" +PROVIDES = "openobex-apps" +DEPENDS = "libusb-compat bluez4" +LICENSE = "GPL" + +SRC_URI = "http://www.kernel.org/pub/linux/bluetooth/openobex-${PV}.tar.gz \ + file://disable-cable-test.patch;patch=1 \ + file://libusb_crosscompile_check.patch;patch=1" + +inherit autotools_stage binconfig pkgconfig + +EXTRA_OECONF = "--enable-apps --enable-syslog --enable-dump \ + --with-usb=${STAGING_LIBDIR}/.. --with-bluez=${STAGING_LIBDIR}/.." + +PACKAGES += "openobex-apps" +FILES_${PN} = "${libdir}/lib*.so.*" +FILES_${PN}-dev += "${bindir}/openobex-config" +FILES_${PN}-apps = "${bindir}/*" +DEBIAN_NOAUTONAME_${PN}-apps = "1" |