Skip to contentSkip to conversation

connman: bump to version 1.25

PATCH New Jérôme Pouiller 2 participants 11 messages Sep 23, 2014 – Apr 4, 2015

lore
Share & tools
lore
#0 lore raw

PATCH 1/8 connman: bump to version 1.25

---
 package/connman/connman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/connman/connman.mk +1 -1
index 9b5d15f..e9ce1e6 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-CONNMAN_VERSION = 1.23
+CONNMAN_VERSION = 1.25
 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
 CONNMAN_DEPENDENCIES = libglib2 dbus iptables
Signature · 1 line
1.9.1
#1 lore raw

PATCH 2/8 simicsfs: bump to version 1.18

Fix support for kernel > 3.15

---
 package/simicsfs/simicsfs.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/simicsfs/simicsfs.mk +1 -1
index 3acd265..99dda84 100644
@@ -4,7 +4,7 @@
 #
 ###############################################################################
 
-SIMICSFS_VERSION = 1.17
+SIMICSFS_VERSION = 1.18
 SIMICSFS_SITE = http://download.simics.net/pub
 SIMICSFS_LICENSE = GPLv2+
 SIMICSFS_LICENSE_FILES = hostfs.h
Signature · 1 line
1.9.1
#2 lore raw

PATCH 3/8 valgrind: bump to version 3.10

In reply to Jérôme Pouiller

Patches status:

valgrind-0001-workaround-SIGSEGV-on-PPC: Don't know. In doubt, I
prefer to keep it.

valgrind-0002-don-t-enable-largefile-support-unconditionally-on-uC:
Seems still necessary

valgrind-0003-Add-replacement-for-a.out.h: Upstreamed

valgrind-0004-remove-default-mips-flags: Upstreamed

valgrind-0005-glibc-2.19: Upstream now support glibc up to 2.20

---
 .../valgrind-0001-workaround-SIGSEGV-on-PPC.patch  |  8 +-
 ...e-largefile-support-unconditionally-on-uC.patch | 14 ++--
 ...valgrind-0003-Add-replacement-for-a.out.h.patch | 58 --------------
 .../valgrind-0004-remove-default-mips-flags.patch  | 93 ----------------------
 package/valgrind/valgrind-0005-glibc-2.19.patch    | 32 --------
 package/valgrind/valgrind.mk                       |  2 +-
 6 files changed, 12 insertions(+), 195 deletions(-)
 delete mode 100644 package/valgrind/valgrind-0003-Add-replacement-for-a.out.h.patch
 delete mode 100644 package/valgrind/valgrind-0004-remove-default-mips-flags.patch
 delete mode 100644 package/valgrind/valgrind-0005-glibc-2.19.patch
package/valgrind/valgrind-0001-workaround-SIGSEGV-on-PPC.patch +4 -4
index 9e891be..1c5966b 100644
@@ -1,7 +1,7 @@
-From 872ade34d6af973ca88d5accd9e819216ecb94ba Mon Sep 17 00:00:00 2001
+From bd9d2af89e45081132c150e5e4bdf9a12dfca693 Mon Sep 17 00:00:00 2001
 From: Pierre Habouzit <[email protected]>
 Date: Tue, 10 May 2011 23:11:45 +0200
-Subject: [PATCH 1/3] workaround SIGSEGV on PPC.
+Subject: [PATCH 1/2] workaround SIGSEGV on PPC.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -13,7 +13,7 @@ Signed-off-by: J?r?me Pouiller <[email protected]>
  1 file changed, 4 insertions(+)
 
 diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c
-index 28a180e..8426551 100644
+index 42d8ce8..3c9900f 100644
 --- a/coregrind/m_machine.c
 +++ b/coregrind/m_machine.c
 @@ -27,6 +27,10 @@
@@ -28,5 +28,5 @@ index 28a180e..8426551 100644
  #include "pub_core_vki.h"
  #include "pub_core_libcsetjmp.h"   // setjmp facilities
 -- 
-1.8.3.2
+1.9.1
 
package/valgrind/valgrind-0002-don-t-enable-largefile-support-unconditionally-on-uC.patch +7 -7
index 1df318a..57ab2c3 100644
@@ -1,7 +1,7 @@
-From 271d855c0ad94a2ec164e20173257a06cd83288d Mon Sep 17 00:00:00 2001
+From 6bb94d51e25b394bc9c52699f744a7cc06ffca15 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Pouiller?= <[email protected]>
 Date: Thu, 2 Jan 2014 16:00:06 +0100
