]> rtime.felk.cvut.cz Git - coffee/buildroot.git/log
coffee/buildroot.git
5 years agobusybox: S10mdev: fix module autoloading 2018.02.x origin/2018.02.x
Peter Korsgaard [Mon, 7 May 2018 18:35:01 +0000 (20:35 +0200)]
busybox: S10mdev: fix module autoloading

Commit b4fc5a180c (package/busybox: support spaces in module aliases in
mdev) changed the mdev coldplugging to handle sysfs path elements and
modalias values containing spaces.  This unfortunately doesn't work as was
recently reported:

http://lists.busybox.net/pipermail/buildroot/2018-May/220903.html

The problem is that sort -z also expects the fields of the input files to be
zero terminated, which is not the case for modalias sysfs entries.

So drop the -z option to sort.  Spaces in modalias entries could be handled
with the xargs -d '\n' option, but that is unfortunately not supported by
the busybox applet.  Instead, use tr to convert newlines to zeros so we can
use xargs -0.

Reported-by: Daniel Palmer <daniel@0x0f.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 61717b7b3ef9c6c39f4adcbbb5dced3096f0ed08)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agobinutils: replace hard-links with soft-links to fix rpath
Thomas Petazzoni [Sun, 22 Apr 2018 12:23:50 +0000 (14:23 +0200)]
binutils: replace hard-links with soft-links to fix rpath

binutils installs its binaries both as bin/<tuple>-<tool> and as
<tuple>/bin/<tool>, and hardlinks are used to reduce disk space
consumption. This causes a problem for host-binutils with our rpath
fixing logic done by "make sdk".

Indeed, the fix-rpath script starts by fixing up the rpath of
bin/<tuple>-<tool>, and sets the RPATH to $ORIGIN/../lib/. Then
fix-rpath moves on to <tuple>/bin/<tool>, and doesn't find the library
the tool depends on, and clears the RPATH. The result is that the
binutils tool are not usable.

Note that this is only visible currently on the ARC architecture,
because on this architecture, binutils is fetched from git, which
causes host-flex to be built, and some binutils tools to use the libfl
shared library. Therefore, the binutils tools don't use just the
standard C library (which is provided by the system) but also libfl
from $(HOST_DIR)/lib, and therefore if the RPATH isn't set correctly,
those tools don't work properly.

In order to address this, this comit adds a post-install hook to
host-binutils that replaces those hard links by symbolic links. It is
worth mentioning that library loading and RPATH usage occurs *after*
resolving the symbolic links, which makes this solution work.

Fixes:

  http://autobuild.buildroot.net/results/b2562b05d397d4e1ffe0f8d2f4ce4c84ab6feae1/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit f9cffb6af464c5c049daa93d557e485ea61f14a8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years ago.gitlab-ci.yml: update after removal of freescale defconfigs
Peter Korsgaard [Sun, 6 May 2018 15:36:37 +0000 (17:36 +0200)]
.gitlab-ci.yml: update after removal of freescale defconfigs

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit e607881f201337198a0bb2d69c5c8507a1ebfde9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agolinux: ensure correct make targets are used for cuImage/simpleImage.<dtb>
Peter Korsgaard [Sun, 6 May 2018 06:34:18 +0000 (08:34 +0200)]
linux: ensure correct make targets are used for cuImage/simpleImage.<dtb>

Fixes https://gitlab.com/buildroot.org/buildroot/-/jobs/66561794

LINUX_DTS_NAME may end up with a leading space because of the += logic, and
may contain multiple dts files - Neither of which works when we construct
the {cu,simple}Image.$(LINUX_DTS_NAME) make target name.

Fix it by using the first word in the variable.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 978a997c81f41702bc039f89a20129ef65060801)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agopackage/patch: fix xattr option
Yann E. MORIN [Sun, 6 May 2018 11:57:51 +0000 (13:57 +0200)]
package/patch: fix xattr option

The name of the configure option is, and has always been,
 --enable-xattr, not --enable-attr. Otherwise, configure
whines:
    configure: WARNING: unrecognized options: --enable-attr

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 990fff065c915ecce1196adc283252f8d192d54a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agolog4cplus: fix license
Fabrice Fontaine [Fri, 4 May 2018 11:26:08 +0000 (13:26 +0200)]
log4cplus: fix license

Some files of log4cplus are licensed under BSD-2-Clause as stated in
LICENSE file: "Each file of log4cplus source is licensed using either
two clause BSD license or Apache license 2.0."

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 6f5a29e502b0245a3225485b34d6d8525b7b5fb6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agoebtables: drop obsolete comment
Baruch Siach [Fri, 4 May 2018 09:31:44 +0000 (12:31 +0300)]
ebtables: drop obsolete comment

Commit 30c4b5843f (ebtables: enable for musl) enabled musl build, but
forgot to remove the comment text. Fix that.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit ca2a6f04edebb5cd333c39fe15d3b498e4458411)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agoconfigs/freescale_imx6ulevk: Remove target
Fabio Estevam [Sat, 5 May 2018 23:12:24 +0000 (20:12 -0300)]
configs/freescale_imx6ulevk: Remove target

Currently this target fails to build:

./scripts/dtc-version.sh: line 17: dtc: command not found
./scripts/dtc-version.sh: line 18: dtc: command not found
*** Your dtc is too old, please upgrade to dtc 1.4 or newer

Even though the fix for this build failure is easy, I prefer to
maintain only imx6ulevk_defconfig, which is a target for the
same board, but uses mainline kernel and U-Boot versions instead.

Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/66561695
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit f24f0ca7772d4cf8196f6b56a9572a6850adbe68)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agoconfigs/freescale_imx31_3stack: Remove target
Fabio Estevam [Sat, 5 May 2018 23:12:23 +0000 (20:12 -0300)]
configs/freescale_imx31_3stack: Remove target

Currently this target fails to build:

arch/arm/mach-imx/built-in.o: In function `init_mmdc_lpddr2_settings':
platform-spi_imx.c:(.text+0x8f18): undefined reference to `imx6sll_lpddr2_freq_change'
arch/arm/mach-imx/built-in.o: In function `imx6ul_cpuidle_init':
platform-spi_imx.c:(.init.text+0x195c): undefined reference to `mx6ull_lpm_wfi_end'
platform-spi_imx.c:(.init.text+0x1960): undefined reference to `mx6ull_lpm_wfi_start'
platform-spi_imx.c:(.init.text+0x1964): undefined reference to `imx6ull_low_power_idle'
arch/arm/mach-imx/built-in.o: In function `imx6sl_init_late':
platform-spi_imx.c:(.init.text+0x56f0): undefined reference to `imx6sll_cpuidle_init'
Makefile:969: recipe for target 'vmlinux' failed

NXP 4.9 kernel does not properly support mx31, so better remove this target.

mx31_3stack board is currently supported in U-Boot and kernel mainline,
so if someone is interested on this board, then a target can be introduced
later which uses these mainline components.

Currently I do not have access to this board, so remove it its defconfig
for now.

Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/66561688
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit ed947dce162dca71d47abda61861d2080469197c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agoconfigs/freescale_imx6sololiteevk: Remove target
Fabio Estevam [Sat, 5 May 2018 23:12:22 +0000 (20:12 -0300)]
configs/freescale_imx6sololiteevk: Remove target

Currently this target fails to build:

Error: No BOOT_FROM tag in board/freescale/mx6slevk/imximage.cfg.cfgtmp
arch/arm/imx-common/Makefile:91: recipe for target 'u-boot-dtb.imx' failed

This problem has been already solved in upstream U-Boot, but not
on NXP version of U-Boot.

To avoid the maintainance burden of keeping two defconfigs for the
same board, remove freescale_imx6sololiteevk_defconfig in favor
of imx6slevk_defconfig, which uses U-Boot and kernel mainline.

Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/66561693
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit c41576cad1230fa233af748ba4526866b26a3c49)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agonasm: Fix compilation with GCC 8
Carlos Santos [Sat, 5 May 2018 02:34:28 +0000 (23:34 -0300)]
nasm: Fix compilation with GCC 8

host-nasm fails to compile with GCC 8:

In file included from ./include/nasm.h:46,
                 from asm/nasm.c:47:
./include/nasmlib.h:194:1: error: ‘pure’ attribute on function returning ‘void’ [-Werror=attributes]
 void pure_func seg_init(void);
 ^~~~

Pull a patch from upstream that removes the stale declaration of
seg_init, which was eliminated a long time ago.

Signed-off-by: Carlos Santos <casantos@datacom.ind.br>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 3aa64a0e828eca3669cbd1fa3fb9fef69dacf74e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agopackage/nasm: bump version to 2.13.03
Bernd Kuhls [Thu, 1 Mar 2018 20:09:53 +0000 (21:09 +0100)]
package/nasm: bump version to 2.13.03

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit ee8d397a25dd7dfadeb74522336a9c5e990db454)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agogst1-plugins-bad: fix typo preventing use of the netsim plugin
Danomi Manchego [Sun, 20 May 2018 17:11:14 +0000 (13:11 -0400)]
gst1-plugins-bad: fix typo preventing use of the netsim plugin

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 384c1559c08ee4ffd46a0ea2f8df07b9dcd5effa)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agogst1-plugins-bad: update plugin licenses
Danomi Manchego [Mon, 14 May 2018 02:12:08 +0000 (22:12 -0400)]
gst1-plugins-bad: update plugin licenses

