Patchwork [v3,3/3] Add ofono package.

login
register
mail settings
Submitter Marek Belisko
Date April 1, 2012, 1:58 p.m.
Message ID <1333288729-22138-4-git-send-email-marek.belisko@open-nandra.com>
Download mbox | patch
Permalink /patch/149922/
State Accepted
Headers show

Comments

Marek Belisko - April 1, 2012, 1:58 p.m.
Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
---
 package/Config.in       |    1 +
 package/ofono/Config.in |   23 +++++++++++++++++++++++
 package/ofono/ofono.mk  |   30 ++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 0 deletions(-)
 create mode 100644 package/ofono/Config.in
 create mode 100644 package/ofono/ofono.mk
Peter Korsgaard - May 29, 2012, 7:58 a.m.
>>>>> "Marek" == Marek Belisko <marek.belisko@open-nandra.com> writes:

 Marek> Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>

Committed to next with minor changes (see below) - Thanks.

 Marek> ---
 Marek>  package/Config.in       |    1 +
 Marek>  package/ofono/Config.in |   23 +++++++++++++++++++++++
 Marek>  package/ofono/ofono.mk  |   30 ++++++++++++++++++++++++++++++
 Marek>  3 files changed, 54 insertions(+), 0 deletions(-)
 Marek>  create mode 100644 package/ofono/Config.in
 Marek>  create mode 100644 package/ofono/ofono.mk

 Marek> diff --git a/package/Config.in b/package/Config.in
 Marek> index cd41eb9..4dfbce4 100644
 Marek> --- a/package/Config.in
 Marek> +++ b/package/Config.in
 Marek> @@ -201,6 +201,7 @@ source "package/memtester/Config.in"
 Marek>  source "package/minicom/Config.in"
 Marek>  source "package/mtd/Config.in"
 Marek>  source "package/ntfs-3g/Config.in"
 Marek> +source "package/ofono/Config.in"
 Marek>  source "package/open2300/Config.in"
 Marek>  source "package/openocd/Config.in"
 Marek>  source "package/parted/Config.in"
 Marek> diff --git a/package/ofono/Config.in b/package/ofono/Config.in
 Marek> new file mode 100644
 Marek> index 0000000..437e860
 Marek> --- /dev/null
 Marek> +++ b/package/ofono/Config.in
 Marek> @@ -0,0 +1,23 @@
 Marek> +config BR2_PACKAGE_OFONO
 Marek> +	bool "ofono"
 Marek> +	depends on BR2_USE_WCHAR # gettext/libglib2
 Marek> +	select BR2_PACKAGE_LIBCAP_NG
 Marek> +	select BR2_PACKAGE_DBUS
 Marek> +	select BR2_PACKAGE_LIBGLIB2
 Marek> +	select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
 Marek> +	help
 Marek> +	  oFono is a free, open source project for mobile telephony
 Marek> +	  (GSM/UMTS) applications. It uses high-level D-Bus API for
 Marek> +	  use by telephony applications. It uses 3GPP standard.

You forgot to add upstream URL here.

 Marek> +
 Marek> +if BR2_PACKAGE_OFONO
 Marek> +
 Marek> +config BR2_PACKAGE_OFONO_BLUETOOTH
 Marek> +	bool "ofono with bluetooth support"
 Marek> +	select BR2_PACKAGE_BLUEZ_UTILS
 Marek> +	help
 Marek> +	  Enable bluetooth support.

I dropped this explicit option and just made it add bluetooth support if
bluez is enabled, similar to how it is done for udev (and how we
normally handle E.G. openssl).

 Marek> +endif
 Marek> +
 Marek> +comment "ofono requires a toolchain with WCHAR and C++ support"
 Marek> +	depends on !BR2_USE_WCHAR

It doesn't need C++ support.


 Marek> diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
 Marek> new file mode 100644
 Marek> index 0000000..7e35866
 Marek> --- /dev/null
 Marek> +++ b/package/ofono/ofono.mk
 Marek> @@ -0,0 +1,30 @@
 Marek> +#############################################################
 Marek> +#
 Marek> +# ofono
 Marek> +#
 Marek> +#############################################################
 Marek> +OFONO_VERSION = 1.5
 Marek> +OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 Marek> +
 Marek> +OFONO_DEPENDENCIES = host-pkg-config libglib2 dbus libcap-ng mobile-broadband-provider-info