-Subject: [PATCH 2/3] don't enable largefile support unconditionally on uClibc
+Subject: [PATCH 2/2] don't enable largefile support unconditionally on uClibc
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -19,7 +19,7 @@ Signed-off-by: J?r?me Pouiller <[email protected]>
  3 files changed, 12 insertions(+)
 
 diff --git a/coregrind/m_initimg/initimg-linux.c b/coregrind/m_initimg/initimg-linux.c
-index 9bcc05c..ffee30f 100644
+index a8e7d27..fa670cb 100644
 --- a/coregrind/m_initimg/initimg-linux.c
 +++ b/coregrind/m_initimg/initimg-linux.c
 @@ -55,7 +55,11 @@
@@ -35,10 +35,10 @@ index 9bcc05c..ffee30f 100644
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
 diff --git a/coregrind/m_main.c b/coregrind/m_main.c
-index 35c11e1..0372946 100644
+index e7159a8..4371a1f 100644
 --- a/coregrind/m_main.c
 +++ b/coregrind/m_main.c
-@@ -2997,7 +2997,11 @@ asm(
+@@ -3143,7 +3143,11 @@ asm(
  
  /* --- !!! --- EXTERNAL HEADERS start --- !!! --- */
  #define _GNU_SOURCE
@@ -51,7 +51,7 @@ index 35c11e1..0372946 100644
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
 diff --git a/coregrind/m_ume/elf.c b/coregrind/m_ume/elf.c
-index b5b30e5..0766c74 100644
+index 4615da3..06992a4 100644
 --- a/coregrind/m_ume/elf.c
 +++ b/coregrind/m_ume/elf.c
 @@ -48,7 +48,11 @@
@@ -67,5 +67,5 @@ index b5b30e5..0766c74 100644
  #include <elf.h>
  /* --- !!! --- EXTERNAL HEADERS end --- !!! --- */
 -- 
-1.8.3.2
+1.9.1
 
package/valgrind/valgrind-0003-Add-replacement-for-a.out.h.patch deleted +0 -58

58 lines not on this page · raw message

package/valgrind/valgrind-0004-remove-default-mips-flags.patch deleted +0 -93

93 lines not on this page · raw message

package/valgrind/valgrind-0005-glibc-2.19.patch deleted +0 -32
deleted file mode 100644
index e386a79..0000000
@@ -1,32 +0,0 @@
-Enable valgrind for glibc 2.19 targets, and update the error from 2.17
-to 2.19 (which in reality was 2.18).
-Status: upstream.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
-
-diff -Nura valgrind-3.9.0.orig/configure.ac valgrind-3.9.0/configure.ac
---- valgrind-3.9.0.orig/configure.ac	2014-06-18 19:06:39.212571710 -0300
-+++ valgrind-3.9.0/configure.ac	2014-06-18 19:08:37.385557736 -0300
-@@ -918,6 +918,13 @@
- 	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
- 	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
- 	;;
-+     2.19)
-+        AC_MSG_RESULT(2.19 family)
-+	AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x])
-+	DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}"
-+	DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}"
-+	;;
-      darwin)
- 	AC_MSG_RESULT(Darwin)
- 	AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
-@@ -931,7 +938,7 @@
- 
-      *)
- 	AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}])
--	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.17])
-+	AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.19])
- 	AC_MSG_ERROR([or Darwin libc])
- 	;;
- esac
package/valgrind/valgrind.mk +1 -1
index aee7c9d..24d0290 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-VALGRIND_VERSION = 3.9.0
+VALGRIND_VERSION = 3.10.0
 VALGRIND_SITE    = http://valgrind.org/downloads
 VALGRIND_SOURCE  = valgrind-$(VALGRIND_VERSION).tar.bz2
 VALGRIND_LICENSE = GPLv2 GFDLv1.2
Signature · 1 line
1.9.1
#3 lore raw

PATCH 4/8 lttng-modules: bump to version 2.5.0

In reply to Jérôme Pouiller

This version should support kernel up to 3.15.

---
 package/lttng-modules/lttng-modules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/lttng-modules/lttng-modules.mk +1 -1