Update several of the licenses annotated in the gst1-plugins-bad.mk file.

1. Specify GPL-2.0 in license info.
* All of the *.[ch] that specify GPL also specify version 2 or later.

2. Remove GPL from audiovisualizers.
* Changlog notes move from GPL to LGPL. (2015-04-25)
* docs/plugins/inspect/plugin-audiovisualizers.xml claims "LGPL".
* All *.[ch] files under ./gst/audiovisualizers say "GNU Library General Public License".

3. Add GPL to yadif.
* Changelog notes that yadif is "GPL". (2013-02-07)
* docs/plugins/inspect/plugin-yadif.xml claims "GPL".
* All *.[ch] files under ./gst/yadif say "GNU General Public License" except for one "GNU Library General Public License".

4. Remove UNKNOWN from fdk_aac.
* docs/plugins/inspect/plugin-fdkaac.xml claims "LGPL".
* All *.[ch] files under ./ext/fdkaac say "GNU Lesser" or "GNU Library General Public License".

5. Add BSD-2c to dtls.
* docs/plugins/inspect/plugin-dtls.xml claims "BSD".
* All *.[ch] files under ./gst/dtls have BSD-2c text.

6. Add BSD-2c to openh264.
* Changelog notes that openh264 is "BSD-2". (2014-10-03)
* docs/plugins/inspect/plugin-openh264.xml claims "BSD".
* All *.[ch] files under ./ext/openh264 have BSD-2c text.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 34f256a9da690f66f8064a517564028b3be220f6)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agogst1-plugins-bad: rework license type construction
Danomi Manchego [Sun, 6 May 2018 19:04:02 +0000 (15:04 -0400)]
gst1-plugins-bad: rework license type construction

Use "GST1_PLUGINS_BAD_LICENSE := $(GST1_PLUGINS_BAD_LICENSE), xxxx" construct
so that the list of licenses is presented as a comma-separated list.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 782deb7a4db68229fa38489ac598f312e4a4df49)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agogst1-plugins-bad: conditionally add gpl license
Danomi Manchego [Thu, 12 Apr 2018 03:02:10 +0000 (23:02 -0400)]
gst1-plugins-bad: conditionally add gpl license

Currently, GST1_PLUGINS_BAD_LICENSE_FILES starts out set to
both the GPL COPYING file and the LGPL COPYING.LIB file, but
the GST1_PLUGINS_BAD_LICENSE handling only claims LGPL, and
then intelligently adds GPL if needed.  This change moves the
GPL file addition to the same conditional clause so that the
GPL file is included in the legal-info location only if GPL
code is actually used.

Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 2bbb6b800143b87608cc68351036ae4ccf649c1b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years ago.gitlab-ci.yml: use image with flake8
Ricardo Martincoski [Fri, 30 Mar 2018 23:10:55 +0000 (20:10 -0300)]
.gitlab-ci.yml: use image with flake8

Bump the docker image to the latest tag to have flake8 pre-installed.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@gmail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Peter Korsgaard <peter@korsgaard.com>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 12b08c2be639e26ba0983d7dbdb3bddd91355f4c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agoUpdate for 2018.02.2 2018.02.2
Peter Korsgaard [Fri, 4 May 2018 16:24:30 +0000 (18:24 +0200)]
Update for 2018.02.2

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agoMakefile: Update mtime of $(TARGET_DIR)/usr in target-finalize
Chris Lesiak [Mon, 30 Apr 2018 17:14:11 +0000 (12:14 -0500)]
Makefile: Update mtime of $(TARGET_DIR)/usr in target-finalize

The systemd ConditionNeedsUpdate option is useful when offline updates
of the vendor operating system resources in /usr require updating of
/etc or /var on the next following boot.

Two examples of services making use of this option are
systemd-hwdb-update.service and systemd-sysusers.service.

ConditionNeedsUpdate=/etc will be true if the mtime of /etc/.updated
is older than the mtime of /usr.  After services conditional on
ConditionNeedsUpdate have run, systemd-update-done.service will
synch the mtime of /usr to /etc/.updated so that the condition will
be false on subsequent boots.

For systems with writable /usr partitions where updates are done to
the running system, the update program will touch /usr as a final step.
But with Buildroot, where updates are often done by dumping a new
image onto the device, and where /usr is on a filesystem mounted
read-only, touching /usr as part of the update process is not practical.
Instead, it should be done a build time.

For testers, please note that systemd-update-done in v234 added a
regression where the mtime of /etc/.updated is set to the current time
instead of the mtime or /usr.  This will be fixed in v239.

For more details, see:
http://0pointer.de/public/systemd-man/systemd.unit.html
http://0pointer.de/public/systemd-man/systemd-update-done.service.html

Signed-off-by: Chris Lesiak <chris.lesiak@licor.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit bbe5c6dad4da9cd174d5ef21caa73557e4592b31)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agohost-mkpasswd: fix crash on Fedora 28 build host
Stefan Becker [Wed, 2 May 2018 09:05:08 +0000 (12:05 +0300)]
host-mkpasswd: fix crash on Fedora 28 build host

crypt() is an optional glibc feature. Some distros, like Fedora 28, are
phasing it out to be replaced with libxcrypt [1]. Unfortunately this
change is only ABI compatible, not source code compatible, i.e. the code
will compile with warnings about undefined crypt(), but the resulting
binary will crash.

Follow the guidance in the Fedora bug and include crypt.h when
_XOPEN_CRYPT is not defined.

[1] https://bugzilla.redhat.com/show_bug.cgi?id=1566464

Signed-off-by: Stefan Becker <chemobejk@gmail.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 3c514c2dc5186c4357b2c0fc2e1c4b47e0f555c7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
5 years agolinux-headers: bump 4.{4, 9, 14, 16}.x series
Fabio Estevam [Wed, 2 May 2018 19:24:12 +0000 (16:24 -0300)]
linux-headers: bump 4.{4, 9, 14, 16}.x series

[Peter: drop 4.16.x change]
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit c3cce05ac772e7803c81a8e8cb7fdcc1c21129cb)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/python: add upstream GCC8 build fix
Stefan Becker [Wed, 2 May 2018 11:14:48 +0000 (14:14 +0300)]
package/python: add upstream GCC8 build fix

Fedora 28 switched to GCC8.

Signed-off-by: Stefan Becker <chemobejk@gmail.com>
[Thomas: fixup location of SoB in the patch.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit a1b7f5e64d392a802adb586b97deea0a6f4f500e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoConfig.in: add BR2_HOST_GCC_AT_LEAST_8
Stefan Becker [Wed, 2 May 2018 10:09:04 +0000 (13:09 +0300)]
Config.in: add BR2_HOST_GCC_AT_LEAST_8

Fedora 28 switched to GCC 8.x.

Signed-off-by: Stefan Becker <chemobejk@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit e13ab2e04a300f332d80f9b81c8830df07e3fd61)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agocore/pkg-generic: only save latest package list
John Keeping [Tue, 1 May 2018 12:28:41 +0000 (13:28 +0100)]
core/pkg-generic: only save latest package list

When rebuilding a package, simply appending the package's file list to
the global list means that the package list grows for every rebuild, as
does the time taken to check for files installed by multiple packages.
Furthermore, we get false positives where a file is reported as being
installed by multiple copies of the same package.

With this approach we may end up with orphaned files in the target
filesystem if a package that has been updated and rebuilt no longer
installs the same set of files, but we know that only a clean build will
produce reliable results.  In fact it may be helpful to identify these
orphaned files as evidence that the build is not clean.

Signed-off-by: John Keeping <john@metanate.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit d3dca1e9936bcaa0eed226a5bcb8c6a4d1fd1472)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.{9, 14, 16}.x series
Fabio Estevam [Mon, 30 Apr 2018 22:21:20 +0000 (19:21 -0300)]
linux-headers: bump 4.{9, 14, 16}.x series

[Peter: drop 4.16.x change]
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 1b503923497837e48e713b8deb8c3e06a11c9344)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agobluez5_utils: add patch to fix readline issue
Thomas Petazzoni [Fri, 20 Apr 2018 14:07:13 +0000 (16:07 +0200)]
bluez5_utils: add patch to fix readline issue

Since bluez5_utils 5.48, some code using readline was compiled even if
readline was not available. After this issue was reported upstream, a
patch was proposed by an upstream developer to address the issue. This
commit integrates this patch (under review upstream), which fixes the
problem.

Fixes:

  http://autobuild.buildroot.net/results/3e266a79acab8b8eb33360f7afbc1cd6db46f7cb/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit d4158df6c19c76ea3405975b87f13b1c092a40e0)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosdl2: update license file hash
Baruch Siach [Mon, 30 Apr 2018 18:28:47 +0000 (21:28 +0300)]
sdl2: update license file hash

Copyright year update.

Fixes:
http://autobuild.buildroot.net/results/2c8/2c865463a4b7524114518c04dce9c94252433460/

Cc: Guillaume Gardet <guillaume.gardet@oliseo.fr>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 5a8f887e7ab6c28b2d5a4c01266bc75943cea90c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosdl2_image: security bump to version 2.0.3
Peter Korsgaard [Mon, 30 Apr 2018 12:04:59 +0000 (14:04 +0200)]
sdl2_image: security bump to version 2.0.3

