Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --cc Config.in.legacy
Simple merge

diff --cc package/avahi/avahi.mk
Simple merge

diff --cc package/erlang-rebar/erlang-rebar.mk
Simple merge

diff --cc package/linux-headers/Config.in.host
Simple merge

diff --cc package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
index 0000000000000000000000000000000000000000,3104644170f0d846d5a7f5179e96aa2138968d61..4d8d715568e13523cb56a09c60b50e67d32b78d1
mode 000000,100644..100644
--- /dev/null
--- 2/package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
+++ b/package/nodejs/5.6.0/0003-Use-a-python-variable-instead-of-hardcoding-Python.patch
@@@ -1,0 -1,101 +1,112 @@@
 -index c703155..06c0b2b 100644
+ From 4a48c65921b0f05b621aef5b902b6aa54811ad7a Mon Sep 17 00:00:00 2001
+ From: Martin Bark <martin@barkynet.com>
+ Date: Tue, 30 Jun 2015 09:44:33 +0100
+ Subject: [PATCH 3/4] Use a python variable instead of hardcoding Python
+ 
+ The nodejs build system uses python in a number of locations. However,
+ there are some locations where it hardcodes 'python' as the Python
+ interpreter. However, this causes problems when we need to use python2
+ instead of just python.
+ 
+ This patch fixes that by using the python variable already in place in
+ the nodejs build system.
+ 
+ Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ [Martin: adapt to 0.12.5]
+ Signed-off-by: Martin Bark <martin@barkynet.com>
+ [yann.morin.1998@free.fr: adapt to 4.1.2]
+ Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
++[Martin: adapt to 5.5.0]
++Signed-off-by: Martin Bark <martin@barkynet.com>
+ ---
+  deps/v8/tools/gyp/v8.gyp | 8 ++++----
+  1 file changed, 4 insertions(+), 4 deletions(-)
+ 
+ diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp
 -@@ -1696,14 +1696,14 @@
++index 1e5705d..e2e5dfe 100644
+ --- a/deps/v8/tools/gyp/v8.gyp
+ +++ b/deps/v8/tools/gyp/v8.gyp
 -@@ -1712,7 +1712,7 @@
++@@ -1723,14 +1723,14 @@
+                        '<(PRODUCT_DIR)/natives_blob_host.bin',
+                      ],
+                      'action': [
+ -                      'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
+ +                      '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob_host.bin'
+                      ],
+                    }, {
+                      'outputs': [
+                        '<(PRODUCT_DIR)/natives_blob.bin',
+                      ],
+                      'action': [
+ -                      'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
+ +                      '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
+                      ],
+                    }],
+                  ],
 -@@ -1812,7 +1812,7 @@
++@@ -1739,7 +1739,7 @@
+                    '<(PRODUCT_DIR)/natives_blob.bin',
+                  ],
+                  'action': [
+ -                  'python', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
+ +                  '<(python)', '<@(_inputs)', '<(PRODUCT_DIR)/natives_blob.bin'
+                  ],
+                }],
+              ],
 -@@ -1838,7 +1838,7 @@