index 346214a..72d2eb7 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-LTTNG_MODULES_VERSION = 2.4.1
+LTTNG_MODULES_VERSION = 2.5.0
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
 LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for lib/bitfield.h and lib/prio_heap/*
Signature · 1 line
1.9.1
#4 lore raw

PATCH 4/8 lttng-modules: bump to version 2.5.0

Quoted 20 lines · On Tuesday 23 September 2014 11:45:43 J?r?me Pouiller wrote:

This version should support kernel up to 3.15.

---
 package/lttng-modules/lttng-modules.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/package/lttng-modules/lttng-modules.mk index 346214a..72d2eb7 100644

package/lttng-modules/lttng-modules.mk +1 -1
@@ -4,7 +4,7 @@
 #
 ###########################################################################
 #####
 
-LTTNG_MODULES_VERSION = 2.4.1
+LTTNG_MODULES_VERSION = 2.5.0
 LTTNG_MODULES_SITE    = http://lttng.org/files/lttng-modules
 LTTNG_MODULES_SOURCE  = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2
Quoted 2 lines

LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 for kernel modules; MIT for
lib/bitfield.h and lib/prio_heap/*

Oops, this patch would not have been in this serie. I have also to bump versions of other lttng packages.

Signature · 3 lines
J?r?me Pouiller, Sysmic
Embedded Linux specialist
http://www.sysmic.fr
#5 lore raw

PATCH 5/8 libseccomp: bump to version 2.1.1

In reply to Jérôme Pouiller

Version 1.0.0 was not compatible with systemd. With 1.0.0, systemd compilation produce:

src/shared/seccomp-util.c: In function 'seccomp_add_secondary_archs':
src/shared/seccomp-util.c:73:9: warning: implicit declaration of function 'seccomp_arch_add' [-Wimplicit-function-declaration]

         r = seccomp_arch_add(c, SCMP_ARCH_X86);
         ^
src/shared/seccomp-util.c:73:9: warning: nested extern declaration of 'seccomp_arch_add' [-Wnested-externs]
src/shared/seccomp-util.c:73:33: error: 'SCMP_ARCH_X86' undeclared (first use in this function)
         r = seccomp_arch_add(c, SCMP_ARCH_X86);
                                 ^
src/shared/seccomp-util.c:77:33: error: 'SCMP_ARCH_X86_64' undeclared (first use in this function)
         r = seccomp_arch_add(c, SCMP_ARCH_X86_64);
                                 ^
src/shared/seccomp-util.c:81:33: error: 'SCMP_ARCH_X32' undeclared (first use in this function)
         r = seccomp_arch_add(c, SCMP_ARCH_X32);
---
 package/libseccomp/libseccomp.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
package/libseccomp/libseccomp.mk +2 -2
index da1dadd..3002388 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-LIBSECCOMP_VERSION         = 1.0.0
-LIBSECCOMP_SITE            = http://downloads.sourceforge.net/project/libseccomp
+LIBSECCOMP_VERSION         = 2.1.1
+LIBSECCOMP_SITE            = http://downloads.sourceforge.net/project/libseccomp/libseccomp-$(LIBSECCOMP_VERSION)/
 LIBSECCOMP_LICENSE         = LGPLv2.1
 LIBSECCOMP_LICENSE_FILES   = LICENSE
 LIBSECCOMP_INSTALL_STAGING = YES
Signature · 1 line
1.9.1
#6 lore raw

PATCH 6/8 systemd: make libseccomp usage determinist

In reply to Jérôme Pouiller
---
 package/systemd/systemd.mk | 7 +++++++
 1 file changed, 7 insertions(+)
package/systemd/systemd.mk +7 -0
index 39b458e..c7cff0d 100644
@@ -76,6 +76,13 @@ else
 SYSTEMD_CONF_OPT += --disable-gudev
 endif
 
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+SYSTEMD_CONF_OPT += --enable-seccomp
+SYSTEMD_DEPENDENCIES += libseccomp
+else
+SYSTEMD_CONF_OPT += --disable-seccomp
+endif
+
 ifeq ($(BR2_PACKAGE_SYSTEMD_ALL_EXTRAS),y)
 SYSTEMD_DEPENDENCIES += \
 	xz 		\
Signature · 1 line
1.9.1
#7 lore raw

PATCH 7/8 libssh2: fix static link with libgcrypt

In reply to Jérôme Pouiller

BR call configure script with environment variable lt_cv_sys_lib_search_path_spec="" (see packages/Makefile.in). This prevent libtool to detect compiler builtin paths. Thus, in case where BR2_PREFER_STATIC_LIB is enabled, libtool does not find libgpg-error dependency:

/home/jezz/br-continuous/cfgs/31-x86_64-core2-uclibc-static/host/usr/i686-buildroot-linux-uclibc/sysroot/usr/lib/libgcrypt.a(rsa.o):
In function `run_selftests':
rsa.c:(.text+0xd2): undefined reference to `gpg_strerror'
rsa.c:(.text+0xfc): undefined reference to `gpg_strerror'

For this case, we may remove $lt_cv_sys_lib_search_path_spec from environment. However, it not easy to remove a variable from default environment. So, we prefer to pass a correct value.

---
 package/libssh2/libssh2.mk | 1 +
 1 file changed, 1 insertion(+)
package/libssh2/libssh2.mk +1 -0
index 50bd265..193714e 100644
@@ -10,6 +10,7 @@ LIBSSH2_LICENSE = BSD
 LIBSSH2_LICENSE_FILES = COPYING
 LIBSSH2_INSTALL_STAGING = YES
 LIBSSH2_CONF_OPT = --disable-examples-build
+LIBSSH2_CONF_ENV += lt_cv_sys_lib_search_path_spec="$(STAGING_DIR)/usr/lib"
 
 # libssh2 must use either libgcrypt or OpenSSL
 # Only select openssl if libgcrypt is not selected
Signature · 1 line
1.9.1
#8 lore raw

PATCH 7/8 libssh2: fix static link with libgcrypt

Dear J?r?me Pouiller,

Quoted 11 lines · J?r?me Pouiller

BR call configure script with environment variable lt_cv_sys_lib_search_path_spec="" (see packages/Makefile.in). This prevent libtool to detect compiler builtin paths. Thus, in case where BR2_PREFER_STATIC_LIB is enabled, libtool does not find libgpg-error dependency:

/home/jezz/br-continuous/cfgs/31-x86_64-core2-uclibc-static/host/usr/i686-buildroot-linux-uclibc/sysroot/usr/lib/libgcrypt.a(rsa.o):
In function `run_selftests':
rsa.c:(.text+0xd2): undefined reference to `gpg_strerror'
rsa.c:(.text+0xfc): undefined reference to `gpg_strerror'

Quoted 5 lines

For this case, we may remove $lt_cv_sys_lib_search_path_spec from environment. However, it not easy to remove a variable from default environment. So, we prefer to pass a correct value.

Since this patch, some other changes have been made to the libssh2 package, and it now links fine in a static configuration. I've marked this patch as Rejected in patchwork, then.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#9 lore raw

PATCH 8/8 directfb: disable multi application if no MMU

In reply to Jérôme Pouiller

directfb-fusion use madvise which is not available on no-MMU targets.

It seems it would be possible to simply remove call to madvise (there is only one call) if not available. However, since I am not sure, I prefer to completly disable directfb-fusion.

---
 package/directfb/Config.in | 1 +
 1 file changed, 1 insertion(+)
package/directfb/Config.in +1 -0
index d53f756..3aa51cb 100644
@@ -12,6 +12,7 @@ if BR2_PACKAGE_DIRECTFB
 config BR2_PACKAGE_DIRECTFB_MULTI
 	bool "directfb multi application"
 	select BR2_PACKAGE_LINUX_FUSION
+	depends on BR2_USE_MMU # madvise()
 	depends on BR2_LINUX_KERNEL
 	help
 	  Enable use of multiple concurrent DirectFB applications
Signature · 1 line
1.9.1
#10 lore raw

PATCH 1/8 connman: bump to version 1.25

In reply to Jérôme Pouiller

Dear J?r?me Pouiller,

Quoted 4 lines · J?r?me Pouiller
---
 package/connman/connman.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied patch 1, 2, 3, 5, 6 and 8 of your patch series.

Patch 4 you said yourself that it should be withdrawn, so I've marked it as Rejected in patchwork.

Patch 7 is a bit more complicated, so I'd like to give it some time for reviewers/testers to comment.

Thanks,

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com