Fixes the following security issues:

CVE-2017-12122: An exploitable code execution vulnerability exists in the
ILBM image rendering functionality of SDL2_image-2.0.2.  A specially crafted
ILBM image can cause a heap overflow resulting in code execution.  An
attacker can display a specially crafted image to trigger this
vulnerability.

CVE-2017-14440: An exploitable code execution vulnerability exists in the
ILBM image rendering functionality of SDL2_image-2.0.2.  A specially crafted
ILBM image can cause a stack overflow resulting in code execution.  An
attacker can display a specially crafted image to trigger this
vulnerability.

CVE-2017-14441: An exploitable code execution vulnerability exists in the
ICO image rendering functionality of SDL2_image-2.0.2.  A specially crafted
ICO image can cause an integer overflow, cascading to a heap overflow
resulting in code execution.  An attacker can display a specially crafted
image to trigger this vulnerability.

CVE-2017-14442: An exploitable code execution vulnerability exists in the
BMP image rendering functionality of SDL2_image-2.0.2.  A specially crafted
BMP image can cause a stack overflow resulting in code execution.  An
attacker can display a specially crafted image to trigger this
vulnerability.

CVE-2017-14448: An exploitable code execution vulnerability exists in the
XCF image rendering functionality of SDL2_image-2.0.2.  A specially crafted
XCF image can cause a heap overflow resulting in code execution.  An
attacker can display a specially crafted image to trigger this
vulnerability.

CVE-2017-14449: A double-Free vulnerability exists in the XCF image
rendering functionality of SDL2_image-2.0.2.  A specially crafted XCF image
can cause a Double-Free situation to occur.  An attacker can display a
specially crafted image to trigger this vulnerability.

CVE-2017-14450: A buffer overflow vulnerability exists in the GIF image
parsing functionality of SDL2_image-2.0.2.  A specially crafted GIF image
can lead to a buffer overflow on a global section.  An attacker can display
an image to trigger this vulnerability.

For details, see the announcement:

https://discourse.libsdl.org/t/sdl-image-2-0-3-released/23958

Also add a hash for the license file while we're at it.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 5fb8fbbb3e776a186731ae929244a82ea2db1878)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosdl2: bump version to 2.0.8
Peter Korsgaard [Mon, 30 Apr 2018 12:04:58 +0000 (14:04 +0200)]
sdl2: bump version to 2.0.8

Drop now upstreamed patch.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f26654596ecfe40963cb51ba939c00de458fa82e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/python-requests: needs hashlib for python 2
Sven Haardiek [Sun, 29 Apr 2018 12:53:39 +0000 (14:53 +0200)]
package/python-requests: needs hashlib for python 2

Requests need hashlib to run with Python 2. Otherwise it is not possible to
import, due to missing e.g. md5.

[Peter: tweak commit message]
Signed-off-by: Sven Haardiek <sven.haardiek@iotec-gmbh.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 2c2f6f6630294fa256a4f66db5a4ab1f920b0a65)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolibtomcrypt: fix headers installation path
Baruch Siach [Sun, 29 Apr 2018 18:29:52 +0000 (21:29 +0300)]
libtomcrypt: fix headers installation path

libtomcrypt installs its headers by default in /usr/local/include under
the staging sysroot. This path is not in the default search patch of
some toolchains. This breaks the build of dropbear. Set the PREFIX make
variable to fix that.

While at it, split the long install command for better readability.

Fixes (dropbear):
http://autobuild.buildroot.net/results/215/2157679e276623ae875d1b31f3e5a68caf586536/
http://autobuild.buildroot.net/results/956/956d254675e6500c19c3bb7ccdf12ce136858720/
http://autobuild.buildroot.net/results/01e/01ec89a81c4ec6e36e2f81b5a9394050a91df654/

Cc: Francois Perrad <francois.perrad@gadz.org>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 73e1f9b0a46ccf55419f43c35ca762a8fdc3b32c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.4.x series
Bernd Kuhls [Sun, 29 Apr 2018 07:17:22 +0000 (09:17 +0200)]
linux-headers: bump 4.4.x series

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 5772a14d0bdd93a144672685c84951e9497b746e)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosupport/testing: set $USER in rust tests
Eric Le Bihan [Sat, 28 Apr 2018 22:14:13 +0000 (00:14 +0200)]
support/testing: set $USER in rust tests

When the run-time tests to build rust and rust-bin packages are run via Docker,
the $USER environment variable is not set, which makes cargo fail when
initializing the test project.

So add it to make cargo happy.

Signed-off-by: Eric Le Bihan <eric.le.bihan.dev@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 09a5eb427a6d9160e74ab56941640c02334eabf1)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopython-watchdog: add missing runtime dependency
Yegor Yefremov [Fri, 16 Feb 2018 13:32:01 +0000 (14:32 +0100)]
python-watchdog: add missing runtime dependency

Script watchmedo requires python-setuptools.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 7a801da8eaa0f4c45d20519afd6d653c2ed76248)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopython-watchdog: add support for uClibc
Yegor Yefremov [Fri, 16 Feb 2018 13:32:00 +0000 (14:32 +0100)]
python-watchdog: add support for uClibc

This patch fixes uClibc detection.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 13d946cbdfcc3e2b3ed2eb11b612e381ea7053b2)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolibcgi: add license file (with its hash)
Fabrice Fontaine [Sat, 28 Apr 2018 12:26:27 +0000 (14:26 +0200)]
libcgi: add license file (with its hash)

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit b3d74f04a8df1bd0a23ab1ca18f3224ebc90cc4f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/php: security bump to version 7.2.5
Bernd Kuhls [Sat, 28 Apr 2018 09:57:35 +0000 (11:57 +0200)]
package/php: security bump to version 7.2.5

Changelog: http://www.php.net/ChangeLog-7.php#7.2.5

This release fixes several security-related bugs for which no CVE id's
are assigned at the time of writing:

https://bugs.php.net/bug.php?id=76129
https://bugs.php.net/bug.php?id=76130
https://bugs.php.net/bug.php?id=76248
https://bugs.php.net/bug.php?id=76249

Removed patch 0008, applied upstream:
https://github.com/php/php-src/commit/2842aa2a078eb1cad55540b61e7edf111395150d

Re-numbered patch 0009 -> 0008.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit e14dc96df9998f35879854c60e61bcb898423900)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/gdb: don't remove support files if python chosen
Jonas Zaddach [Tue, 10 Apr 2018 19:37:22 +0000 (12:37 -0700)]
package/gdb: don't remove support files if python chosen

If one wants to use GDB with python support on the target, you need the support
files installed by GDB. These get usually deleted to save some space, so I just
wrapped the Makefile code deleting them in a conditional block depending on if
python support is active or not.

Signed-off-by: Jonas Zaddach <jzaddach@cisco.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[Thomas:
 - use positive logic "if python is disabled"
 - put the comment inside the condition, as suggested by Arnout]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit fa5ca6974d2504dccc35f43dcabcf30f076d8685)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/flann: fix build with cmake >= 3.11
Romain Naour [Wed, 25 Apr 2018 21:17:49 +0000 (23:17 +0200)]
package/flann: fix build with cmake >= 3.11

CMake < 3.11 doesn't support add_library() without any source file
(i.e add_library(foo SHARED)). But flann CMake use a trick that use
an empty string "" as source list (i.e add_library(foo SHARED "")).
This look like a bug in CMake < 3.11.

With CMake >= 3.11, the new behaviour of add_library() break the
existing flann CMake code.

>From CMake Changelog [1]:
"add_library() and add_executable() commands can now be called without
 any sources and will not complain as long as sources are added later
 via the target_sources() command."

Note: flann CMake code doesn't use target_sources() since no source file
are provided intentionally since the flann shared library is created by
linking with the flann_cpp_s static library with this line:

target_link_libraries(flann_cpp -Wl,-whole-archive flann_cpp_s -Wl,-no-whole-archive)

If you try to use "add_library(flann_cpp SHARED ${CPP_SOURCES})" (as it should
be normally done), the link fail due to already defined symbol.

They are building the shared version using the static library "to speedup the
build time" [3]

This issue is already reported upstream [2] with a proposed solution.

Fixes:
http://autobuild.buildroot.net/results/b2f/b2febfaf8c44ce477b3e4a5b9b976fd25e8d7454

[1] https://cmake.org/cmake/help/v3.11/release/3.11.html
[2] https://github.com/mariusmuja/flann/issues/369
[3] https://github.com/mariusmuja/flann/commit/0fd62b43be2fbb0b8d791ee36290791224dc030c

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Davide Viti <zinosat@tiscali.it>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 0c469478f64d0ddaf72c0622a1830d855306d51c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.{14, 16}.x series
Fabio Estevam [Thu, 26 Apr 2018 18:39:10 +0000 (15:39 -0300)]
linux-headers: bump 4.{14, 16}.x series