++@@ -1847,7 +1847,7 @@
+              '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
+            ],
+            'action': [
+ -            'python',
+ +            '<(python)',
+              '../../tools/js2c.py',
+              '<(SHARED_INTERMEDIATE_DIR)/libraries.cc',
+              'CORE',
 -@@ -1863,7 +1863,7 @@
++@@ -1873,7 +1873,7 @@
+              '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
+            ],
+            'action': [
+ -            'python',
+ +            '<(python)',
+              '../../tools/js2c.py',
+              '<(SHARED_INTERMEDIATE_DIR)/experimental-libraries.cc',
+              'EXPERIMENTAL',
 -@@ -1900,7 +1900,7 @@
++@@ -1898,7 +1898,7 @@
++             '<(SHARED_INTERMEDIATE_DIR)/code-stub-libraries.cc',
++           ],
++           'action': [
++-            'python',
+++            '<(python)',
++             '../../tools/js2c.py',
++             '<(SHARED_INTERMEDIATE_DIR)/code-stub-libraries.cc',
++             'CODE_STUB',
++@@ -1923,7 +1923,7 @@
+              '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
+            ],
+            'action': [
+ -            'python',
+ +            '<(python)',
+              '../../tools/js2c.py',
+              '<(SHARED_INTERMEDIATE_DIR)/extras-libraries.cc',
+              'EXTRAS',
++@@ -1960,7 +1960,7 @@
+                '<(SHARED_INTERMEDIATE_DIR)/debug-support.cc',
+              ],
+              'action': [
+ -              'python',
+ +              '<(python)',
+                '../../tools/gen-postmortem-metadata.py',
+                '<@(_outputs)',
+                '<@(heapobject_files)'
+ diff --git a/deps/v8/build/toolchain.gypi b/deps/v8/build/toolchain.gypi
+ index c703155..06c0b2b 100644
+ --- a/deps/v8/build/toolchain.gypi
+ +++ b/deps/v8/build/toolchain.gypi
+ @@ -38,7 +38,7 @@
+      'ubsan%': 0,
+      'ubsan_vptr%': 0,
+      'v8_target_arch%': '<(target_arch)',
+ -    'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")',
+ +    'v8_host_byteorder%': '<!(<(python) -c "import sys; print sys.byteorder")',
+      # Native Client builds currently use the V8 ARM JIT and
+      # arm/simulator-arm.cc to defer the significant effort required
+      # for NaCl JIT support. The nacl_target_arch variable provides

diff --cc package/nodejs/Config.in
index 7324f6d7f40bd7ba11b66de16e60437c2b463f7f,bec0eee0b8b5fe2b98f9d48b45db669813636a49..7fe5b6f170a584cd9896ed67633cacfe38d576a5
--- 1/package/nodejs/Config.in
--- 2/package/nodejs/Config.in
+++ b/package/nodejs/Config.in
@@@ -43,8 -43,8 +43,8 @@@ config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPO
  
  config BR2_PACKAGE_NODEJS_VERSION_STRING
        string
-       default "5.5.0"         if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
+       default "5.6.0"         if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS
 -      default "0.10.41"
 +      default "0.10.42"
  
  menu "Module Selection"
  

diff --cc package/nodejs/nodejs.hash
index a3faa5a455648453aa678a3cfed8c26f06864971,ccad64890988f0a8ee2ebc14a4a278a9fa65dec2..e205ac39f38bdaf76a0ed15b3846fb068d6283f4
--- 1/package/nodejs/nodejs.hash
--- 2/package/nodejs/nodejs.hash
+++ b/package/nodejs/nodejs.hash
@@@ -1,5 -1,5 +1,5 @@@
 -# From upstream URL: http://nodejs.org/dist/v0.10.41/SHASUMS256.txt
 -sha256        79f694e2a5c42543b75d0c69f6860499d7593136d0f6b59e7163b9e66fb2c995  node-v0.10.41.tar.gz
 +# From upstream URL: http://nodejs.org/dist/v0.10.42/SHASUMS256.txt
 +sha256  9b4cc1b5bc397d80dfe217625b04bb6212a3b5a8b1e0eb36000a30d7ae567b8a  node-v0.10.42.tar.xz
  
- # From upstream URL: http://nodejs.org/dist/v5.5.0/SHASUMS256.txt
- sha256  9c46b4dc9548e43826f71f6571f56e39783c456b9516045b496ea73321731e22  node-v5.5.0.tar.xz
+ # From upstream URL: http://nodejs.org/dist/v5.6.0/SHASUMS256.txt
+ sha256  588341e466ac72f6b8e9fa500f04edf149f7d4e8141c4175c495d6d1484405e3  node-v5.6.0.tar.xz

diff --cc package/samba4/samba4.mk
Simple merge

diff --cc package/systemd/systemd.mk
Simple merge

diff --cc package/util-linux/Config.in
Simple merge

diff --cc package/util-linux/util-linux.mk
Simple merge

diff --cc package/xerces/xerces.mk
Simple merge