Patchwork ofono: bump to version 1.12

login
register
mail settings
Submitter Simon Dawson
Date April 13, 2013, 7:49 a.m.
Message ID <1365839373-19783-1-git-send-email-spdawson@gmail.com>
Download mbox | patch
Permalink /patch/236294/
State Superseded
Headers show

Comments

Simon Dawson - April 13, 2013, 7:49 a.m.
From: Simon Dawson <spdawson@gmail.com>

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 package/ofono/ofono.mk |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
Peter Korsgaard - April 13, 2013, 8:52 a.m.
>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:

 spdawson> From: Simon Dawson <spdawson@gmail.com>
 spdawson> Signed-off-by: Simon Dawson <spdawson@gmail.com>
 spdawson> ---
 spdawson>  package/ofono/ofono.mk |    8 +++++++-
 spdawson>  1 file changed, 7 insertions(+), 1 deletion(-)

 spdawson> diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
 spdawson> index e552eac..47228b5 100644
 spdawson> --- a/package/ofono/ofono.mk
 spdawson> +++ b/package/ofono/ofono.mk
 spdawson> @@ -3,7 +3,7 @@
 spdawson>  # ofono
 spdawson>  #
 spdawson>  #############################################################
 spdawson> -OFONO_VERSION = 1.7
 spdawson> +OFONO_VERSION = 1.12
 spdawson>  OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 spdawson>  OFONO_DEPENDENCIES = \
 spdawson>  	host-pkgconf \
 spdawson> @@ -14,6 +14,12 @@ OFONO_DEPENDENCIES = \
 
 spdawson>  OFONO_CONF_OPT = --disable-test
 
 spdawson> +# N.B. Qualcomm QMI modem support requires O_CLOEXEC, which
 spdawson> +# is not available on uClibc.
 spdawson> +ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
 spdawson> +	OFONO_CONF_OPT += --disable-qmimodem
 spdawson> +endif

It does actually, but it's only visible if you define _GNU_SOURCE:

E.G. the following works:

#define _GNU_SOURCE
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>

int main(void)
{
  int fd = open("blah", O_RDWR | O_CLOEXEC);
  return 0;
}
Simon Dawson - April 13, 2013, 5:42 p.m.
Hi Peter; thanks for the feedback.

On 13 April 2013 09:52, Peter Korsgaard <jacmet@uclibc.org> wrote:
> It does actually, but it's only visible if you define _GNU_SOURCE:

Ah; I had actually noticed that #ifdef block in the fcntl header, but
had failed to glean the significance. Thanks for the tip; I'll rework
my patch.

Simon.

Patch

diff --git a/package/ofono/ofono.mk b/package/ofono/ofono.mk
index e552eac..47228b5 100644
--- a/package/ofono/ofono.mk
+++ b/package/ofono/ofono.mk
@@ -3,7 +3,7 @@ 
 # ofono
 #
 #############################################################
-OFONO_VERSION = 1.7
+OFONO_VERSION = 1.12
 OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono
 OFONO_DEPENDENCIES = \
 	host-pkgconf \
@@ -14,6 +14,12 @@  OFONO_DEPENDENCIES = \
 
 OFONO_CONF_OPT = --disable-test
 
+# N.B. Qualcomm QMI modem support requires O_CLOEXEC, which
+# is not available on uClibc.
+ifeq ($(BR2_TOOLCHAIN_BUILDROOT)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_CTNG_uClibc),y)
+	OFONO_CONF_OPT += --disable-qmimodem
+endif
+
 ifeq ($(BR2_PACKAGE_UDEV),y)
 	OFONO_CONF_OPT += --enable-udev
 	OFONO_DEPENDENCIES += udev