[Peter: drop 4.16.x change]
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit c43b3635cbc4e960cdfd98b53c59dd8bf2cbf67d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agowireguard: bump to version 0.0.20180420
Jason A. Donenfeld [Mon, 23 Apr 2018 21:28:28 +0000 (23:28 +0200)]
wireguard: bump to version 0.0.20180420

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 062dcceed0ba0d2b1929597ad9b0393dbdb21628)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agowireguard: bump version to 0.0.20180304
Peter Korsgaard [Tue, 13 Mar 2018 06:21:45 +0000 (07:21 +0100)]
wireguard: bump version to 0.0.20180304

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 54e210522faf7dff3e68e22bb802102f891098c8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolibgpg-error: bump to version 1.29
Baruch Siach [Tue, 17 Apr 2018 09:37:13 +0000 (12:37 +0300)]
libgpg-error: bump to version 1.29

Drop upstream patch.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 4a92ee34daaf1515a048ce5ae59d9d4c6939de39)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolibgpg-error: bump to version 1.28
Baruch Siach [Mon, 26 Mar 2018 19:46:14 +0000 (22:46 +0300)]
libgpg-error: bump to version 1.28

Add upstream patch fixing arm/arm64 targets build failure.

Use the smaller bz2 compressed tarball.

Switch _SITE to https for better security and corporate firewall
compatibility.

Add license files hash.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 692d191c8b0b3c86022e6a6ba3bd2d8f53b39f03)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agognupg2: security bump to version 2.2.6
Baruch Siach [Tue, 17 Apr 2018 09:37:12 +0000 (12:37 +0300)]
gnupg2: security bump to version 2.2.6

Fixes CVE-2018-9234: Unenforced configuration allows for apparently
valid certifications actually signed by signing subkeys.

Remove --disable-doc from configure options. We pass this options to all
autotools packages.

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 3db93884a442f6d0742ada5d8ed7818e24223ace)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agognupg2: bump to version 2.2.5
Baruch Siach [Wed, 28 Feb 2018 19:00:28 +0000 (21:00 +0200)]
gnupg2: bump to version 2.2.5

Cc: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 379c34739082f3906ccf4877b85a2e714606bffe)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolibgpgme: fix run-time compatibility with gnupg2 2.2.6
Baruch Siach [Tue, 17 Apr 2018 09:37:11 +0000 (12:37 +0300)]
libgpgme: fix run-time compatibility with gnupg2 2.2.6

Add upstream patch fixing gpgme_op_verify regression with gnupg2 2.2.6.

https://lists.gnupg.org/pipermail/gnupg-users/2018-April/060230.html

Cc: Philipp Claves <claves@budelmann-elektronik.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 5be60127e559d80daf27eea2248f206f9ac6d69c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosupport/testing: fix Marvell ATF source code
Thomas Petazzoni [Mon, 23 Apr 2018 19:59:54 +0000 (21:59 +0200)]
support/testing: fix Marvell ATF source code

The version of the ARM Trusted Firmware from Marvell was a Git branch,
not a Git commit, leading to unreproducible results. So let's use a
Git commit instead, which is the latest available from the branch that
was previously used.

More specifically, this branch has recently seen a fix that is needed
for ATF to build properly with recent gcc versions:

  https://github.com/MarvellEmbeddedProcessors/atf-marvell/commit/c96ec59f8b819123a06e1839ab5578030cf263b0

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ac260a2acec20f30705fdfd3911ff966c1f4a0df)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoconfigs/solidrun_macchiatobin_*: use a Git commit for ATF
Thomas Petazzoni [Mon, 23 Apr 2018 19:59:53 +0000 (21:59 +0200)]
configs/solidrun_macchiatobin_*: use a Git commit for ATF

The version of the ARM Trusted Firmware from Marvell was a Git branch,
not a Git commit, leading to unreproducible results. So let's use a
Git commit instead, which is the latest available from the branch that
was previously used.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Tested-by: Sergey Matyukevich <geomatsi@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit c0f8d166214d54cedd4b3d09bccf5bb59205e301)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosupport/testing: fix ATF Vexpress test case
Thomas Petazzoni [Mon, 23 Apr 2018 20:14:56 +0000 (22:14 +0200)]
support/testing: fix ATF Vexpress test case

This test case currently fails to build with:

./build/juno/release/bl1/context_mgmt.o: In function `cm_prepare_el3_exit':
context_mgmt.c:(.text.cm_prepare_el3_exit+0x54): undefined reference to `cm_set_next_context'
context_mgmt.c:(.text.cm_prepare_el3_exit+0x54): relocation truncated to fit: R_AARCH64_JUMP26 against undefined symbol `cm_set_next_context'

This issue has been fixed upstream in commit
10c252c14b7f446c0b49ef1aafbd5d37804577dd, available since v1.3. So
while we bump, let's bump to the latest version of ATF, v1.5.

Fixes:

  https://gitlab.com/buildroot.org/buildroot/-/jobs/64360659

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit e74a7cd1e0a85718dfc20dc4d94a5cac051d2514)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.{4, 9, 14, 16}.x series
Fabio Estevam [Tue, 24 Apr 2018 10:38:58 +0000 (07:38 -0300)]
linux-headers: bump 4.{4, 9, 14, 16}.x series

[Peter: drop 4.16.x change]
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit e13a22f17a5041557a080150f1d260181fa99bee)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agombedtls: security bump to version 2.7.2
Baruch Siach [Tue, 24 Apr 2018 11:48:22 +0000 (14:48 +0300)]
mbedtls: security bump to version 2.7.2

The release announcement mentions these security fixes:

  Defend against Bellcore glitch attacks by verifying the results of RSA
  private key operations.

  Fix implementation of the truncated HMAC extension. The previous
  implementation allowed an offline 2^80 brute force attack on the HMAC
  key of a single, uninterrupted connection (with no resumption of the
  session).

  Reject CRLs containing unsupported critical extensions.

  Fix a buffer overread in ssl_parse_server_key_exchange() that could
  cause a crash on invalid input. (CVE-2018-9988)

  Fix a buffer overread in ssl_parse_server_psk_hint() that could cause
  a crash on invalid input. (CVE-2018-9989)

Drop upstream patch.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit babc94e9dd4a1a04c4a0befdb6d32236a30b8ea8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.9.x series
Bernd Kuhls [Sat, 21 Apr 2018 08:49:58 +0000 (10:49 +0200)]
linux-headers: bump 4.9.x series

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 26148a247f3757b0ee7f24b10f13c0451f25a9ae)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.{14, 15, 16}.x series
Fabio Estevam [Fri, 20 Apr 2018 11:53:48 +0000 (08:53 -0300)]
linux-headers: bump 4.{14, 15, 16}.x series

[Peter: drop 4.16.x change]
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ea4921d875a45fe03b86b672a432ff2e88268733)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/tcllib: update license to SPDX format
Romain Naour [Fri, 20 Apr 2018 08:29:00 +0000 (10:29 +0200)]
package/tcllib: update license to SPDX format

While at it add the license file hash.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 2c82d7c605e53d3687ff63f31e135ec7ce92ea05)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/tcl: update license to SPDX format
Romain Naour [Fri, 20 Apr 2018 08:28:59 +0000 (10:28 +0200)]
package/tcl: update license to SPDX format

While at it add the license file hash.

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 8fa4e9792917ae6beb2782ea5938cc4cf0d3f1e7)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/libcec: disable build infos
Romain Naour [Wed, 18 Apr 2018 21:13:30 +0000 (23:13 +0200)]
package/libcec: disable build infos

Build infos can break the build due to missing terminating " character.

Fixes:
http://autobuild.buildroot.net/results/3b1/3b1182783fc958dfed96c6b1c097993662fc7308

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 4600c2444d3df3f709d6656f98e636223e0bc4af)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agogrub2: force -fno-stack-protector in CPPFLAGS
Tarek El-Sherbiny [Thu, 19 Apr 2018 08:36:59 +0000 (09:36 +0100)]
grub2: force -fno-stack-protector in CPPFLAGS

In commit 2a27294e9ade6130a12ced9a1f152c51431a870e ("grub2: force
-fno-stack-protector in CFLAGS"), a fix was made to the grub2 package
to make it build properly even when SSP support is enabled.

However, commit 20a4583ebf7fe97ea22a1ea11621dd44a8114ca5 ("security
hardening: add RELFO, FORTIFY options") reworked how SSP options are
passed, and they are now passed in CPPFLAGS instead of CFLAGS, making
the fix introduced by 2a27294e9ade6130a12ced9a1f152c51431a870e no
longer operating.

This commit will force no-stack-protector in CPPFLAGS instead of
CFLAGS.

Fixes bug #10961.

Signed-off-by: Tarek El-Sherbiny <tarek_el-sherbiny@waters.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 523b27afa941bc0a78f7b2eae8e97329c112782d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosyslog-ng: bump version header in conf file to 3.10
Ricardo Martincoski [Thu, 19 Apr 2018 19:14:17 +0000 (16:14 -0300)]
syslog-ng: bump version header in conf file to 3.10

Remove a runtime warning message about configuration file being too old.

Do the same as commit 3dad25466d "syslog-ng: Bump version header in conf
file to 3.9". Package version of syslog-ng is 3.10.1, so bump version
number in syslog-ng.conf to 3.10.

Also add a comment to avoid the same warning message reappears when the
package is bumped.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@datacom.ind.br>
Cc: Chris Packham <judge.packham@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 905f8d814ad21af9c3fd22ececce0824cb20db80)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoscanpypi: add support for the new PyPI infrastructure
Yegor Yefremov [Wed, 18 Apr 2018 09:55:42 +0000 (11:55 +0200)]
scanpypi: add support for the new PyPI infrastructure

https://pypi.python.org URL has been changed to https://pypi.org.

Package's JSON object now contains sha256 checksum, so use it
instead of locally computed one. Change comments in the hash
file accordingly.

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 6766ff9d12c628332170098de9cff42625a2d0a3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/wmctrl: x-includes and x-libraries must be set for cross-compiling
Romain Naour [Tue, 17 Apr 2018 18:22:08 +0000 (20:22 +0200)]
package/wmctrl: x-includes and x-libraries must be set for cross-compiling

set x-includes and x-libraries configure option for cross-compiling.
wmctrl can use poisoned paths if these options are not passed to
configure script.

Fixes:
http://autobuild.buildroot.net/results/7e5/7e5cba8a5650a00e10d1a5528f38cb2bf772aee1

Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Jérôme Pouiller <jezz@sysmic.org>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 046c5e25634bbf827c43617bf1967ab469418908)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agousb_modeswitch: set CXX to false when C++ is missing
Baruch Siach [Tue, 17 Apr 2018 04:00:28 +0000 (07:00 +0300)]
usb_modeswitch: set CXX to false when C++ is missing

Similar to the openocd fix in commit 5966e2dc54 (package/openocd: fix
fallout after no-C++ fixups) the jimctl that is bundled with
usb_modeswitch also wants to find a binary. This broke with commit
4cd1ab158 (core: alternate solution to disable C++). Revert to 'false'
instead of 'no' here as well.

Fixes:
http://autobuild.buildroot.net/results/b4d/b4d4e925763cb6558af915f9781afe07fc557ebc/
http://autobuild.buildroot.net/results/61b/61b9dc2148df2e8fd0b30e62aedbfd30bb755e19/
http://autobuild.buildroot.net/results/468/468a7e6b049f159fbb4e79d3a12b53ca890f6933/

Cc: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 107e3ebf45931adfc9c995dbb5db3bf1d17311d3)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoqt5: qt5websockets: install missing qml modules
Manfred Schlaegl [Wed, 11 Apr 2018 12:40:37 +0000 (14:40 +0200)]
qt5: qt5websockets: install missing qml modules

QML modules for QtWebSockets are located in /usr/qml/QtWebSockets since
Qt 5.5.

/usr/qml/Qt/WebSockets still exists for compatibility reasons, but
it contains only a qmldir file which points to ../../QtWebSockets/.

see also: http://doc.qt.io/qt-5.6/qtwebsockets-qmlmodule.html

Signed-off-by: Manfred Schlaegl <manfred.schlaegl@ginzinger.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 4f726cef4c5709cf4f894e436b4022989adc9e9f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoqt53d: install missing QML modules, plugins and examples
Romain Reignier [Mon, 16 Apr 2018 00:30:43 +0000 (02:30 +0200)]
qt53d: install missing QML modules, plugins and examples

Some files were missing on the first build of qt53d but added later:
- by qt5base for the plugins because it copies the whole /usr/lib/qt/plugins
  directory
- by qt5declarative for the QML modules because it copies the whole
  /usr/qml directory

Also, the qt53d examples were not installed if
BR2_PACKAGE_QT5BASE_EXAMPLES was set.

Signed-off-by: Romain Reignier <rom.reignier@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 4fd448c9c1e3ed7ca0f09441bf8a854eb9130190)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosystemd: add compatibility symlink for 'shutdown'
Anssi Hannula [Fri, 13 Apr 2018 12:18:30 +0000 (15:18 +0300)]
systemd: add compatibility symlink for 'shutdown'

In addition to the 'halt', 'poweroff', 'reboot' symlinks pointing to
systemctl, add 'shutdown'.

Signed-off-by: Anssi Hannula <anssi.hannula@bitwise.fi>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 36ed046623129bb879ef50cd40dcc65b27c9da0f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.{4, 9}.x series
Fabio Estevam [Sat, 14 Apr 2018 00:20:41 +0000 (21:20 -0300)]
linux-headers: bump 4.{4, 9}.x series

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 338f32634069ce2610132fa70974a5b429ccc51c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agosupport/scripts/fix-rpath: exclude /lib/firmware in the target
Thomas Petazzoni [Thu, 12 Apr 2018 11:50:09 +0000 (13:50 +0200)]
support/scripts/fix-rpath: exclude /lib/firmware in the target

The /lib/firmware directory contains random firmware for various
devices. It happens that some of them might be or appear to be ELF
files, but they shouldn't be checked by fix-rpath. For example, one of
the Qualcomm VPU firmware file appears to be an ELF file, but patchelf
isn't happy about it:

$ ./output/host/bin/patchelf --print-rpath output/target/lib/firmware/qcom/venus-4.2/venus.b00
patchelf: patchelf.cc:387: void ElfFile<Elf_Ehdr, Elf_Phdr, Elf_Shdr, Elf_Addr, Elf_Off, Elf_Dyn, Elf_Sym>::parse() [with Elf_Ehdr = Elf32_Ehdr; Elf_Phdr = Elf32_Phdr; Elf_Shdr = Elf32_Shdr; Elf_Addr = unsigned int; Elf_Off = unsigned int; Elf_Dyn = Elf32_Dyn; Elf_Sym = Elf32_Sym]: Assertion `shstrtabIndex < shdrs.size()' failed.
Aborted (core dumped)