I reformatted this line to be more readable.

 Marek> +
 Marek> +OFONO_CONF_OPT = --disable-test
 Marek> +
 Marek> +OFONO_AUTORECONF = YES

AUTORECONF is not needed when release tarballs are used.

 Marek> +
 Marek> +ifeq ($(BR2_PACKAGE_UDEV),y)
 Marek> +	OFONO_CONF_OPT += --enable-udev
 Marek> +	OFONO_DEPENDENCIES += udev
 Marek> +else
 Marek> +	OFONO_CONF_OPT += --disable-udev
 Marek> +endif
 Marek> +
 Marek> +ifeq ($(BR2_PACKAGE_OFONO_BLUETOOTH),y)
 Marek> +	OFONO_CONF_OPT += --enable-bluetooth
 Marek> +	OFONO_DEPENDENCIES += bluez_utils
 Marek> +else
 Marek> +	OFONO_CONF_OPT += --disable-bluetooth
 Marek> +endif
 Marek> +
 Marek> +$(eval $(call AUTOTARGETS))
 Marek> +

Please no empty lines after AUTOTARGETS.

Patch

diff --git a/package/Config.in b/package/Config.in
index cd41eb9..4dfbce4 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -201,6 +201,7 @@  source "package/memtester/Config.in"
 source "package/minicom/Config.in"
 source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
+source "package/ofono/Config.in"
 source "package/open2300/Config.in"
 source "package/openocd/Config.in"
 source "package/parted/Config.in"
diff --git a/package/ofono/Config.in b/package/ofono/Config.in
new file mode 100644
index 0000000..437e860
--- /dev/null
+++ b/package/ofono/Config.in
@@ -0,0 +1,23 @@ 
+config BR2_PACKAGE_OFONO
+	bool "ofono"
+	depends on BR2_USE_WCHAR # gettext/libglib2
+	select BR2_PACKAGE_LIBCAP_NG
+	select BR2_PACKAGE_DBUS
+	select BR2_PACKAGE_LIBGLIB2
+	select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO
+	help
+	  oFono is a free, open source project for mobile telephony
+	  (GSM/UMTS) applications. It uses high-level D-Bus API for
+	  use by telephony applications. It uses 3GPP standard.
+
+if BR2_PACKAGE_OFONO
+
+config BR2_PACKAGE_OFONO_BLUETOOTH
+	bool "ofono with bluetooth support"
+	select BR2_PACKAGE_BLUEZ_UTILS
+	help
+	  Enable bluetooth support.
+endif
+
+comment "ofono requires a toolchain with WCHAR and C++ support"
+	depends on !BR2_USE_WCHAR
diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
new file mode 100644
index 0000000..7e35866
--- /dev/null
+++ b/package/ofono/ofono.mk
@@ -0,0 +1,30 @@ 
+#############################################################
+#
+# ofono
+#
+#############################################################
+OFONO_VERSION = 1.5
+OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
+
+OFONO_DEPENDENCIES = host-pkg-config libglib2 dbus libcap-ng mobile-broadband-provider-info
+
+OFONO_CONF_OPT = --disable-test
+
+OFONO_AUTORECONF = YES
+
+ifeq ($(BR2_PACKAGE_UDEV),y)
+	OFONO_CONF_OPT += --enable-udev
+	OFONO_DEPENDENCIES += udev
+else
+	OFONO_CONF_OPT += --disable-udev
+endif
+
+ifeq ($(BR2_PACKAGE_OFONO_BLUETOOTH),y)
+	OFONO_CONF_OPT += --enable-bluetooth
+	OFONO_DEPENDENCIES += bluez_utils
+else
+	OFONO_CONF_OPT += --disable-bluetooth
+endif
+
+$(eval $(call AUTOTARGETS))
+