Even though patchelf definitely shouldn't crash, it anyway doesn't
make sense to check ELF files in /lib/firmware, so let's exclude this
directory from our check.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 184cb52f6d9368c333c79665080e7808c5713117)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.{15, 16}.x series
Fabio Estevam [Thu, 12 Apr 2018 11:11:28 +0000 (08:11 -0300)]
linux-headers: bump 4.{15, 16}.x series

[Peter: drop 4.16.x change]
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 77ebc428d62ae2b40e723b401bc003f26fcbc601)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolibglib2: fix license
Fabrice Fontaine [Mon, 9 Apr 2018 20:21:59 +0000 (22:21 +0200)]
libglib2: fix license

libglib2 is licensed under LGPL-2.1+ and not LGPL-2.0+ since release
2.53.3

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit fbd809c5f2c826b13d99843bf6fd003f8a5a128f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/uclibc: Fix ffmpeg build on aarch64
Bernd Kuhls [Sun, 28 Jan 2018 15:20:24 +0000 (16:20 +0100)]
package/uclibc: Fix ffmpeg build on aarch64

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoRevert "package/bash: add /bin/bash to /etc/shells"
Arnout Vandecappelle (Essensium/Mind) [Tue, 17 Apr 2018 10:01:09 +0000 (12:01 +0200)]
Revert "package/bash: add /bin/bash to /etc/shells"

Commit 4d279697af added /bin/bash to /etc/shells. In the default
skeleton, however, /etc/shells doesn't exist, so in fact it creates
this file, containing only /bin/bash. Therefore, when bash is selected,
/bin/sh does not appear in /etc/shells and bash is the only shell
allowed. Since /bin/sh is the shell that is used for root in the
default skeleton's /etc/passwd, root is no longer able to log in.

The proper solution is to add all available shells to /etc/shells. For
now, however, just revert commit 4d279697af as a stop-gap measure. That
way, the default situation still works, and only people who update
/etc/passwd with additional logins but don't update /etc/shells will
suffer.

This reverts commit 4d279697afbf8fb295274784103be2b837113d5e.

Fixes: https://bugs.busybox.net/show_bug.cgi?id=10896
Cc: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Acked-by: Romain Naour <romain.naour@smile.fr>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoUpdate for 2018.02.1 2018.02.1
Peter Korsgaard [Mon, 9 Apr 2018 21:51:05 +0000 (23:51 +0200)]
Update for 2018.02.1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopatch: add upstream security fix
Baruch Siach [Mon, 9 Apr 2018 16:20:36 +0000 (19:20 +0300)]
patch: add upstream security fix

Fixes CVE-2018-1000156: arbitrary command execution in ed-style patches.

Depend on MMU for now, because the patch adds a fork() call. Upstream
later switched to gnulib provided execute(), so this dependency can be
dropped on the next version bump.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f4a4df2084b923f29eca2130976ca10a7aa6b719)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/linux: fix custom dts files handling
Rafal Susz [Tue, 13 Mar 2018 18:00:05 +0000 (19:00 +0100)]
package/linux: fix custom dts files handling

Custom dts files are still conditionally copied based on non existing
boolean. So it is currently not possible to use custom dts file(s) at all.

List of dts files is now iterated and files are copied into dedicated kernel arch dir.

Signed-off-by: Rafal Susz <rafal.susz@gmail.com>
Tested-by: Jan Kundrát <jan.kundrat@cesnet.cz>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 54157c6c2d9fba5ad230294ae1c7dfc0032b1ede)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/kmod: fix host install
Yann E. MORIN [Sun, 8 Apr 2018 08:11:51 +0000 (10:11 +0200)]
package/kmod: fix host install

The host directory no longer uses /usr.

This currently works because we still have the  legacy /usr
symlink, but for correctness it is better that we just fix it.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Yegor Yefremov <yegorslists@googlemail.com>
Cc: Arnout Vandecappelle <arnout@mind.be>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Cc: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit dac25351e6453b35ded611ff367b95bb4b10a9cf)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agophp: fix emalloc/efree/estrdup/... undefined references
Thomas Petazzoni [Thu, 5 Apr 2018 21:06:22 +0000 (23:06 +0200)]
php: fix emalloc/efree/estrdup/... undefined references

zend_alloc.h defines some macros such as:

Where _estrdup is the actual function implemented by the PHP core. If
this header file is not included, and some code uses estrdup, one ends
up with an undefined reference. This happens when libexpat support is
enabled. This commit adds a PHP patch that fixes this issue. The patch
has been submitted upstream through a Github pull request.

Fixes:

  http://autobuild.buildroot.net/results/889d2c1f509c035cd506e36061939bfddc8f1500/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit fc4b66dbc1b71e871129ce14b289fcda6eb3ea10)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agowireshark: bump version to 2.2.14 (security)
André Hentschel [Sat, 7 Apr 2018 12:59:03 +0000 (14:59 +0200)]
wireshark: bump version to 2.2.14 (security)

Security fixes since 2.2.12:

- wnpa-sec-2018-15
  The MP4 dissector could crash. (Bug 13777)
- wnpa-sec-2018-16
  The ADB dissector could crash. (Bug 14460)
- wnpa-sec-2018-17
  The IEEE 802.15.4 dissector could crash. (Bug 14468)
- wnpa-sec-2018-18
  The NBAP dissector could crash. (Bug 14471)
- wnpa-sec-2018-19
  The VLAN dissector could crash. (Bug 14469)
- wnpa-sec-2018-20
  The LWAPP dissector could crash. (Bug 14467)
- wnpa-sec-2018-23
  The Kerberos dissector could crash. (Bug 14576)
- wnpa-sec-2018-05
  The IEEE 802.11 dissector could crash. Bug 14442, CVE-2018-7335
- wnpa-sec-2018-06
  Multiple dissectors could go into large infinite loops. All ASN.1 BER dissectors (Bug 14444), along with the DICOM (Bug 14411), DMP (Bug 14408), LLTD (Bug 14419), OpenFlow (Bug 14420), RELOAD (Bug 14445), RPCoRDMA (Bug 14449), RPKI-Router (Bug 14414), S7COMM (Bug 14423), SCCP (Bug 14413), Thread (Bug 14428), Thrift (Bug 14379), USB (Bug 14421), and WCCP (Bug 14412) dissectors were susceptible.
- wnpa-sec-2018-07
  The UMTS MAC dissector could crash. Bug 14339, CVE-2018-7334
- wnpa-sec-2018-09
  The FCP dissector could crash. Bug 14374, CVE-2018-7336
- wnpa-sec-2018-10
  The SIGCOMP dissector could crash. Bug 14398, CVE-2018-7320
- wnpa-sec-2018-11
  The pcapng file parser could crash. Bug 14403, CVE-2018-7420
- wnpa-sec-2018-12
  The IPMI dissector could crash. Bug 14409, CVE-2018-7417
- wnpa-sec-2018-13
  The SIGCOMP dissector could crash. Bug 14410, CVE-2018-7418
-  wnpa-sec-2018-14
  The NBAP disssector could crash. Bug 14443, CVE-2018-7419

Full release notes:

  https://www.wireshark.org/docs/relnotes/wireshark-2.2.14.html

Signed-off-by: André Hentschel <nerv@dawncrow.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit c5c87c2bb61efb31421b345bdbf6931b882ff6a9)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux: bump default to version 4.15.16
Fabio Estevam [Sun, 8 Apr 2018 14:04:04 +0000 (11:04 -0300)]
linux: bump default to version 4.15.16

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit bbbcfa57f80d239f94669586cadad4e14f073a5f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agolinux-headers: bump 4.{4, 9, 14, 15}.x series
Fabio Estevam [Sun, 8 Apr 2018 14:00:51 +0000 (11:00 -0300)]
linux-headers: bump 4.{4, 9, 14, 15}.x series

Signed-off-by: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 2661d47425f866cf56617d2928b6b96566db8de4)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoboard/atmel: use correct sam-ba binary in flasher.sh script
Joshua Henderson [Thu, 5 Apr 2018 21:34:41 +0000 (14:34 -0700)]
board/atmel: use correct sam-ba binary in flasher.sh script

Instead of using the install of sam-ba under host/opt directly, use the symlink
created in host/bin.  The side effect of doing this instead allows the correct
sam-ba binary to be used based on the host arch being 32 bit or 64 bit.

Signed-off-by: Joshua Henderson <joshua.henderson@microchip.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit e1452fe8434c4613d1727034db525c0a9bbc6dfd)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agophp: fix how PCRE JIT is disabled
Thomas Petazzoni [Fri, 6 Apr 2018 08:54:03 +0000 (10:54 +0200)]
php: fix how PCRE JIT is disabled

When the internal PCRE library of PHP is used, it tries to use a JIT
engine, which is only available on some architectures.

However, the mechanism used to disable JIT has changed in recent PHP
versions, and it now has a proper --without-pcre-jit option. Switch
over to that to properly disable JIT on unsupported platforms.

It has been tested to fix the build of PHP on ARC and Microblaze.

Fixes:

  http://autobuild.buildroot.net/results/e1359fcad7bc57e3c5a7ecc37abaa2cf6a6a9ffa/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 9850612ea5e9fc9c377d11ec9c2930bfd812754a)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agodocs/manual: use SPDX short identifier for license
Rahul Bedarkar [Thu, 5 Apr 2018 18:13:24 +0000 (23:43 +0530)]
docs/manual: use SPDX short identifier for license

Signed-off-by: Rahul Bedarkar <rahulbedarkar89@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 08bbbe73af0d60ffac4f4476d0583764b81fdfac)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopostgresql: propagate BR2_USE_MMU dependency to Config.in comment
Thomas Petazzoni [Thu, 5 Apr 2018 07:34:35 +0000 (09:34 +0200)]
postgresql: propagate BR2_USE_MMU dependency to Config.in comment

The BR2_PACKAGE_POSTGRESQL option depends on BR2_USE_MMU, so the
Config.in comment about the dynamic library dependency should only be
displayed if the BR2_USE_MMU requirement is met.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 9fec3eb9131dba46cbf8474a7def05a076990079)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoqt5base: correct eglfs support in qmake.conf.in
Giulio Benetti [Mon, 13 Nov 2017 18:41:54 +0000 (19:41 +0100)]
qt5base: correct eglfs support in qmake.conf.in

Setting EGLFS_DEVICE_INTEGRATION at the end of qmake.conf like is done
by commit 0c219ddb8a doesn't work correctly: it has to be set before the
include(../common/linux_device_post.conf)

Instead of appending to the file, change it into a qmake.conf.in
template file that contains a placeholder for the
EGLFS_DEVICE_INTEGRATION assignment and update it with sed. Since the
sed always has to be executed, this removes the need for a separate
QT5BASE_CONFIGURE_QMAKE_CONFIG definition.

Signed-off-by: Giulio Benetti <giulio.benetti@micronovasrl.com>
[Arnout: simplify the replacement, move sunxi-mali support to a
 separate patch]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit 81fb33af2a6e4f4d379da3372b2a607b7ae1a21f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopython-webpy: use webpy-0.39 tag
Peter Korsgaard [Thu, 5 Apr 2018 06:42:15 +0000 (08:42 +0200)]
python-webpy: use webpy-0.39 tag

No functional change, but upstream has now tagged the release, so use the
tag instead of the sha1.

https://github.com/webpy/webpy/issues/449

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 01320bb9ff297bac38a4c9bc32ae505ac79d600f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopython-webpy: security bump to version 0.39
Peter Korsgaard [Wed, 4 Apr 2018 15:51:32 +0000 (17:51 +0200)]
python-webpy: security bump to version 0.39

>From the changelog:

2018-02-28 0.39
* Fixed a security issue with the form module (tx Orange Tsai)
* Fixed a security issue with the db module (tx Adrián Brav and Orange Tsai)

2016-07-08 0.38
..
* Fixed a potential remote exeution risk in `reparam` (tx Adrián Brav)

License files are still not included on pypi, so continue to use the git
repo. Upstream has unfortunately not tagged 0.39, so use the latest commit
on the 0.39 branch.  A request to fix this has been submitted:

https://github.com/webpy/webpy/issues/449

0.39 now uses setuptools, so change the _SETUP_TYPE.

Add hashes for the license files.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit ce559162fca39c273583bea0dbed643229769d8c)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopython-webpy: needs hashlib support in python
Peter Korsgaard [Wed, 4 Apr 2018 15:51:31 +0000 (17:51 +0200)]
python-webpy: needs hashlib support in python

webpy uses hashlib for session handling, so ensure it is available:

web/session.py:    import hashlib
web/session.py:    sha1 = hashlib.sha1

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 543b0d50fbbb552296749d0cf18443aacfc6e58d)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/systemd: add upstream build fix #8456
Stefan Becker [Tue, 3 Apr 2018 06:11:38 +0000 (09:11 +0300)]
package/systemd: add upstream build fix #8456

Signed-off-by: Stefan Becker <chemobejk@gmail.com>
Tested-by: Joseph Kogut <joseph.kogut@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 794d16fcacfc5c8e041452da67ee12aaab36f441)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoqt5script: correct license information
Arnout Vandecappelle (Essensium/Mind) [Mon, 2 Apr 2018 14:14:46 +0000 (16:14 +0200)]
qt5script: correct license information

The license information in qt5script was just copied from all the other
qt5 modules, but it is different (and complicated).

- libQt5Script itself contains the third-party JavaScriptCore source.
  JavaScriptCore has a number of licenses: BSD-2-Clause, BSD-3-Clause,
  LGPL-2.0+, LGPL-2.1+. Since it is all linked together, the end
  result will be BSD-3-Clause and LGPL-2.1+.

  The different BSD licenses are all slightly different (different
  authors, which affects the third clause in particular). Only one
  separate license file is provided, so let's use that one.

  There is an LGPL-2.0 license file, which is slightly different from
  the top-level LICENSE.LGPLv21, so let's add that one as well.

- libQt5Script also contains Qt-specific code which is all licensed
  under LGPL-2.1 only. This is covered by the LICENSE.LGPLv21 file.
  It merges with the LGPL-2.1+ from JavaScriptCore but limits it to
  2.1 only.

- libQt5ScriptTools is a separate libary containing just the script
  debugger. It is covered by the usual Qt license:
  * LGPL-2.1 or LGPL-3.0 with exception for Qt 5.6;
  * LGPL-3.0 or GPL-2.0+ for Qt 5.9 (actually it is GPL-2.0 or GPL-3.0
    or any later version approved by the KDE Qt foundation, but let's
    keep it simple :-). Note that there is no LICENSE.GPLv2 provided,
    only LICENSE.GPLv3. Also, there is an LGPL_EXCEPTION.txt file but
    no mention of an exception anywhere in the sources.

Update the license information with all of the above. Also add hashes
for the new license files from JavaScriptCore.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit d9ec8526bb68ea50a8e9b9847ab119c6248c66fd)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agocheck-host-tar.sh: bump minimum tar version to 1.27 for reproducible tar files with...
Peter Korsgaard [Mon, 2 Apr 2018 09:48:08 +0000 (11:48 +0200)]
check-host-tar.sh: bump minimum tar version to 1.27 for reproducible tar files with long paths

Fixes:
http://autobuild.buildroot.net/results/b18/b187e64a61918f17f69588e2355a03286bc5808e

tar 1.27 subtly changed the tar format when a GNU long link entry is added
(which is done for path elements > 100 characters).  The code used to set
the permission mode of the link entry to 0:

  header = start_private_header ("././@LongLink", size, time (NULL));
  FILL (header->header.mtime, '0');
  FILL (header->header.mode, '0');
  FILL (header->header.uid, '0');
  FILL (header->header.gid, '0');
  FILL (header->header.devmajor, 0);
  FILL (header->header.devminor, 0);

This got dropped in 1.27 by commit df7b55a8f6354e3 (Fix some problems with
negative and out-of-range integers), so the settings from
start_private_header() are used directly - Which are:

  TIME_TO_CHARS (t < 0 ? 0 : min (t, MAX_OCTAL_VAL (header->header.mtime)),
 header->header.mtime);
  MODE_TO_CHARS (S_IFREG|S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH, header->header.mode);
  UID_TO_CHARS (0, header->header.uid);
  GID_TO_CHARS (0, header->header.gid);

The end result is that tar >= 1.27 sets mode to 644.

The consequence of this is that we create different tar files when long path
names are encountered (which often happens when a package downloads a
specific sha1 from a git repo) depending on the host tar version used,
causing hash mismatches.

As a workaround, bump our minimum tar version to 1.27.  It would be nicer to
only do this if we have packages from bzr/git/hg enabled, but that is an
exercise for later.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit cdac332d20d2d1326dee0111e188fa214549122b)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agomemcached: bump to version 1.5.6
Christopher McCrory [Fri, 2 Mar 2018 18:07:55 +0000 (10:07 -0800)]
memcached: bump to version 1.5.6

From ReleaseNotes156:

"""
This is a bugfix release, but it primarily disables the UDP protocol by
default.

In the last few days reports of UDP amplification attacks utilizing
inesure memcached instances have surfaced. Attackers are able to set
large values into memcached, then send requests via spoofed UDP packets.
Memcached will then send a very large number of very large UDP packets
back in response.
"""

Signed-off-by: Christopher McCrory <chrismcc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit f03cf639cfba961ca4cbfb73435f23b951941685)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agomotion: fix config file location
Christopher McCrory [Thu, 8 Mar 2018 14:15:36 +0000 (06:15 -0800)]
motion: fix config file location

Install the motion.config file were the program expects it to be. From
the motion source code:

snprintf(filename, PATH_MAX, "%s/motion/motion.conf", sysconfdir);

Signed-off-by: Christopher McCrory <chrismcc@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit b773c33bf18d82e4cf7d0712dfe88a0bae61c865)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoqt5webkit: fix build issue with 32-bits armv8-a
Gaël PORTAY [Fri, 2 Mar 2018 16:28:12 +0000 (11:28 -0500)]
qt5webkit: fix build issue with 32-bits armv8-a

Adds WTF platform support for the 32-bits armv8-a architectures.

Fixes:

In file included from ./config.h:30:0,
                 from ...
./wtf/Platform.h:323:6: error: #error "Not supported ARM architecture"
 #    error "Not supported ARM architecture"
      ^~~~~
from this defconfig:

BR2_arm=y
BR2_cortex_a72=y
BR2_ARM_FPU_VFPV3D16=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_INIT_NONE=y
BR2_PACKAGE_QT5=y
BR2_PACKAGE_QT5WEBKIT=y

The patch is an adaptation of an upstream fix in version 5.212 of
qtwebkit[1].

Unfortunately, the commit cannot be backported and has to be fixed since
the toolchain does not define __ARM_ARCH_8__ but __ARM_ARCH_8A__.

$ host/bin/arm-buildroot-linux-gnueabihf-g++ -dM -E - < /dev/null | grep ARM_ARCH
#define __ARM_ARCH_ISA_ARM 1
#define __ARM_ARCH_8A__ 1
#define __ARM_ARCH_PROFILE 65
#define __ARM_ARCH_ISA_THUMB 2
#define __ARM_ARCH 8
#define __ARM_ARCH_EXT_IDIV__ 1

[1]: https://github.com/qt/qtwebkit/blob/35655d5f4bad248ead1700b59c381cc568b4e98b/Source/WTF/wtf/Platform.h#L241-L242

Cc: Arnout Vandecappelle <arnout@mind.be>
Reported-by: Brock Williams <brock@cottonwoodcomputer.com>
Reviewed-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Gaël PORTAY <gael.portay@savoirfairelinux.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
(cherry picked from commit cea7aa873aa1b6034c3ac93aec21d74d9901b270)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agotoolchain-wrapper: use -ffp-contract=off on MIPS Xburst for gcc >= 4.6
Waldemar Brodkorb [Sat, 31 Mar 2018 17:54:20 +0000 (19:54 +0200)]
toolchain-wrapper: use -ffp-contract=off on MIPS Xburst for gcc >= 4.6

Since gcc 4.6, GCC deprecated -mfused-madd, -ffp-contract=off should
be used for the Xburst workaround.

Tested with the MIPS Sourcery 2011.03 toolchain (based on gcc 4.5),
the toolchain wrapper uses -mno-fused-madd, as expected:

$ BR2_DEBUG_WRAPPER=2 ./output/host/bin/mips-linux-gnu-gcc -o toto toto.c
Toolchain wrapper executing:
    '/home/thomas/toolchains/mips-2011.03/bin/mips-linux-gnu-gcc'
    '--sysroot'
    '/home/thomas/projets/buildroot/output/host/mipsel-buildroot-linux-gnu/sysroot'
    '-mabi=32'
    '-msoft-float'
    '-mno-fused-madd'
    '-EL'
    '-march=mips32r2'
    '-o'
    'toto'
    'toto.c'

And with the MIPS Sourcery 2012.09 toolchain (based on gcc 4.7), the
toolchain wrapper uses -ffp-contract=off, as expected:

$ BR2_DEBUG_WRAPPER=2 ./output/host/bin/mips-linux-gnu-gcc -o toto toto.c
Toolchain wrapper executing:
    '/home/thomas/toolchains/mips-2012.09/bin/mips-linux-gnu-gcc'
    '--sysroot'
    '/home/thomas/projets/buildroot/output/host/mipsel-buildroot-linux-gnu/sysroot'
    '-mabi=32'
    '-msoft-float'
    '-ffp-contract=off'
    '-EL'
    '-march=mips32r2'
    '-o'
    'toto'
    'toto.c'

Fixes the ci20_defconfig build:

  https://gitlab.com/buildroot.org/buildroot/-/jobs/60303132

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
[Thomas: rework to continue supporting pre-gcc-4.6 toolchains, extend
the commit log after doing more testing.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 5e58509bfe497c5e85db58f8213b0a44ac79dd3f)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agocore: rename FOO_BASE_NAME to FOO_BASENAME to avoid clashes
Thomas De Schampheleire [Tue, 6 Feb 2018 12:59:23 +0000 (13:59 +0100)]
core: rename FOO_BASE_NAME to FOO_BASENAME to avoid clashes

In current Buildroot, clashes occur between the variables _NAME and
_BASE_NAME for two packages called foo and foo-base, i.e.

Package foo:
FOO_NAME = foo
FOO_BASE_NAME = foo-1.2.3

Package foo-base:
FOO_BASE_NAME = foo-base
FOO_BASE_BASE_NAME = foo-base-4.5.6

where variable FOO_BASE_NAME is clashing between these two packages.
Specific cases where this clash is already existing are:
- alljoyn-base
- alljoyn-tcl-base
- perl-xml-sax-base

The problem is generic and can occur for a number of variables in Buildroot.
A non-exhaustive list:
    <pkg>_BASE and <pkg>_BASE_NAME
    <pkg>_BASE_NAME and <pkg>_RAW_BASE_NAME
    <pkg>_DIR and <pkg>_DL_DIR
    <pkg>_VERSION and <pkg>_DL_VERSION
    <pkg>_SOURCE and <pkg>_TARGET_SOURCE
    <pkg>_INSTALL_IMAGES and <pkg>_TARGET_INSTALL_IMAGES  (same for _STAGING and _TARGET)
    <pkg>_LICENSE_FILES and <pkg>_MANIFEST_LICENSE_FILES
    <pkg>_DEPENDENCIES and <pkg>_FINAL_DEPENDENCIES

One solution is to use another separator than '_' to separate the
package name from the rest of the variable name. For example, a double
underscore:
FOO__NAME
FOO__BASE_NAME
FOO_BASE__NAME
FOO_BASE__BASE_NAME

However, making that change for only this case means that the variable
naming is no longer consistent. And making the change for all variables has
a large impact, also on certain user scripts.

For now, keep it simple, and rename FOO_BASE_NAME into FOO_BASENAME, so that
the variables become:
FOO_NAME
FOO_BASENAME
FOO_BASE_NAME
FOO_BASE_BASENAME

For consistency, also adapt FOO_RAW_BASE_NAME. Since FOO_RAW_BASENAME would
still pose a conflict with a package called 'foo-raw', take the opportunity
to rename it into FOO_BASENAME_RAW instead, which does not pose a conflict
as we have no variable called FOO_RAW.

Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Sam Voss <sam.voss@rockwellcollins.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 83d2644b1197564358b6cd87b2f221d79671b5cc)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agognupg: fix prompt of Config.in.host
Thomas Petazzoni [Sun, 1 Apr 2018 11:53:59 +0000 (13:53 +0200)]
gnupg: fix prompt of Config.in.host

It should be "host gnupg" and not "host-gnupg" to be consistent with
all other Config.in.host options.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 083716cdfbc42ac5cd53d3d10ac76a57427c11af)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoopenblas: drop SSE_GENERIC target
Peter Korsgaard [Sun, 1 Apr 2018 08:46:41 +0000 (10:46 +0200)]
openblas: drop SSE_GENERIC target

Fixes #10856

The SSE_GENERIC target fails to build with a "sgemm_kernel.o: No such file
or directory" error. Several upstream bug reports exist for this:

https://github.com/xianyi/OpenBLAS/issues/502
https://github.com/xianyi/OpenBLAS/issues/685

In both cases, upstream suggests using a different target definition
instead.  E.G.  from issue 685:

You may use NORTHWOOD on x86: make TARGET=NORTHWOOD that uses SSE2
instructions.  It's very hard to find non-SSE2 x86 CPUs today.  For x86-64
use the PRESCOTT target

So drop the SSE_GENERIC target.  The only x86_64 variant we support not
covered by a more specific openblas target is the default variant, nocona
and jaguar.

Nocona was a Xeon variant of the P4 "Prescott" architecture, so use the
PRESCOTT openblas target:

https://en.wikipedia.org/wiki/Xeon#Nocona_and_Irwindale

Jaguar is from the Bobcat family, so use the BOBCAT openblas target:

https://en.wikipedia.org/wiki/List_of_AMD_microprocessors#Bobcat_core_architecture_(APU)

[Peter: add Jaguar as pointed out by Arnout]
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
(cherry picked from commit 5e6fa93483caac317ab8844feb2ae9c07078a6c8)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agoopencv3: fix Python module build for Python 3.x
Sasha Shyrokov [Tue, 6 Mar 2018 15:58:10 +0000 (10:58 -0500)]
opencv3: fix Python module build for Python 3.x

When the OpenCV3 Python support is enabled with Python 3.x, it builds
properly, and the resulting .so file is built for the target
architecture, but its name is wrong:

  output/target/usr/lib/python3.6/site-packages/cv2.cpython-36m-x86_64-linux-gnu.so

This prevents Python 3.x from importing the module:

>>> import cv2
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
ModuleNotFoundError: No module named 'cv2'

In order to fix this, we simply need to pass PKG_PYTHON_DISTUTILS_ENV
in the environment. The Python module then gets named:

  output/target/usr/lib/python3.6/site-packages/cv2.cpython-36m-arm-linux-gnueabi.so

And can be imported properly:

>>> import cv2
>>>

This solution was suggested by Arnout Vandecappelle in
https://stackoverflow.com/questions/49059035/buildroot-opencv3-python-package-builds-for-the-wrong-target.

With Python 2.x, the module is named just cv2.so so this problem isn't
visible. However, for consistency, we also pass
PKG_PYTHON_DISTUTILS_ENV when building against Python 2.x, by putting
the OPENCV3_CONF_ENV assignment inside the
BR2_PACKAGE_OPENCV3_LIB_PYTHON condition, but outside the
BR2_PACKAGE_PYTHON3/BR2_PACKAGE_PYTHON condition.

Signed-off-by: Sasha Shyrokov <alexander-shyrokov@idexx.com>
[Thomas: extend the commit log, apply the solution to Python 2.x.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 8ba80282c3bb580c6a45ea114e70acac98fe1690)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/kodi: remove imx support
Bernd Kuhls [Sun, 4 Mar 2018 15:06:06 +0000 (16:06 +0100)]
package/kodi: remove imx support

https://git.buildroot.net/buildroot/commit/?id=266208972192f1e0869f89d7be941de6294a810a
broke imx support in Kodi because previously the G2D libraries were
part of the imx-gpu-viv package:

CMake Error at /usr/share/cmake-3.7/Modules/FindPackageHandleStandardArgs.cmake:138 (message):
  Could NOT find IMX (missing: G2D_LIBRARY)

Adjusting the Kodi package to use the imx-gpu-g2d as well still does
not provide a working build:

/home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp: In member function 'void CIMX::Deinitialize()':
/home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:79:21: error: 'DCIC_IOC_STOP_VSYNC' was not declared in this scope
     ioctl(m_fddcic, DCIC_IOC_STOP_VSYNC, 0);
                     ^~~~~~~~~~~~~~~~~~~
/home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp: In member function 'bool CIMX::UpdateDCIC()':
/home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:109:19: error: 'DCIC_IOC_STOP_VSYNC' was not declared in this scope
   ioctl(m_fddcic, DCIC_IOC_STOP_VSYNC, 0);
                   ^~~~~~~~~~~~~~~~~~~
/home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:115:21: error: 'DCIC_IOC_START_VSYNC' was not declared in this scope
     ioctl(m_fddcic, DCIC_IOC_START_VSYNC, 0);
                     ^~~~~~~~~~~~~~~~~~~~
/home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp: In member function 'virtual void CIMX::Process()':
/home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:125:19: error: 'DCIC_IOC_START_VSYNC' was not declared in this scope
   ioctl(m_fddcic, DCIC_IOC_START_VSYNC, 0);
                   ^~~~~~~~~~~~~~~~~~~~
/home/buildroot/br4/output/build/kodi-17.6-Krypton/xbmc/linux/imx/IMX.cpp:131:19: error: 'DCIC_IOC_STOP_VSYNC' was not declared in this scope
   ioctl(m_fddcic, DCIC_IOC_STOP_VSYNC, 0);
                   ^~~~~~~~~~~~~~~~~~~

Although it might be possible to fix these bugs with something like

#define DCIC_IOC_CONFIG_DCIC    _IO('D', 12)
#define DCIC_IOC_START_VSYNC    _IO('D', 15)
#define DCIC_IOC_STOP_VSYNC     _IO('D', 16)

as done in
https://raw.githubusercontent.com/LibreELEC/LibreELEC.tv/libreelec-7.0/projects/imx6/patches/kodi/imx6-jarvis.patch

we would still try to ride a dead horse. The upcoming Kodi version
18.0-Leia will remove imx support completely, see upstream PR 12990.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
[Thomas: keep an explicit -DENABLE_IMX=OFF in CONF_OPTS.]
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit 878716830bfbdf76b69f69a18b53ae56fdbf8365)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
6 years agopackage/freescale-imx: Remove imx6s from has_vpu list
Bernd Kuhls [Sun, 4 Mar 2018 15:06:05 +0000 (16:06 +0100)]
package/freescale-imx: Remove imx6s from has_vpu list

According to imx-vpu-5.4.37/Makefile, line 6:

INCLUDE_LIST:= IMX27ADS IMX51 IMX53 IMX6Q

imx6s is not supported by the imx-vpu package. Its install target,
guarded by

ifeq ($(PLATFORM), $(findstring $(PLATFORM), $(INCLUDE_LIST)))

does nothing, causing a build error later on in the imx-vpuwrap package

checking for vpu_lib.h... no
configure: error: lib_vpu is required, consider installing imx-lib

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: Gary Bisson <gary.bisson@boundarydevices.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
(cherry picked from commit e42a65bdcd76018dbe2d4fd4459a7ca216e99e32)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>