Compare commits

...
80 Commits
Author SHA1 Message Date
Peter Korsgaard f3d0d7e6ff Update for 2022.02-rc2
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 23:24:46 +01:00
Fabrice Fontaine 41feca427f package/x11r7/xdriver_xf86-video-tdfx: don't override XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS
XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS is wrongly overridden in a conditional
since commit 7614ca037b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 23:19:35 +01:00
Fabrice Fontaine e0a3e6a921 package/x11r7/xdriver_xf86-video-savage: don't override XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS
XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS is wrongly overridden in a
conditional since commit c38103f2fe

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 23:19:17 +01:00
Fabrice Fontaine e08bfe2f9c package/x11r7/xdriver_xf86-video-r128: don't override XDRIVER_XF86_VIDEO_R128_CONF_OPTS
XDRIVER_XF86_VIDEO_R128_CONF_OPTS is wrongly overridden in a conditional
since commit 082b65319c

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 23:18:59 +01:00
Fabrice Fontaine 3780409bfd package/x11r7/xdriver_xf86-video-mach64: don't override XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS
XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS is wrongly overridden in a
conditional since commit cf26ae7dd1

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 23:18:45 +01:00
Fabrice Fontaine aeb138911e package/python-ipython: security bump to version 7.31.1
Fix CVE-2022-21699: IPython (Interactive Python) is a command shell for
interactive computing in multiple programming languages, originally
developed for the Python programming language. Affected versions are
subject to an arbitrary code execution vulnerability achieved by not
properly managing cross user temporary files. This vulnerability allows
one user to run code as another on the same machine. All users are
advised to upgrade.

Also update indentation in hash file (two spaces)

https://github.com/ipython/ipython/security/advisories/GHSA-pq7m-3gw7-gq5x

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 23:18:24 +01:00
Fabrice Fontaine 63b780f5e9 package/librsvg: fix loaders.cache with with per-package directories
host-librsvg install a gdk-pixbuf module (aka plugin). As such, it needs
to update [0] the modules cache (a kind of registry of which modules are
installed and what the can handle). To that effect, it calls the utility
gdk-pixbuf-queryloaders, which generates the cache of existing modules.

gdk-pixbuf-queryloaders, from the gdk-pixbuf package, has been
configured to be relocatable. However, it still embeds the path to where
it was instaled, and thus where to look modules from. If it is run from
its install location, then gdk-pixbuf-queryloaders looks modules in that
location, and generates a modules cache with relative paths; otherwise,
it still looks at that location, but generates a cache with absolute
paths. In the later case, it will miss the modules that have not been
installed by gdk-pixbuf itself.

In the case of host-librsvg, that will miss the fact that librsvg just
happened to have installed a module. Further down the road, packages
that depend on host-librsvg, will get their PPD prepared, the path fixup
hook run, so that the cache properly points to the current package's
PPD, but the cache will not include the SVG module, which causes
failures to load CVG images:

    Can't load file: Unrecognized image file format

So, we need to tell gdk-pixbuf-queryloaders where the module path is,
which restores the relativity of the paths it reports, by specifying the
modules path pointing to the current package's PPD, passed in the
environement variable GDK_PIXBUF_MODULEDIR.

We need to do that at install time, so that the SVG module is properly
listed in the cache, so that dependees can use it.

A temporary cache is also generated at build time, but its usefullness
is dubious; it seem to only be used by the test tool, which we do not
run. However, for consistency-sake, we also fix that.

Fixes:
 - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6

[0] This will trigger file-overwrite detection in the future... But we
currently do not have infrastructure to properly handle such a cache.

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: reword and extend an already-good commit log]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-20 22:36:35 +01:00
Fabrice Fontaine f6009ac821 package/x11r7/xdriver_xf86-video-ati: don't override XDRIVER_XF86_VIDEO_ATI_CONF_OPTS
XDRIVER_XF86_VIDEO_ATI_CONF_OPTS is wrongly overridden in a conditional
since commit daa433bff6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 22:28:54 +01:00
Fabrice Fontaine 70980a154b package/python-pygame: replace PYTHON_VERSION_MAJOR
Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2
has been dropped

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 22:27:40 +01:00
Fabrice Fontaine 3c10bb052d package/zfs: replace PYTHON_VERSION_MAJOR
Replace PYTHON_VERSION_MAJOR by PYTHON3_VERSION_MAJOR now that python2
has been dropped. It should be noted that PYTHON_SITE_PKG was wrongly
set since the addition of the package in commit
4470bc9914

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 22:27:23 +01:00
Fabrice Fontaine 46390b3a7c package/expat: bump to version 2.4.6
This release fixes a regression introduced by one of the security fixes
in 2.4.5.

https://blog.hartwork.org/posts/expat-2-4-6-released
https://github.com/libexpat/libexpat/blob/R_2_4_6/expat/Changes

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 22:26:26 +01:00
Fabrice Fontaine af37e96f3d package/python-twisted: security bump to version 22.1.0
Fix CVE-2022-21712: twisted is an event-driven networking engine written
in Python. In affected versions twisted exposes cookies and
authorization headers when following cross-origin redirects. This issue
is present in the `twited.web.RedirectAgent` and `twisted.web.
BrowserLikeRedirectAgent` functions. Users are advised to upgrade. There
are no known workarounds.

Update hash of license file (author added and update in year:
https://github.com/twisted/twisted/commit/13aa59746a73769b05a51c2198b28f5602dd382f
https://github.com/twisted/twisted/commit/adfdf23477abfcd09a867347993fc1d207cfb4dd
https://github.com/twisted/twisted/commit/7e65fbeed3d74a4eb1c40d7a6df5651782becbc8)

https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx
https://github.com/twisted/twisted/releases/tag/twisted-22.1.0

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 21:52:28 +01:00
Adrian Perez de Castro 5663f3679d package/webkitgtk: use lcms2 if available
Make webkitgtk enable color management support if the lcms2 package has
been selected.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 21:52:28 +01:00
Adrian Perez de Castro 057e89c9c5 package/webkitgtk: security bump to 2.34.6
Update to a new major release which brings in improvements, a number of
new features, and security fixes. Release notes:

  https://webkitgtk.org/2021/09/22/webkitgtk2.34.0-released.html
  https://webkitgtk.org/2021/10/21/webkitgtk2.34.1-released.html
  https://webkitgtk.org/2021/11/24/webkitgtk2.34.2-released.html
  https://webkitgtk.org/2021/12/20/webkitgtk2.34.3-released.html
  https://webkitgtk.org/2022/01/21/webkitgtk2.34.4-released.html
  https://webkitgtk.org/2022/02/09/webkitgtk2.34.5-released.html
  https://webkitgtk.org/2022/02/17/webkitgtk2.34.6-released.html

Security advisories:

  https://webkitgtk.org/security/WSA-2021-0007.html
  https://webkitgtk.org/security/WSA-2022-0001.html
  https://webkitgtk.org/security/WSA-2022-0002.html
  https://webkitgtk.org/security/WSA-2022-0003.html

Some of the new features require additional dependencies: HTTP/2
requires libsoup3, which is not yet packaged in Buildroot, and
disabled at the moment (with -DUSE_SOUP2=ON, to keep using libsoup2);
and the color management support needs LCMS2 (which will be enabled
in a follow-up patch.)

Options SILENCE_CROSS_COMPILATION_NOTICES and ENABLE_GRAPHICS_CONTEXT_GL
do not exist anymore, and their usage is dropped.

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 21:52:27 +01:00
Fabrice Fontaine 75361a9aba package/gdk-pixbuf: fix run with per-package directory
gdk-pixbuf is based on plugins (modules in gdk-pixbuf parlance) that are
provided either by the gdk-pixbuf package itself, or be installed by
third-party packages, like librsvg. At runtime, those plugins get loaded
by helper function in the gdk-pixbuf library.

The location where to find those modules is currently hard-coded at
build time, to the location where gdb-pixbuf is installed.. This means
that host-packages that install image-conversion utilities will try to
look in the path where gdk-pixbuf was installed.

With per-package directories, this fails to find any module that was
installed bu a third-party package. For example, the module for loading
an SVG provided by librsvg, so it is not present in the PPD of
gdk-pixbuf, and thus loading an SVG (e.g. to convert it to another
format, like adwaita-icon-theme does) will fail with:

    Can't load file: Unrecognized image file format

However, gdk-pixbuf can be configured so as to look for the modules
relative to where the program is run from, rather than hard-coding the
location at build time. This is exactly what we need in the PPD case

Additionally, even without PPD, this would fail in a similar manner in
the SDK, as that can be relocated too.

So we unconditionally enable the relocatable option, but only for the
host variant (there is no reason to enable it for the target, as it is
not going to be relocated).

Fixes:
 - http://autobuild.buildroot.org/results/0e00059b09b4445eaaec1030997883187c6a80d6

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: reword the already-good commit log]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-20 21:07:07 +01:00
Adrian Perez de Castro ffeeb7f3d3 package/wpewebkit: security bump to version 2.34.6
This brings the package two minor releases forward, which provides fixes
for CVE-2022-22589, CVE-2022-22590, CVE-2022-22592, and CVE-2022-22620.
Release notes can be found at:

  https://wpewebkit.org/release/wpewebkit-2.34.5.html
  https://wpewebkit.org/release/wpewebkit-2.34.6.html

The security advisories covering this update are available at:

  https://wpewebkit.org/security/WSA-2022-0002.html
  https://wpewebkit.org/security/WSA-2022-0003.html

Signed-off-by: Adrian Perez de Castro <aperez@igalia.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 20:36:20 +01:00
Peter Korsgaard ca6c2ee3da package/zsh: security bump to version 5.8.1
Fixes the following security issue:

- CVE-2021-45444: In zsh before 5.8.1, an attacker can achieve code
  execution if they control a command output inside the prompt, as
  demonstrated by a %F argument.  This occurs because of recursive
  PROMPT_SUBST expansion.

The 5.8.1 release is not listed in MD5SUM, so drop the md5 hash.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 20:23:03 +01:00
Fabrice Fontaine 25fc617963 package/luasyslog: bump to version 2.2.1
This bump contains a single commit which fixes the following build
failure with Lua 5.4 raised since commit
4f9a565902:

In file included from lsyslog.c:11:
compat-5.3.h:402:4: error: #error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)"
  402 | #  error "unsupported Lua version (i.e. not Lua 5.1, 5.2, or 5.3)"
      |    ^~~~~

Also update indentation in hash file (two spaces)

Fixes:
 - http://autobuild.buildroot.org/results/df2aabcf2ae07cad66b869ec4ac76702d2c32dc5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Tested-by: Romain Naour <romain.naour@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 20:22:11 +01:00
Fabrice Fontaine 20c5569f9c package/connman: fix build with libexecinfo
Fix the following build failure raised on uclibc and musl since the
addition of libexecinfo package in commit
eea8ba446c:

/home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/x86_64-buildroot-linux-uclibc/10.3.0/../../../../x86_64-buildroot-linux-uclibc/bin/ld: src/backtrace.o: in function `print_backtrace':
backtrace.c:(.text+0x37): undefined reference to `backtrace'

Fixes:
 - http://autobuild.buildroot.org/results/74da4f4deab5f0ae9405d063ad52a5d4904a964d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 20:15:26 +01:00
Peter Seiderer 324f055252 package/wireless-regdb: bump version to 2022.02.18
Changelog (since 2021.08.28, [1]):

  e061299 wireless-regdb: Raise DFS TX power limit to 250 mW (24 dBm) for the US
  2ce78ed wireless-regdb: Update regulatory rules for Croatia (HR) on 6GHz
  0d39f4c wireless-regdb: Update regulatory rules for South Korea (KR)
  acad231 wireless-regdb: Update regulatory rules for France (FR) on 6 and 60 GHz
  ea83a82 wireless-regdb: add support for US S1G channels
  4408149 wireless-regdb: add 802.11ah bands to world regulatory domain
  5f3cadc wireless-regdb: Update regulatory rules for Spain (ES) on 6GHz
  e0ac69b Revert "wireless-regdb: Update regulatory rules for South Korea (KR)"
  40e5e80 wireless-regdb: Update regulatory rules for South Korea (KR)
  e427ff2 wireless-regdb: Update regulatory rules for China (CN)
  0970116 wireless-regdb: Update regulatory rules for the Netherlands (NL) on 6GHz
  4dac44b wireless-regdb: update regulatory database based on preceding changes

[1] https://lore.kernel.org/linux-wireless/YhBCKWNw3IMfGs0L@ubuntu-x1/

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 16:36:45 +01:00
Bernd Kuhls 4c4d289229 package/php: security bump version to 8.0.16
Changelog: https://www.php.net/ChangeLog-8.php#8.0.16

Fixes CVE-2021-21708.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-20 16:36:10 +01:00
Fabrice Fontaine a50c9f16ed package/apr-util: drop APR_UTIL_FIX_{LIBTOOL, RULES_MK}
Drop APR_UTIL_FIX_{LIBTOOL,RULES_MK} which were added by commit
84b4c19e55 but is not needed since the
addition of PPD_FIXUP_PATHS in commit
b06294e989

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-20 10:59:25 +01:00
Fabrice Fontaine 0b7c22970d package/apache: drop APACHE_FIXUP_APR_LIBTOOL
Drop APACHE_FIXUP_APR_LIBTOOL which was added by commit
b747c29c4e but is not needed since the
addition of PPD_FIXUP_PATHS in commit
b06294e989

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-20 10:59:22 +01:00
Fabrice Fontaine e0da90512c package/apparmor: drop APPARMOR_FIXUP_APXS
Drop APPARMOR_FIXUP_APXS which was added by commit
3c836e5420 but is not needed since the
addition of PPD_FIXUP_PATHS in commit
b06294e989

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-20 10:59:20 +01:00
Fabrice Fontaine e0a0b8d233 package/dovecot-pigeonhole: drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG
Drop DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG added by commit
0901355c11 which is not needed since the
addition of PPD_FIXUP_PATHS in commit
b06294e989

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-20 10:59:17 +01:00
Fabrice Fontaine 21c07c0aaa package/expat: security bump to version 2.4.5
Security fixes:
 #562  CVE-2022-25235 -- Passing malformed 2- and 3-byte UTF-8
       sequences (e.g. from start tag names) to the XML
       processing application on top of Expat can cause
       arbitrary damage (e.g. code execution) depending
       on how invalid UTF-8 is handled inside the XML
       processor; validation was not their job but Expat's.
       Exploits with code execution are known to exist.
 #561  CVE-2022-25236 -- Passing (one or more) namespace separator
       characters in "xmlns[:prefix]" attribute values
       made Expat send malformed tag names to the XML
       processor on top of Expat which can cause
       arbitrary damage (e.g. code execution) depending
       on such unexpectable cases are handled inside the XML
       processor; validation was not their job but Expat's.
       Exploits with code execution are known to exist.
 #558  CVE-2022-25313 -- Fix stack exhaustion in doctype parsing
       that could be triggered by e.g. a 2 megabytes
       file with a large number of opening braces.
       Expected impact is denial of service or potentially
       arbitrary code execution.
 #560  CVE-2022-25314 -- Fix integer overflow in function copyString;
       only affects the encoding name parameter at parser creation
       time which is often hardcoded (rather than user input),
       takes a value in the gigabytes to trigger, and a 64-bit
       machine.  Expected impact is denial of service.
 #559  CVE-2022-25315 -- Fix integer overflow in function storeRawNames;
       needs input in the gigabytes and a 64-bit machine.
       Expected impact is denial of service or potentially
       arbitrary code execution.

https://blog.hartwork.org/posts/expat-2-4-5-released/
https://github.com/libexpat/libexpat/blob/R_2_4_5/expat/Changes

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-20 10:54:38 +01:00
Fabrice Fontaine 59a813d2a8 package/expat: fix tarball sha256
Commit ab71ac15dd forgot to update sha256

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[yann.morin.1998@free.fr: update  hash for real ;-)]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-20 10:52:44 +01:00
Fabrice Fontaine 43e2a5e11f package/x11r7/xdriver_xf86-video-mga: don't override XDRIVER_XF86_VIDEO_MGA_CONF_OPTS
XDRIVER_XF86_VIDEO_MGA_CONF_OPTS is wrongly overridden in a conditional
since commit 105c7c7573

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 22:53:11 +01:00
Fabrice Fontaine becc481460 package/socketcand: don't override SOCKETCAND_CONF_OPTS
SOCKETCAND_CONF_OPTS is wrongly overridden in a conditional since commit
53e498da2f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 22:47:47 +01:00
Fabrice Fontaine 9f96c4be57 package/perl-netaddr-ip: don't override PERL_NETADDR_IP_CONF_OPTS
PERL_NETADDR_IP_CONF_OPTS is wrongly overridden in a conditional since
commit 86658b0b18

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 22:47:45 +01:00
Fabrice Fontaine 37ba37d516 package/arp-scan: don't override ARP_SCAN_CONF_OPTS
ARP_SCAN_CONF_OPTS is wrongly overriden in a conditional since commit
df578c86ed

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 22:47:43 +01:00
Fabrice Fontaine e3c1efd5d2 package/pcre: don't override PCRE_CONF_OPTS
PCRE_CONF_OPTS is wrongly overridden in a conditional since commit
9b28d48012

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 22:47:41 +01:00
Marcus Hoffmann 1f1e32f6d7 configs/friendlyarm_nanopi_r2s_defconfig: uboot needs openssl
Fixes the following compile error:

In file included from include/bootm.h:10,
                 from tools/image-host.c:12:
include/image.h:1178:12: fatal error: openssl/evp.h: No such file or directory
 1178 | #  include <openssl/evp.h>
      |            ^~~~~~~~~~~~~~~
compilation terminated.

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

Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 22:40:27 +01:00
Giulio Benetti 0711e91498 configs/kontron_bl_imx8mm_defconfig: U-Boot requires OpenSSL
Fixes:
https://gitlab.com/buildroot.org/buildroot/-/jobs/2103784267

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Reviewed-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 22:40:20 +01:00
Moritz Bitsch 9badf18d97 package/cryptsetup: fix build failure with libgcrypt
The patch 0001-Add-check-program-for-symver-attribute.patch, introduced
in 683e8387d0, touches a autoconf relevant file which causes a
configure --recheck in the make step without proper CONF_ENV.

Running autoreconf prevents this.

Signed-off-by: Moritz Bitsch <moritz@h6t.eu>
[yann.morin.1998@free.fr: add comment,  add commit reference]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 21:39:05 +01:00
Peter Korsgaard 908e514de4 package/pkg-python.mk: drop references to PYTHON_{PATH, DIR}
With python 2.x support dropped these variables no longer exist, so
unconditionally use the python3 variant.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 21:32:42 +01:00
Fabrice Fontaine 3f5843cd07 package/libiconv: don't override LIBICONV_CONF_OPTS
LIBICONV_CONF_OPTS is wrongly overridden in a conditional since commit
0d711a64d4

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 21:29:21 +01:00
Fabrice Fontaine 293d8f727a package/urg: don't override URG_CONF_OPTS
URG_CONF_OPTS is wrongly overridden in a conditional since commit
d0433603e3

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 21:29:19 +01:00
Fabrice Fontaine e389bf186f package/xz: don't override XZ_CONF_OPTS
XZ_CONF_OPTS is wrongly overridden in a conditional since commit
0dbc17abcb

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 21:29:17 +01:00
Fabrice Fontaine 83f9f0b881 package/libgsasl: don't override LIBGSASL_CONF_OPTS
LIBGSASL_CONF_OPTS is wrongly overridden in a conditional since commit
c4ff6bf227

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 21:29:15 +01:00
Fabrice Fontaine 862db5f610 package/psmisc: don't override PSMISC_CONF_OPTS
PSMISC_CONF_OPTS is overridden in a conditional since commit
953b0f4de8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 21:29:12 +01:00
Fabrice Fontaine 09a1511abd package/libglvnd: fix LIBGLVND_CONF_OPTS
LIBGLVND_CONF_OPTS are wrongly overridden in conditionals since the
addition of the package in commit
0378e2e5d9

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-17 21:29:10 +01:00
Giulio Benetti cc9470c2d8 utils/docker-run: hide docker run command
Since this is a helper script there is not much reason to show the
command that's been issued. Furthermore, the incantation has been
slightly extended since the script was introduced.

The only interesting reason to print the command is to know what image
it is being spawned into. However, this is prominently displayed by
docker the first time the script is run, as it can't find the image
locally and has to fetch it first. Afterwards, users can still use
'docker image ls' to see what images they have locally.

So let's remove 'set -x' before running docker.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
[yann.morin.1998@free.fr: reword and expand commit log]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-16 22:55:15 +01:00
Arnout Vandecappelle (Essensium/Mind) 892834535c package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch: remove N/M
Found by check-package:
package/libusb/0002-linux_usbfs-fix-maybe-uninitialized-error.patch:4: generate your patches with 'git format-patch -N'

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:54:35 +01:00
Bernd Kuhls a14a68a57d package/kodi: fix build with python-3.10
Fixes build error:

CMake Error at /usr/share/cmake-3.18/Modules/FindPackageHandleStandardArgs.cmake:165 (message):
  Could NOT find PythonLibs (missing: PYTHON_LIBRARIES) (found suitable
  version "3.10.2", minimum required is "3.5")

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:38:21 +01:00
Fabrice Fontaine d08583faed package/libbpf: add LIBBPF_CPE_ID_VENDOR
cpe:2.3:a:libbpf_project:libbpf is a valid CPE identifier for this
package:

  https://nvd.nist.gov/products/cpe/search/results?namingFormat=2.3&keyword=cpe%3A2.3%3Aa%3Alibbpf_project%3Alibbpf

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:38:17 +01:00
Fabrice Fontaine a837937973 package/strongswan: security bump to version 5.9.5
Fixed a vulnerability in the EAP client implementation that was caused
by incorrectly handling early EAP-Success messages. It may allow to
bypass the client and in some scenarios even the server authentication,
or could lead to a denial-of-service attack. This vulnerability has been
registered as CVE-2021-45079:
https://www.strongswan.org/blog/2022/01/24/strongswan-vulnerability-(cve-2021-45079).html

https://github.com/strongswan/strongswan/releases/tag/5.9.5

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Quentin Schulz <foss+buildroot@0leil.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:38:15 +01:00
Fabrice Fontaine 63f40a109b package/safeclib: fix build with gcc 4.8
Add -std=c99 to fix the following build failure with gcc 4.8 raised
since bump to version 3.7.1 in commit
cc27267ae4:

In file included from abort_handler_s.c:35:0:
safeclib_private.h:167:18: error: anonymous variadic macros were introduced in C99 [-Werror=variadic-macros]
 #define slprintf(...) fprintf(stderr, __VA_ARGS__)
                  ^

Fixes:
 - http://autobuild.buildroot.org/results/5c3468585942879b47331e05058d25d324c8cc23

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:38:12 +01:00
Yann E. MORIN 0319170f50 support/pkg-stats: fix regression after cleanup in show-info
Commit 471ecea5ee (core/show-info: 'name' only applies to packages)
removed the 'name' field for rootfs (really, for non-package) entries,
thus breaking the pkg-stats processing.

We fix that by excluding any entry that has no 'name', on the assumption
that if it has no name, it is not a package.

Reported-by: Xogium on IRC
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:38:09 +01:00
Fabrice Fontaine d7b999e947 package/gstreamer1/gst1-plugins-base: fix build with gcc 4.8
Fix the following build failure with gcc 4.8 raised since bump to
version 1.20.0 in commit 801131157d:

../gst-libs/gst/video/video-converter.c: In function 'convert_I420_v210':
../gst-libs/gst/video/video-converter.c:3771:7: error: 'for' loop initial declarations are only allowed in C99 mode
       for (int j = width * 4 - 1; j >= 0; j--) {
       ^

Fixes:
 - http://autobuild.buildroot.org/results/c4b1449f35debcbabff7e42abe239695d4ad4d21

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:38:07 +01:00
Fabrice Fontaine e253e41ce2 package/sdl2_ttf: add harfbuzz optional dependency
harfbuzz is an optional dependency (which is enabled by default) since
version 2.0.18 and
https://github.com/libsdl-org/SDL_ttf/commit/328bbed78db496ff36720e8a809661ffb236e673

If harfbuzz is not disabled and not found, builtin harfbuzz is enabled
resulting in the following build failure without C++ since commit
f4da031a77 and
https://github.com/libsdl-org/SDL_ttf/commit/9a7ef3fb640a1f086d9b02954c3b4bbfb3578871:

configure: error: *** A compiler with support for C++11 language features is required.

Fixes:
 - http://autobuild.buildroot.org/results/3fecb96a8063b1a28703682e9373714c1c9cfa24

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:38:04 +01:00
Fabrice Fontaine 81636b1ea1 package/sdl2_ttf: disable builtin freetype2
Disable builtin freetype2 which is enabled by default since bump to
version 2.0.18 in commit f4da031a77 and
https://github.com/libsdl-org/SDL_ttf/commit/834ec54127dc9c2a12928f5fe32cf110ec4c7a7f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:38:01 +01:00
Fabrice Fontaine 997cd389eb package/sdl2_ttf: drop FREETYPE_CONFIG
FREETYPE_CONFIG is not used since version 2.0.15 and
https://github.com/libsdl-org/SDL_ttf/commit/50d72e55315e25d34f4209824275e3b1cbe6c6f8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:37:58 +01:00
Fabrice Fontaine afe11e8457 package/sudo: drop openssl workaround
Drop workaround added by commit bf899e50d8
because sudo natively supports pkg-config for searching openssl (which
is enabled by default) since version 1.9.2 and
https://github.com/sudo-project/sudo/commit/4cadd549513ef35d4d740e941576294f4491d13d

As a side-effect, this will fix the following build failure when openssl
is not installed on host (as LIBS is set before AX_PROG_CC_FOR_BUILD):

configure:8162: checking whether the C compiler works
configure:8184: /usr/bin/gcc -O2 -I/home/buildroot/autobuild/instance-2/output-1/host/include -I/home/buildroot/autobuild/instance-2/output-1/host/include -L/home/buildroot/autobuild/instance-2/output-1/host/lib -Wl,-rpath,/home/buildroot/autobuild/instance-2/output-1/host/lib conftest.c -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lssl -L/home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -pthread -latomic -lcrypto -pthread -latomic  >&5
/usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl
/usr/bin/ld: skipping incompatible /home/buildroot/autobuild/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libssl.a when searching for -lssl
/usr/bin/ld: cannot find -lssl

Fixes:
 - http://autobuild.buildroot.org/results/7a5d4dd22343be46a5ddd1c1a1a8e1799517d564

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:37:56 +01:00
Yann E. MORIN 7f2020f904 utils/docker-run: improve user experience
Currently, the docker-run script starts a container based on the
reference image, in which the user has UID:GID set to 1000:1000,
which may or may not be the same as local user uses, which may
prevent the commands in the container from creating files, which
foils the plan of using the container to run a build...

Additionally, the paths in the container differ from the paths
the user expects, as the current Buildroot tree is mounted over
the in-container user home directory. This is a bit confusing...

Finally, the container is left hanging around after the command
finishes, and thus there are as many lingering containers as the
user runs docker-run. This is not very nice...

We fix all of that (yeah, should be different patches, but meh):

  - we use --mount instead of -v, which allows us to bind-mount
    the Buildroot tree at the same place in the container, as
    Docker will create the destination if it does not exist, while
    -v seems to expect it to exist [0].

  - as a consequence, we can also set the working directory as the
    Buildroot top-directory;

  - use --user to force the same UID:GID in the container as the
    local user, so that files created in the container belong to
    the local user, and so that files from the local user are
    accessible from the container;

  - use --rm to remove the container once it terminates; starting
    a new container is very quick anyway, so it is as good as
    re-using a previous container.

[0] the documentation is not clear about that. It clearly states
that the host directory (i.e. the origin, the source) is created
if missing, but it says nothing of the destination:
    https://docs.docker.com/engine/reference/commandline/run/#mount-volume--v---read-only

Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
Cc: Luca Ceresoli <luca@lucaceresoli.net>
Cc: Giulio Benetti <giulio.benetti@benettiengineering.com>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Tested-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-16 22:27:24 +01:00
Fabrice Fontaine 6f0e2e567f package/dnsmasq: fix build with ubus and without dnssec
Fix the following build failure raised since bump to version 2.86 in
commit 5b29096f8f:

rfc1035.c: In function 'report_addresses':
rfc1035.c:978:49: error: 'struct dnsmasq_daemon' has no member named 'workspacename'
  978 |        if (!extract_name(header, len, &p, daemon->workspacename, 1, 0))
      |                                                 ^~

Fixes:
 - http://autobuild.buildroot.org/results/51242d4f532373544e3c7ea45036b8d41390b29b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-16 22:11:45 +01:00
Fabrice Fontaine c7d3f5cd9f package/qt5/qt5webkit: needs execinfo.h
qt5webkit needs execinfo.h since bump to version 5.212.0-alpha4 in
commit df0b0fe691:

/tmp/instance-1/output-1/build/qt5webkit-5.212.0-alpha4/Source/JavaScriptCore/inspector/JSGlobalObjectInspectorController.cpp:54:10: fatal error: execinfo.h: No such file or directory
   54 | #include <execinfo.h>
      |          ^~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/351529f7d928e28fa2db22c6297dc70d21db562b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-16 22:05:54 +01:00
Fabrice Fontaine b2e6e376a2 package/python-pycli: fix build with python >= 3.10
Fix the following build failure raised since bump of python3 to version
3.10.1 in commit 25b1fc2898 due to the new
"Multiple Exception types without parentheses" exception
(https://docs.python.org/3/whatsnew/3.10.html)

error:   File "/usr/lib/python3.10/site-packages/cli/app.py", line 242
    except Exception, e:
           ^^^^^^^^^^^^
SyntaxError: multiple exception types must be parenthesized

Fixes:
 - http://autobuild.buildroot.org/results/8d7b0c23472abffc9447e4a6de273bdd04486d39

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-16 22:02:17 +01:00
Yegor Yefremov d06737b27b package/libusb: fix maybe-uninitialized error
Initialize active_config to an invalid value to avoid the following
compilation error:

os/linux_usbfs.c: In function ‘op_get_configuration’:
os/linux_usbfs.c:1452:12: error: ‘active_config’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
 1452 |  *config = (uint8_t)active_config;

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Tested-by: Eugen Hristev <eugen.hristev@microchip.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-16 21:56:31 +01:00
James Hilliard 8bb2db8cb1 package/qt5/qt5location: remove unused qt5location-mapboxgl
This was only needed when the mapboxgl submodule was a separate
package(was never included in buildroot only a patch series).

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2022-02-16 14:14:17 +01:00
Waldemar Brodkorb 91f241b8e9 package/binutils: fixes glibc build compiled with -Os on x86
See here:
https://sourceware.org/bugzilla/show_bug.cgi?id=28870

Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 22:01:36 +01:00
Giulio Benetti 5194113331 configs/roc_pc_rk3399_defconfig: expand rootfs size to 120M
Default 60M for rootfs are not enough and generate a build failure, so
let's expand rootfs size to 120M.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:57:10 +01:00
Peter Seiderer 184ce3ced3 package/libv4l: v4l-utils needs C++11 support
Fixes:

  - http://autobuild.buildroot.net/results/cacd73e08cfb359d608bca807189b7bd3c5c79bd

  v4l2-ctl.cpp:53:2: warning: identifier 'nullptr' is a keyword in C++11 [-Wc++0x-compat]
  v4l2-ctl.cpp:53:37: error: 'nullptr' was not declared in this scope
  [...]
  v4l2-ctl-tuner.cpp: In function 'void parse_freq_seek(char*, v4l2_hw_freq_seek&)':
  v4l2-ctl-tuner.cpp:160:10: error: 'constexpr' does not name a type
     static constexpr const char *subopts[] = {
            ^
  v4l2-ctl-tuner.cpp:160:10: note: C++11 'constexpr' only available with -std=c++11 or -std=gnu++11

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:46:13 +01:00
Fabrice Fontaine a738ecbce4 package/mongrel2: fix build with gcc 4.8
Fix the following build failure raised since bump to version 1.13.0 in
commit b0a7bffad9:

arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0'

Fixes:
 - http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:43:11 +01:00
Fabrice Fontaine 8679f6a7e7 package/libuhttpd: depends on gcc >= 4.9
Add a dependency on gcc >= 4.9 to avoid the following build failure
with gcc 4.8.3 raised since bump to version 3.14.1 in commit
61797c52f5 and
https://github.com/zhaojh329/libuhttpd/commit/ffdf7de3a4a1f5a62aa3814ac96e889958a30840:

/home/peko/autobuild/instance-1/output-1/build/libuhttpd-3.14.1/src/cgi.c:41:5: error: initializer element is not a constant expression [-Werror]
     {"accept", strlen("accept"), "HTTP_ACCEPT"},
     ^

It should be noted that upstream rejected a patch to remove -Werror:
https://github.com/zhaojh329/libuhttpd/pull/12

Fixes:
 - http://autobuild.buildroot.org/results/a3a970a6398dcb0e4e03f4277f1a50c6b5eff7bd

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:39:58 +01:00
Fabrice Fontaine d661740201 package/libusb: add -latomic to libusb-1.0.pc if needed
libusb unconditionally uses atomic since version 1.0.25 and
https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84
resulting in the following build failure with pcsc-lite or openocd since
commit aad609936f:

checking for libusb_init... configure: error: libusb not found, use ./configure LIBUSB_LIBS=...

/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4'
collect2: error: ld returned 1 exit status

Fixes:
 - http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c
 - http://autobuild.buildroot.org/results/b59b30cbe0e27399db5c7586f369104e68a1589a

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:38:43 +01:00
Giulio Benetti 33ea4d7887 toolchain: fix gcc bug 99140 condition
Gcc bug 99140 exhibits with gcc versions:
- up to 7.x
- 9.x
- 10.x
and doesn't show up with gcc versions:
- 8.x
- 11.x
then moving BR2_TOOLCHAIN_GCC_AT_LEAST_9 to BR2_TOOLCHAIN_GCC_AT_LEAST_10
makes gcc version 9 set as working but it's not. So let's back substitute
BR2_TOOLCHAIN_GCC_AT_LEAST_10 with BR2_TOOLCHAIN_GCC_AT_LEAST_9.

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:38:27 +01:00
Giulio Benetti 132eec5c47 package/systemd: don't treat ld warnings as errors
Nios2 ld emits warnings like:
'
/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/../../../../nios2-linux-gnu/bin/ld: FDE encoding in /home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/nios2-linux-gnu/7.3.1/libgcc.a(_umoddi3.o)(.eh_frame) prevents .eh_frame_hdr table being created.
'
Since '-Wl,--fatal-warnings' is passed by default, build fails, so don't
treat warnings as errors by appending "-Wl,--no-fatal-warnings" to
SYSTEMD_LDFLAGS the same way I've done for Microblaze in commit:
https://git.buildroot.net/buildroot/commit/?id=cc53d5357d84ff9b78d76e45ce216061df8a37c1

Fixes:
http://autobuild.buildroot.net/results/5fc884e11e46ab165ea21c8e8f2901516d79ff80/

Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:38:22 +01:00
Fabrice Fontaine 261bb9a17a package/python-regex: fix license
License is Apache-2.0 since bump to version 2021.4.4 in commit
d973fac7ca and
https://github.com/mrabarnett/mrab-regex/commit/b693a1fba731a9aa0dc6ae37b441267d4b7b0419

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:37:43 +01:00
Fabrice Fontaine 9b0d3b1243 package/keepalived: fix build with gcc < 4.9
Disable track-process to avoid the following build failure with
gcc < 4.9 raised since bump to version 2.2.7 in commit
79f631000f as suggested by upstream in
https://github.com/acassen/keepalived/issues/2094:

In file included from ../../lib/rbtree.h:24:0,
                 from ../../lib/rbtree_ka.h:26,
                 from ../../lib/scheduler.h:40,
                 from ../../lib/notify.h:31,
                 from ../../keepalived/include/vrrp.h:41,
                 from ../../keepalived/include/track_process.h:31,
                 from track_process.c:50:
../../lib/rbtree_types.h:31:25: error: initializer element is not constant
 #define RB_ROOT (struct rb_root) { NULL, }
                         ^

Fixes:
 - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:15:24 +01:00
Fabrice Fontaine 53b790631e package/keepalived: fix build with kernel < 3.14
Fix the following build failure with kernel < 3.14 raised since bump to
version 2.27 in commit 79f631000f:

vrrp_nftables.c: In function 'setup_rule_move_igmp':
vrrp_nftables.c:1226:15: error: 'NFT_META_L4PROTO' undeclared (first use in this function)
   add_meta(r, NFT_META_L4PROTO, NFT_REG_1);
               ^

Fixes:
 - http://autobuild.buildroot.org/results/2132570fb0407abc0e70146d771471e13ef10237

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:14:27 +01:00
Fabrice Fontaine a715593d94 package/resiprocate: fix build of rend with gcc 11
Fix the following build failure of rend with gcc 11:

/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/riscv32-buildroot-linux-gnu/include/c++/11.2.0/bits/stl_tree.h:770:15: error: static assertion failed: comparison object must be invocable as const
  770 |               is_invocable_v<const _Compare&, const _Key&, const _Key&>,
      |               ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/ad9d89fefe1a667daa123397a072bf130bfa03a7

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:09:37 +01:00
Fabrice Fontaine 6d5061c711 package/neon: fix ssl build without threads
Fix the following ssl build failure without threads raised since bump to
version 0.32.2 in commit 029a6dc3e3 and
https://github.com/notroj/neon/commit/281c84fc3996c757efdf6e9b3f906d7a1fc08b1d:

ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory
   43 | #include <pthread.h>
      |          ^~~~~~~~~~~

Fixes:
 - http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 21:04:40 +01:00
Fabrice Fontaine 3e4d439113 package/guile: fix build with glibc 2.34
Fix the following build failure with glibc 2.34 raised since bump to
version 3.0.7 in commit d8bee3950a:

In file included from regexec.c:1368,
                 from regex.c:74:
./malloc/dynarray-skeleton.c:195:24: error: expected declaration specifiers or '...' before '(' token
  195 | __attribute_nonnull__ ((1))
      |                        ^

https://lists.gnu.org/archive/html/bug-guile/2021-08/msg00003.html

Fixes:
 - http://autobuild.buildroot.org/results/27a2a69e1177f15daec65eca035b99ea5355c34b

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 20:57:56 +01:00
Giulio Benetti fd78150e89 configs/pcengines_apu2_defconfig: linux needs host libelf
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-14 20:56:51 +01:00
Luca Ceresoli cef07c9358 utils/docker-run: allow interactive use
Without -i, the container cannot be used interactively. Allow using it as
in:

  $ ./utils/docker-run
  + exec docker run -v /home/ceresoli/devel/buildroot:/home/br-user -it registry.gitlab.com/buildroot.org/buildroot/base:20220206.1756
  br-user@1e9508a4ccbb:~$ ls
  arch  board  boot  CHANGES  Config.in  Config.in.legacy  configs  COPYING  DEVELOPERS  docs  fs  linux	Makefile  Makefile.legacy  output  package  README  support  system  toolchain	utils
  br-user@1e9508a4ccbb:~$

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-14 17:56:49 +01:00
Luca Ceresoli 61912cc89a utils/docker-run: use portable bash shebang
/usr/bin/bash does not exist on Ubuntu 2018.04. Use the more portable
alternative "#!/usr/bin/env bash" which we are already using in quite
a few scripts.

Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net>
Fixes: 242e9d72e7 ("utils/docker-run: new script")
[yann.morin.1998@free.fr: use "#!/usr/bin/env bash", not "@!/bin/bash"]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-14 17:45:16 +01:00
Fabrice Fontaine 38b5f2069b package/kodi: add bluetooth dependency comment
Commit 43122d64e0 forgot to add bluetooth
dependency comment

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-14 13:05:24 +01:00
Fabrice Fontaine 81cb8a853b package/bluez5_utils: set BLUEZ5_UTILS_AUTORECONF
Commit 572d08ee4a forgot to set
BLUEZ5_UTILS_AUTORECONF resulting in the following build failure:

/home/peko/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sh4-buildroot-linux-uclibc/10.3.0/../../../../sh4-buildroot-linux-uclibc/bin/ld: gobex/gobex-packet.o: in function `g_obex_packet_set_data':
gobex-packet.c:(.text+0x698): undefined reference to `util_memdup'

It should be noted that previous commit didn't fix any build failure
with libglib >= 2.69. It only fixes the following warning:

profiles/battery/battery.c: In function 'read_initial_battery_level_cb':
profiles/battery/battery.c:162:2: warning: 'g_memdup' is deprecated (declared at /home/buildroot/autobuild/instance-0/output-1/host/bin/../arm-buildroot-linux-gnueabi/sysroot/usr/include/glib-2.0/glib/gstrfuncs.h:257): Use 'g_memdup2' instead [-Wdeprecated-declarations]
  batt->initial_value = g_memdup(value, length);
  ^

So an other option would be to revert this commit.

The 'real' build error that previous commit tried to fix was raised
because rand was replaced by getrandom since
https://git.kernel.org/pub/scm/bluetooth/bluez.git/log/?qt=grep&q=getrandom
but getrandom is not available until glibc 2.25:

plugins/autopair.c:20:24: fatal error: sys/random.h: No such file or directory
 #include <sys/random.h>
                        ^

Fixes:
 - http://autobuild.buildroot.org/results/46f7dbfe1d80c7622d670ba1ac957e9e6077eb9f

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2022-02-14 12:52:21 +01:00
Fabrice Fontaine 115ad9c548 package/rygel: gobject-introspection is mandatory
vapi (and gobject-introspection) is mandatory since bump to version
0.40.2 in commit 6acdbb81c8:

valac -C --pkg posix --pkg libxml-2.0 --pkg gmodule-2.0 --pkg gio-2.0 --pkg gssdp-1.2 --pkg gee-0.8 --pkg gupnp-1.2 --target-glib ' 2.56' --pkg glib-2.0 --color=always --directory src/librygel-core/librygel-core-2.6.so.2.0.4.p --basedir ../src/librygel-core --library rygel-core-2.6 --header src/librygel-core/rygel-core.h --vapi ../rygel-core-2.6.vapi --gir ../Rygel-2.6.gir ../src/librygel-core/rygel-build-config.vapi ../src/librygel-core/rygel-connection-manager.vala ../src/librygel-core/rygel-basic-management.vala ../src/librygel-core/rygel-basic-management-test.vala ../src/librygel-core/rygel-basic-management-test-ping.vala ../src/librygel-core/rygel-basic-management-test-nslookup.vala ../src/librygel-core/rygel-basic-management-test-traceroute.vala ../src/librygel-core/rygel-description-file.vala ../src/librygel-core/rygel-dlna-profile.vala ../src/librygel-core/rygel-energy-management.vala ../src/librygel-core/rygel-root-device.vala ../src/librygel-core/rygel-root-device-factory.v
 ala ../src/librygel-core/rygel-dbus-interface.vala ../src/librygel-core/rygel-log-handler.vala ../src/librygel-core/rygel-meta-config.vala ../src/librygel-core/rygel-plugin-loader.vala ../src/librygel-core/rygel-recursive-module-loader.vala ../src/librygel-core/rygel-plugin.vala ../src/librygel-core/rygel-resource-info.vala ../src/librygel-core/rygel-media-device.vala ../src/librygel-core/rygel-configuration.vala ../src/librygel-core/rygel-base-configuration.vala ../src/librygel-core/rygel-cmdline-config.vala ../src/librygel-core/rygel-environment-config.vala ../src/librygel-core/rygel-user-config.vala ../src/librygel-core/rygel-state-machine.vala ../src/librygel-core/rygel-v1-hacks.vala ../src/librygel-core/rygel-icon-info.vala ../src/librygel-core/rygel-xml-utils.vala ../src/librygel-core/rygel-plugin-information.vala
error: Package `gssdp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories
error: Package `gupnp-1.2' not found in specified Vala API directories or GObject-Introspection GIR directories

Depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES instead of selecting
it to avoid the following recursive dependency:

package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected!
package/gstreamer1/gstreamer1/Config.in:5:	symbol BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1
package/rygel/Config.in:46:	symbol BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1 is part of choice <choice>
package/rygel/Config.in:39:	choice <choice> contains symbol <choice>
package/rygel/Config.in:39:	choice <choice> contains symbol BR2_PACKAGE_RYGEL
package/rygel/Config.in:1:	symbol BR2_PACKAGE_RYGEL depends on BR2_PACKAGE_PYTHON3
package/python3/Config.in:5:	symbol BR2_PACKAGE_PYTHON3 is selected by BR2_PACKAGE_JACK2_DBUS
package/jack2/Config.in:35:	symbol BR2_PACKAGE_JACK2_DBUS depends on BR2_PACKAGE_JACK2
package/jack2/Config.in:1:	symbol BR2_PACKAGE_JACK2 is selected by BR2_PACKAGE_FLUIDSYNTH_JACK2
package/fluidsynth/Config.in:37:	symbol BR2_PACKAGE_FLUIDSYNTH_JACK2 depends on BR2_PACKAGE_FLUIDSYNTH
package/fluidsynth/Config.in:1:	symbol BR2_PACKAGE_FLUIDSYNTH is selected by BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH
package/gstreamer1/gst1-plugins-bad/Config.in:425:	symbol BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FLUIDSYNTH depends on BR2_PACKAGE_GSTREAMER1

Fixes:
 - http://autobuild.buildroot.org/results/027ce84895fab6fb251dd37cd5cfb7169287a2de

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
2022-02-13 20:59:12 +01:00
100 changed files with 15134 additions and 165 deletions
+21
View File
@@ -1,3 +1,24 @@
2022.02-rc2, released February 20th, 2022
Fixes all over the tree.
Defconfigs: Friendlyarm Nanopi R2S: Fix U-Boot build, Kontron
BL i.MX8M Mini: Fix U-Boot build, PC Engines APU2: Fix Linux
build, ROC-RK3399-PC: Bump rootfs size to fix build
Updated/fixed packages: apache, apparmor, apr-util, arp-scan,
binutils, bluez5_utils, connman, cryptsetup, dnsmasq,
dovecot-pigeonhole, expat, gdk-pixbuf, gst1-plugins-base,
guile, keepalived, kodi, libbpf, libglvnd, libgsasl, libiconv,
librsvg, libuhttpd, libusb, libv4l, luasyslog, mongrel2, neon,
pcre, perl-netaddr-ip, php, psmisc, python-ipython,
python-pycli, python-pygame, python-regex, python-twisted,
qt5location, qt5webkit, resiprocate, rygel, safeclib,
sdl2_ttf, socketcand, strongswan, sudo, systemd, toolchain,
urg, webkitgtk, wireless-regdb, wpewebkit,
xdriver_xf86-video-{ati,mach64,mga,r128,savage,tdfx}, xz, zfs,
zsh
2022.02-rc1, released February 13th, 2022
Numerous package updates and many (80) new packages.
+2 -2
View File
@@ -92,9 +92,9 @@ all:
.PHONY: all
# Set and export the version string
export BR2_VERSION := 2022.02-rc1
export BR2_VERSION := 2022.02-rc2
# Actual time the release is cut (for reproducible builds)
BR2_VERSION_EPOCH = 1644782000
BR2_VERSION_EPOCH = 1645395000
# Save running make version since it's clobbered by the make package
RUNNING_MAKE_VERSION := $(MAKE_VERSION)
+1
View File
@@ -30,6 +30,7 @@ BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2021.10"
BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nanopi-r2s-rk3328"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31_ELF=y
BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
+1
View File
@@ -45,6 +45,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="kontron-sl-mx8mm"
BR2_TARGET_UBOOT_NEEDS_DTC=y
BR2_TARGET_UBOOT_NEEDS_PYTHON3=y
BR2_TARGET_UBOOT_NEEDS_PYLIBFDT=y
BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31=y
BR2_TARGET_UBOOT_NEEDS_ATF_BL31_BIN=y
BR2_TARGET_UBOOT_NEEDS_IMX_FIRMWARE=y
+1
View File
@@ -8,6 +8,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.16"
BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/pcengines/apu2/linux.config"
BR2_LINUX_KERNEL_NEEDS_HOST_LIBELF=y
# Default hostname and TTY
BR2_TARGET_GENERIC_HOSTNAME="apu2"
+1 -1
View File
@@ -45,7 +45,7 @@ BR2_TARGET_GENERIC_HOSTNAME="roc-rk3399-pc"
BR2_TARGET_GENERIC_ISSUE="Welcome to ROC-RK3399-PC!"
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="64M"
BR2_TARGET_ROOTFS_EXT2_SIZE="120M"
BR2_PACKAGE_HOST_DOSFSTOOLS=y
BR2_PACKAGE_HOST_GENIMAGE=y
BR2_PACKAGE_HOST_MTOOLS=y
+9 -9
View File
@@ -76,37 +76,37 @@
</div>
</div>
<h3 style="text-align: center;">Latest release candidate: <b>2022.02-rc1</b></h3>
<h3 style="text-align: center;">Latest release candidate: <b>2022.02-rc2</b></h3>
<div class="row mt centered">
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2022.02-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2022.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2022.02-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2022.02-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
</div>
</div>
</div>
<h3><a href="/downloads/buildroot-2022.02-rc1.tar.gz">buildroot-2022.02-rc1.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2022.02-rc1.tar.gz.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2022.02-rc2.tar.gz">buildroot-2022.02-rc2.tar.gz</a></h3>
<p><a href="/downloads/buildroot-2022.02-rc2.tar.gz.sign">PGP signature</a></p>
</div>
<div class="col-sm-6">
<div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
<div class="flipper">
<div class="front">
<a href="/downloads/buildroot-2022.02-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2022.02-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
</div>
<div class="back">
<a href="/downloads/buildroot-2022.02-rc1.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
<a href="/downloads/buildroot-2022.02-rc2.tar.bz2"><img src="images/package.png" width="180" alt=""></a>
</div>
</div>
</div>
<h3><a href="/downloads/buildroot-2022.02-rc1.tar.bz2">buildroot-2022.02-rc1.tar.bz2</a></h3>
<p><a href="/downloads/buildroot-2022.02-rc1.tar.bz2.sign">PGP signature</a></p>
<h3><a href="/downloads/buildroot-2022.02-rc2.tar.bz2">buildroot-2022.02-rc2.tar.bz2</a></h3>
<p><a href="/downloads/buildroot-2022.02-rc2.tar.bz2.sign">PGP signature</a></p>
</div>
</div>
+21
View File
@@ -9,6 +9,27 @@
<h2>News</h2>
<ul class="timeline">
<li>
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
<div class="timeline-heading">
<h4 class="timeline-title">2022.02-rc2 released</h4>
<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>20 February 2022</small></p>
</div>
<div class="timeline-body">
<p>2022.02-rc2 has been released with more cleanups and build fixes. See the
<a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2022.02-rc2">CHANGES</a>
file for details.</p>
<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
<a href="/downloads/buildroot-2022.02-rc2.tar.bz2">2022.02-rc2
release candidate</a>, and report any problems found to the
<a href="support.html">mailing list</a> or
<a href="https://bugs.buildroot.org">bug tracker</a>.</p>
</div>
</div>
</li>
<li class="timeline-inverted">
<div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
<div class="timeline-panel">
-8
View File
@@ -19,14 +19,6 @@ APACHE_INSTALL_STAGING = YES
APACHE_AUTORECONF = YES
APACHE_DEPENDENCIES = apr apr-util pcre
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
define APACHE_FIXUP_APR_LIBTOOL
$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apache/@g" \
$(STAGING_DIR)/usr/build-1/libtool
endef
APACHE_POST_PREPARE_HOOKS += APACHE_FIXUP_APR_LIBTOOL
endif
APACHE_CONF_ENV= \
ap_cv_void_ptr_lt_long=no \
PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config
-10
View File
@@ -54,16 +54,6 @@ ifeq ($(BR2_PACKAGE_APACHE),y)
APPARMOR_DEPENDENCIES += apache
APPARMOR_TOOLS += changehat/mod_apparmor
APPARMOR_MAKE_OPTS += APXS=$(STAGING_DIR)/usr/bin/apxs
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
define APPARMOR_FIXUP_APXS
$(SED) "s@$(PER_PACKAGE_DIR)/[^/]\+/@$(PER_PACKAGE_DIR)/apparmor/@g" \
$(STAGING_DIR)/usr/bin/apxs \
$(STAGING_DIR)/usr/build/config_vars.mk \
$(STAGING_DIR)/usr/build-1/libtool
endef
APPARMOR_POST_CONFIGURE_HOOKS += APPARMOR_FIXUP_APXS
endif
endif
define APPARMOR_BUILD_CMDS
-14
View File
@@ -17,20 +17,6 @@ APR_UTIL_CONF_OPTS = \
--with-apr=$(STAGING_DIR)/usr/bin/apr-1-config
APR_UTIL_CONFIG_SCRIPTS = apu-1-config
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
define APR_UTIL_FIX_LIBTOOL
$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
$(STAGING_DIR)/usr/build-1/libtool
endef
APR_UTIL_POST_PREPARE_HOOKS += APR_UTIL_FIX_LIBTOOL
define APR_UTIL_FIX_RULES_MK
$(SED) 's,$(PER_PACKAGE_DIR)/apr/,$(PER_PACKAGE_DIR)/apr-util/,g' \
$(@D)/build/rules.mk
endef
APR_UTIL_POST_CONFIGURE_HOOKS += APR_UTIL_FIX_RULES_MK
endif
# When iconv is available, then use it to provide charset conversion
# features.
APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
+1 -1
View File
@@ -12,7 +12,7 @@ ARP_SCAN_DEPENDENCIES = libpcap
ARP_SCAN_AUTORECONF = YES
ifeq ($(BR2_STATIC_LIBS),y)
ARP_SCAN_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
ARP_SCAN_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`"
endif
ARP_SCAN_CONF_ENV = pgac_cv_snprintf_long_long_int_format='%lld'
@@ -0,0 +1,46 @@
From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 7 Feb 2022 15:22:19 -0800
Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols
GOT32 relocations are allowed since absolute value + addend is stored in
the GOT slot.
Tested on glibc 2.35 build with GCC 11.2 and -Os.
bfd/
PR ld/28870
* elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32
relocations.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 7ac2411fc80..d00dc45677b 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
irel = *rel;
/* Only allow relocations against absolute symbol, which can be
- resolved as absolute value + addend. GOTPCREL relocations
- are allowed since absolute value + addend is stored in the
- GOT slot. */
+ resolved as absolute value + addend. GOTPCREL and GOT32
+ relocations are allowed since absolute value + addend is
+ stored in the GOT slot. */
if (bed->target_id == X86_64_ELF_DATA)
{
r_type &= ~R_X86_64_converted_reloc_bit;
@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
else
valid_p = (r_type == R_386_32
|| r_type == R_386_16
- || r_type == R_386_8);
+ || r_type == R_386_8
+ || r_type == R_386_GOT32
+ || r_type == R_386_GOT32X);
if (valid_p)
*no_dynreloc_p = true;
@@ -0,0 +1,53 @@
From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 7 Feb 2022 15:22:19 -0800
Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols
GOT32 relocations are allowed since absolute value + addend is stored in
the GOT slot.
Tested on glibc 2.35 build with GCC 11.2 and -Os.
bfd/
PR ld/28870
* elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32
relocations.
ld/
PR ld/28870
* testsuite/ld-i386/i386.exp: Run pr28870.
* testsuite/ld-i386/pr28870.d: New file.
* testsuite/ld-i386/pr28870.s: Likewise.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 7ac2411fc80..d00dc45677b 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
irel = *rel;
/* Only allow relocations against absolute symbol, which can be
- resolved as absolute value + addend. GOTPCREL relocations
- are allowed since absolute value + addend is stored in the
- GOT slot. */
+ resolved as absolute value + addend. GOTPCREL and GOT32
+ relocations are allowed since absolute value + addend is
+ stored in the GOT slot. */
if (bed->target_id == X86_64_ELF_DATA)
{
r_type &= ~R_X86_64_converted_reloc_bit;
@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
else
valid_p = (r_type == R_386_32
|| r_type == R_386_16
- || r_type == R_386_8);
+ || r_type == R_386_8
+ || r_type == R_386_GOT32
+ || r_type == R_386_GOT32X);
if (valid_p)
*no_dynreloc_p = true;
@@ -0,0 +1,47 @@
From 30a954525f4e53a9cd50a1a8a6f201c7cf6595c7 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Mon, 7 Feb 2022 15:22:19 -0800
Subject: [PATCH] i386: Allow GOT32 relocations against ABS symbols
GOT32 relocations are allowed since absolute value + addend is stored in
the GOT slot.
Tested on glibc 2.35 build with GCC 11.2 and -Os.
bfd/
PR ld/28870
* elfxx-x86.c (_bfd_elf_x86_valid_reloc_p): Also allow GOT32
relocations.
Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 7ac2411fc80..d00dc45677b 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -1942,9 +1942,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
irel = *rel;
/* Only allow relocations against absolute symbol, which can be
- resolved as absolute value + addend. GOTPCREL relocations
- are allowed since absolute value + addend is stored in the
- GOT slot. */
+ resolved as absolute value + addend. GOTPCREL and GOT32
+ relocations are allowed since absolute value + addend is
+ stored in the GOT slot. */
if (bed->target_id == X86_64_ELF_DATA)
{
r_type &= ~R_X86_64_converted_reloc_bit;
@@ -1965,7 +1965,9 @@ _bfd_elf_x86_valid_reloc_p (asection *input_section,
else
valid_p = (r_type == R_386_32
|| r_type == R_386_16
- || r_type == R_386_8);
+ || r_type == R_386_8
+ || r_type == R_386_GOT32
+ || r_type == R_386_GOT32X);
if (valid_p)
*no_dynreloc_p = true;
+2
View File
@@ -13,6 +13,8 @@ BLUEZ5_UTILS_LICENSE = GPL-2.0+, LGPL-2.1+
BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB
BLUEZ5_UTILS_CPE_ID_VENDOR = bluez
BLUEZ5_UTILS_CPE_ID_PRODUCT = bluez
# We're patching Makefile.am
BLUEZ5_UTILS_AUTORECONF = YES
BLUEZ5_UTILS_DEPENDENCIES = \
$(if $(BR2_PACKAGE_BLUEZ5_UTILS_HEADERS),bluez5_utils-headers) \
+5
View File
@@ -109,4 +109,9 @@ else
CONNMAN_CONF_OPTS += --disable-client
endif
ifeq ($(BR2_PACKAGE_LIBEXECINFO),y)
CONNMAN_DEPENDENCIES += libexecinfo
CONNMAN_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lexecinfo"
endif
$(eval $(autotools-package))
+4
View File
@@ -17,6 +17,10 @@ CRYPTSETUP_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (library)
CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL
CRYPTSETUP_CPE_ID_VENDOR = cryptsetup_project
CRYPTSETUP_INSTALL_STAGING = YES
# 0001-Add-check-program-for-symver-attribute.patch
CRYPTSETUP_AUTORECONF = YES
CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) $(TARGET_NLS_LIBS)"
CRYPTSETUP_CONF_OPTS += --enable-blkid --enable-libargon2
@@ -0,0 +1,34 @@
From 2c60441239e1c10c4987cb586653b1ea08f703c0 Mon Sep 17 00:00:00 2001
From: Simon Kelley <simon@thekelleys.org.uk>
Date: Tue, 28 Sep 2021 23:42:15 +0100
Subject: [PATCH] Fix FTBFS when CONNTRACK and UBUS but not DNSSEC compile
options selected.
[Retrieved from:
https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=commit;h=2c60441239e1c10c4987cb586653b1ea08f703c0]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
src/dnsmasq.h | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/dnsmasq.h b/src/dnsmasq.h
index c8a918a..3fdc1b0 100644
--- a/src/dnsmasq.h
+++ b/src/dnsmasq.h
@@ -1173,9 +1173,12 @@ extern struct daemon {
char *packet; /* packet buffer */
int packet_buff_sz; /* size of above */
char *namebuff; /* MAXDNAME size buffer */
+#if (defined(HAVE_CONNTRACK) && defined(HAVE_UBUS)) || defined(HAVE_DNSSEC)
+ /* CONNTRACK UBUS code uses this buffer, as well as DNSSEC code. */
+ char *workspacename;
+#endif
#ifdef HAVE_DNSSEC
char *keyname; /* MAXDNAME size buffer */
- char *workspacename; /* ditto */
unsigned long *rr_status; /* ceiling in TTL from DNSSEC or zero for insecure */
int rr_status_sz;
int dnssec_no_time_check;
--
2.20.1
@@ -15,12 +15,4 @@ DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot
DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib
ifeq ($(BR2_PER_PACKAGE_DIRECTORIES),y)
define DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG
$(SED) 's,$(PER_PACKAGE_DIR)/dovecot/,$(PER_PACKAGE_DIR)/dovecot-pigeonhole/,g' \
$(STAGING_DIR)/usr/lib/dovecot-config
endef
DOVECOT_PIGEONHOLE_PRE_CONFIGURE_HOOKS = DOVECOT_PIGEONHOLE_FIXUP_DOVECOT_CONFIG
endif
$(eval $(autotools-package))
+4 -4
View File
@@ -1,7 +1,7 @@
# From https://sourceforge.net/projects/expat/files/expat/2.4.4/
md5 a712d23b7afb32e7527cf0b3fd8f12ac expat-2.4.4.tar.xz
sha1 6028b04d3505fc519c4c7c6bd67e1ad1a08cd7b6 expat-2.4.4.tar.xz
# From https://sourceforge.net/projects/expat/files/expat/2.4.6/
md5 22a30c888752fdda9f8dd1b7281c54b0 expat-2.4.6.tar.xz
sha1 26e223c4795c242814b0e3299a5027c22b9dc733 expat-2.4.6.tar.xz
# Locally calculated
sha256 b1f9f1b1a5ebb0acaa88c9ff79bfa4e145823b78aa5185e5c5d85f060824778a expat-2.4.3.tar.xz
sha256 de55794b7a9bc214852fdc075beaaecd854efe1361597e6268ee87946951289b expat-2.4.6.tar.xz
sha256 8c6b5b6de8fae20b317f4992729abc0e520bfba4c7606cd1e9eeb87418eebdec COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
EXPAT_VERSION = 2.4.4
EXPAT_VERSION = 2.4.6
EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION)
EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.xz
EXPAT_INSTALL_STAGING = YES
+1
View File
@@ -26,6 +26,7 @@ HOST_GDK_PIXBUF_CONF_OPTS = \
-Dgio_sniffing=false \
-Dinstalled_tests=false \
-Dintrospection=disabled \
-Drelocatable=true \
-Dman=false
ifeq ($(BR2_STATIC_LIBS),y)
@@ -11,6 +11,8 @@ GST1_PLUGINS_BASE_INSTALL_STAGING = YES
GST1_PLUGINS_BASE_LICENSE_FILES = COPYING
GST1_PLUGINS_BASE_LICENSE = LGPL-2.1+
GST1_PLUGINS_BASE_CFLAGS = $(TARGET_CFLAGS) -std=gnu99
GST1_PLUGINS_BASE_CONF_OPTS = \
-Dexamples=disabled \
-Dtests=disabled \
File diff suppressed because it is too large Load Diff
+5 -2
View File
@@ -9,14 +9,17 @@ GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz
GUILE_SITE = $(BR2_GNU_MIRROR)/guile
GUILE_INSTALL_STAGING = YES
# For 0002-calculate-csqrt_manually.patch and
# 0003-Makefile.am-fix-build-without-makeinfo.patch
# 0003-Makefile.am-fix-build-without-makeinfo.patch and
# 0004-Update-gnulib-to-8f4538a53d64054ae2fc8b86c0f87c418c6176e6.patch
GUILE_AUTORECONF = YES
GUILE_LICENSE = LGPL-3.0+
GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER
GUILE_CPE_ID_VENDOR = gnu
GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf
HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext
HOST_GUILE_DEPENDENCIES = \
host-libunistring host-libffi host-gmp host-bdwgc host-flex \
host-pkgconf host-gettext host-gperf
ifeq ($(BR2_ENABLE_LOCALE),)
GUILE_DEPENDENCIES += libiconv
@@ -0,0 +1,76 @@
From edc71b19c619fdc1d71df10a2d0e8f5822965d69 Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Tue, 8 Feb 2022 14:58:49 +0000
Subject: [PATCH] vrrp: nft didn't support meta l4proro until Linux 3.14
For Linux 3.13 (first version to support nftables), we instead specify:
@nh,48,8 58
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
[Retrieved (and updated to drop update of README.kernel_versions) from:
https://github.com/acassen/keepalived/commit/edc71b19c619fdc1d71df10a2d0e8f5822965d69]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
README.kernel_versions | 1 +
configure.ac | 5 +++++
keepalived/vrrp/vrrp_nftables.c | 16 ++++++++++++++--
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 350a9f4e9..bc643dbf1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1754,6 +1754,11 @@ if test .${enable_nftables} != .no; then
],[
AC_MSG_RESULT(no)
])
+
+ # nft l4proto from Linux 3.14
+ AC_CHECK_DECLS([NFT_META_L4PROTO], [], [],
+ [#include <linux/netfilter/nf_tables.h>])
+
# nft dup from Linux 4.3
AC_CHECK_DECLS([NFTA_DUP_MAX], [], [],
[#include <linux/netfilter/nf_tables.h>])
diff --git a/keepalived/vrrp/vrrp_nftables.c b/keepalived/vrrp/vrrp_nftables.c
index d3ea39db3..8b5095ad4 100644
--- a/keepalived/vrrp/vrrp_nftables.c
+++ b/keepalived/vrrp/vrrp_nftables.c
@@ -1191,6 +1191,8 @@ setup_rule_move_igmp(uint8_t family, const char *table,
otherwise:
nft add rule ip keepalived out ip protocol igmp [meta oifkind macvlan] oif @vmac_set drop
nft add rule ip6 keepalived out icmpv6 type mld2-listener-report [meta oifkind macvlan] oif @vmac_set drop
+ *
+ * Note: on 3.13 kernels, icmpv6 is specified as @nh,48,8 58
*/
struct nftnl_rule *r = NULL;
uint64_t handle_num;
@@ -1223,7 +1225,12 @@ setup_rule_move_igmp(uint8_t family, const char *table,
offsetof(struct iphdr, daddr), sizeof(struct in_addr));
#endif
} else {
- add_meta(r, NFT_META_L4PROTO, NFT_REG_1);
+#if HAVE_DECL_NFT_META_L4PROTO
+ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */
+#else
+ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
+ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt));
+#endif
protocol = IPPROTO_ICMPV6;
add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol));
add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1,
@@ -1279,7 +1286,12 @@ setup_rule_drop_router_solicit(const char *table, const char *chain,
nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num);
}
- add_meta(r, NFT_META_L4PROTO, NFT_REG_1);
+#if HAVE_DECL_NFT_META_L4PROTO
+ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */
+#else
+ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
+ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt));
+#endif
protocol = IPPROTO_ICMPV6;
add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &protocol, sizeof(protocol));
add_payload(r, NFT_PAYLOAD_TRANSPORT_HEADER, NFT_REG_1,
@@ -0,0 +1,40 @@
From 50e8a8d56cd5a3d7184b035708865302bbc7ef69 Mon Sep 17 00:00:00 2001
From: Quentin Armitage <quentin@armitage.org.uk>
Date: Tue, 8 Feb 2022 17:43:49 +0000
Subject: [PATCH] ipvs: nft didn't support meta l4proro until Linux 3.14
For Linux 3.13 (first version to support nftables), we instead specify:
ipv4: @nh,72,8 PROTO
ipv6: @nh,48,8 PROTO
Signed-off-by: Quentin Armitage <quentin@armitage.org.uk>
[Retrieved from:
https://github.com/acassen/keepalived/commit/50e8a8d56cd5a3d7184b035708865302bbc7ef69]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
keepalived/check/check_nftables.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/keepalived/check/check_nftables.c b/keepalived/check/check_nftables.c
index 2d163ac14..45831203b 100644
--- a/keepalived/check/check_nftables.c
+++ b/keepalived/check/check_nftables.c
@@ -150,7 +150,16 @@ setup_rule_set_mark(uint8_t family, const char *table,
nftnl_rule_set_u64(r, NFTNL_RULE_POSITION, handle_num);
}
- add_meta(r, NFT_META_L4PROTO, NFT_REG_1);
+#if HAVE_DECL_NFT_META_L4PROTO
+ add_meta(r, NFT_META_L4PROTO, NFT_REG_1); /* From Linux 3.14 */
+#else
+ if (family == NFPROTO_IPV4)
+ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
+ offsetof(struct iphdr, protocol), sizeof(((struct iphdr *)NULL)->protocol));
+ else
+ add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
+ offsetof(struct ip6_hdr, ip6_nxt), sizeof(((struct ip6_hdr *)NULL)->ip6_nxt));
+#endif
add_cmp(r, NFT_REG_1, NFT_CMP_EQ, &l4_protocol, sizeof(l4_protocol));
if (family == NFPROTO_IPV4)
add_payload(r, NFT_PAYLOAD_NETWORK_HEADER, NFT_REG_1,
+6
View File
@@ -11,6 +11,8 @@ KEEPALIVED_LICENSE = GPL-2.0+
KEEPALIVED_LICENSE_FILES = COPYING
KEEPALIVED_CPE_ID_VENDOR = keepalived
KEEPALIVED_CONF_OPTS = --disable-hardening
# We're patching configure.ac
KEEPALIVED_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_JSON_C),y)
KEEPALIVED_DEPENDENCIES += json-c
@@ -54,4 +56,8 @@ else
KEEPALIVED_CONF_OPTS += --disable-nftables
endif
ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_9),)
KEEPALIVED_CONF_OPTS += --disable-track-process
endif
$(eval $(autotools-package))
+135
View File
@@ -0,0 +1,135 @@
From 52f44ec5c7b728a6afaca867e8d815fced2012ec Mon Sep 17 00:00:00 2001
From: fuzzard <fuzzard@kodi.tv>
Date: Sat, 31 Jul 2021 19:22:08 +1000
Subject: [PATCH] [cmake] findpython
use cmakes (3.12+) FindPython3 module.
Provide cmake vars for user to overide specific version, and search path
Backport of https://github.com/xbmc/xbmc/pull/20045
Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
CMakeLists.txt | 4 +-
cmake/modules/FindPython.cmake | 71 ++++++++++++++++++++++++++--------
2 files changed, 56 insertions(+), 19 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2d5369798d..9bed54ef40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.12)
if(WIN32)
# Version 3.15 is required to use "PREPEND" for dependencies
cmake_minimum_required(VERSION 3.15)
@@ -187,8 +187,6 @@ core_require_dep(${required_deps})
find_package(TexturePacker REQUIRED)
find_package(JsonSchemaBuilder REQUIRED)
-SET(PYTHON_VERSION 3.8)
-
if(ENABLE_MARIADBCLIENT AND NOT ENABLE_MARIADBCLIENT STREQUAL AUTO AND ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO)
MESSAGE(FATAL_ERROR "You can not use MySql and MariaDB at the same time. Disable one by adding -DENABLE_MYSQLCLIENT=OFF or -DENABLE_MARIADBCLIENT=OFF.")
elseif(ENABLE_MYSQLCLIENT AND NOT ENABLE_MYSQLCLIENT STREQUAL AUTO)
diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
index c40e12d551..35220b5426 100644
--- a/cmake/modules/FindPython.cmake
+++ b/cmake/modules/FindPython.cmake
@@ -1,17 +1,56 @@
-# - Try to find python
-# Once done this will define
+# FindPython
+# --------
+# Finds Python3 libraries
+#
+# This module will search for the required python libraries on the system
+# If multiple versions are found, the highest version will be used.
+#
+# --------
+#
+# the following variables influence behaviour:
+#
+# PYTHON_PATH - use external python not found in system paths
+# usage: -DPYTHON_PATH=/path/to/python/lib
+# PYTHON_VER - use exact python version, fail if not found
+# usage: -DPYTHON_VER=3.8
+#
+# --------
+#
+# This module will define the following variables:
#
# PYTHON_FOUND - system has PYTHON
+# PYTHON_VERSION - Python version number (Major.Minor)
# PYTHON_INCLUDE_DIRS - the python include directory
# PYTHON_LIBRARIES - The python libraries
+# PYTHON_LDFLAGS - Python provided link options
+#
+# --------
+#
+
+# for Depends builds, set search root dir to depends path
+if(KODI_DEPENDSBUILD)
+ set(Python3_USE_STATIC_LIBS TRUE)
+ set(Python3_ROOT_DIR ${DEPENDS_PATH}/lib)
+endif()
+
+# Provide root dir to search for Python if provided
+if(PYTHON_PATH)
+ set(Python3_ROOT_DIR ${PYTHON_PATH})
+
+ # unset cache var so we can generate again with a different dir (or none) if desired
+ unset(PYTHON_PATH CACHE)
+endif()
+
+# Set specific version of Python to find if provided
+if(PYTHON_VER)
+ set(VERSION ${PYTHON_VER})
+ set(EXACT_VER "EXACT")
-if(PKG_CONFIG_FOUND)
- pkg_check_modules(PC_PYTHON python3>=3.5 QUIET)
+ # unset cache var so we can generate again with a different ver (or none) if desired
+ unset(PYTHON_VER CACHE)
endif()
-find_program(PYTHON_EXECUTABLE python3 ONLY_CMAKE_FIND_ROOT_PATH)
-find_library(PYTHON_LIBRARY NAMES python3.9 python3.8 python3.7 python3.6 python3.5 PATHS ${PC_PYTHON_LIBDIR})
-find_path(PYTHON_INCLUDE_DIR NAMES Python.h PATHS ${PC_PYTHON_INCLUDE_DIRS} PATH_SUFFIXES python3.9 python3.8 python3.7 python3.6 python3.5)
+find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development)
if(KODI_DEPENDSBUILD)
find_library(FFI_LIBRARY ffi REQUIRED)
@@ -27,17 +66,17 @@ if(KODI_DEPENDSBUILD)
endif()
endif()
- set(PYTHON_LIBRARIES ${PYTHON_LIBRARY} ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES})
-else()
- find_package(PythonLibs 3.5 REQUIRED)
- list(APPEND PYTHON_LIBRARIES ${PC_PYTHON_STATIC_LIBRARIES})
+ list(APPEND Python3_LIBRARIES ${FFI_LIBRARY} ${EXPAT_LIBRARY} ${INTL_LIBRARY} ${GMP_LIBRARY} ${PYTHON_DEP_LIBRARIES})
endif()
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Python REQUIRED_VARS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES)
-if(PYTHON_FOUND)
- set(PYTHON_INCLUDE_DIRS ${PYTHON_INCLUDE_DIR})
+if(Python3_FOUND)
list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1)
+ # These are all set for easy integration with the rest of our build system
+ set(PYTHON_FOUND ${Python3_FOUND})
+ set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
+ set(PYTHON_LIBRARIES ${Python3_LIBRARIES})
+ set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE)
+ set(PYTHON_LDFLAGS ${Python3_LINK_OPTIONS})
endif()
-mark_as_advanced(PYTHON_EXECUTABLE PYTHON_INCLUDE_DIRS PYTHON_INCLUDE_DIR PYTHON_LIBRARY PYTHON_LIBRARIES PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY)
+mark_as_advanced(PYTHON_EXECUTABLE PYTHON_VERSION PYTHON_INCLUDE_DIRS PYTHON_LDFLAGS FFI_LIBRARY EXPAT_LIBRARY INTL_LIBRARY GMP_LIBRARY)
--
2.30.2
@@ -0,0 +1,48 @@
From 6bb112e585f2ffd10e5af70ca28159dd235d063b Mon Sep 17 00:00:00 2001
From: wsnipex <wsnipex@a1.net>
Date: Thu, 19 Aug 2021 08:50:05 +0200
Subject: [PATCH] [cmake] search for python interpreter fixes installing
eventclients on linux
Backport of https://github.com/xbmc/xbmc/pull/20058
Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
cmake/modules/FindPython.cmake | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
index 35220b5426..c469ed9fb6 100644
--- a/cmake/modules/FindPython.cmake
+++ b/cmake/modules/FindPython.cmake
@@ -20,6 +20,7 @@
#
# PYTHON_FOUND - system has PYTHON
# PYTHON_VERSION - Python version number (Major.Minor)
+# PYTHON_EXECUTABLE - Python interpreter binary
# PYTHON_INCLUDE_DIRS - the python include directory
# PYTHON_LIBRARIES - The python libraries
# PYTHON_LDFLAGS - Python provided link options
@@ -51,6 +52,9 @@ if(PYTHON_VER)
endif()
find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Development)
+if(CORE_SYSTEM_NAME STREQUAL linux)
+ find_package(Python3 ${VERSION} ${EXACT_VER} COMPONENTS Interpreter)
+endif()
if(KODI_DEPENDSBUILD)
find_library(FFI_LIBRARY ffi REQUIRED)
@@ -73,6 +77,7 @@ if(Python3_FOUND)
list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1)
# These are all set for easy integration with the rest of our build system
set(PYTHON_FOUND ${Python3_FOUND})
+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE)
set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
set(PYTHON_LIBRARIES ${Python3_LIBRARIES})
set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE)
--
2.30.2
@@ -0,0 +1,39 @@
From 25681d8adde4a90d5da02051e30f6a3a27322136 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
Date: Sat, 25 Sep 2021 07:41:10 +0200
Subject: [PATCH] [cmake] allow to override PYTHON_EXECUTABLE
If Kodi is being build for distro which has different python version
than host, PYTHON_EXECUTABLE must be overriden and point to distro
version. Otherwise, eventclients will be installed in wrong location and
be thus unusable.
Use case: Cross compiling Kodi for LibreELEC
Backport of https://github.com/xbmc/xbmc/pull/20171
Patch sent upstream: https://github.com/xbmc/xbmc/pull/20989
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
cmake/modules/FindPython.cmake | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
index c469ed9fb6..87b8368705 100644
--- a/cmake/modules/FindPython.cmake
+++ b/cmake/modules/FindPython.cmake
@@ -77,7 +77,9 @@ if(Python3_FOUND)
list(APPEND PYTHON_DEFINITIONS -DHAS_PYTHON=1)
# These are all set for easy integration with the rest of our build system
set(PYTHON_FOUND ${Python3_FOUND})
- set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE)
+ if(NOT PYTHON_EXECUTABLE)
+ set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE FILEPATH "Python interpreter" FORCE)
+ endif()
set(PYTHON_INCLUDE_DIRS ${Python3_INCLUDE_DIRS})
set(PYTHON_LIBRARIES ${Python3_LIBRARIES})
set(PYTHON_VERSION "${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}" CACHE INTERNAL "" FORCE)
--
2.30.2
+4
View File
@@ -135,6 +135,10 @@ config BR2_PACKAGE_KODI_BLUEZ
help
Enable bluetooth support
comment "bluetooth support needs a toolchain w/ headers >= 3.4"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4
config BR2_PACKAGE_KODI_DBUS
bool "dbus"
select BR2_PACKAGE_DBUS
+4
View File
@@ -76,6 +76,10 @@ KODI_CONF_OPTS += \
-DNATIVEPREFIX=$(HOST_DIR) \
-DDEPENDS_PATH=$(STAGING_DIR)/usr \
-DENABLE_TESTING=OFF \
-DPYTHON_EXECUTABLE=$(HOST_DIR)/bin/python \
-DPYTHON_INCLUDE_DIRS=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR) \
-DPYTHON_PATH=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) \
-DPYTHON_VER=$(PYTHON3_VERSION_MAJOR) \
-DWITH_JSONSCHEMABUILDER=$(HOST_DIR)/bin/JsonSchemaBuilder \
-DWITH_TEXTUREPACKER=$(HOST_DIR)/bin/TexturePacker \
-DLIBDVDCSS_URL=$(KODI_DL_DIR)/kodi-libdvdcss-$(KODI_LIBDVDCSS_VERSION).tar.gz \
+1
View File
@@ -8,6 +8,7 @@ LIBBPF_VERSION = 0.6.1
LIBBPF_SITE = $(call github,libbpf,libbpf,v$(LIBBPF_VERSION))
LIBBPF_LICENSE = GPL-2.0, LGPL-2.1, BSD-2-Clause
LIBBPF_LICENSE_FILES = LICENSE LICENSE.BSD-2-Clause LICENSE.LGPL-2.1
LIBBPF_CPE_ID_VENDOR = libbpf_project
LIBBPF_DEPENDENCIES = host-bison host-flex host-pkgconf elfutils zlib
LIBBPF_INSTALL_STAGING = YES
+4 -4
View File
@@ -37,17 +37,17 @@ LIBGLVND_CONF_OPTS += -Dglx=disabled
endif
ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_EGL),y)
LIBGLVND_CONF_OPTS = -Degl=true
LIBGLVND_CONF_OPTS += -Degl=true
LIBGLVND_PROVIDES += libegl
else
LIBGLVND_CONF_OPTS = -Degl=false
LIBGLVND_CONF_OPTS += -Degl=false
endif
ifeq ($(BR2_PACKAGE_LIBGLVND_DISPATCH_GLES),y)
LIBGLVND_CONF_OPTS = -Dgles1=true -Dgles2=true
LIBGLVND_CONF_OPTS += -Dgles1=true -Dgles2=true
LIBGLVND_PROVIDES += libgles
else
LIBGLVND_CONF_OPTS = -Dgles1=false -Dgles2=false
LIBGLVND_CONF_OPTS += -Dgles1=false -Dgles2=false
endif
$(eval $(meson-package))
+2 -2
View File
@@ -11,10 +11,10 @@ LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING
LIBGSASL_INSTALL_STAGING = YES
ifeq ($(BR2_PACKAGE_LIBGCRYPT),y)
LIBGSASL_CONF_OPTS = --with-libgcrypt-prefix=$(STAGING_DIR)/usr
LIBGSASL_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr
LIBGSASL_DEPENDENCIES += libgcrypt
else
LIBGSASL_CONF_OPTS = --without-libgcrypt
LIBGSASL_CONF_OPTS += --without-libgcrypt
endif
ifeq ($(BR2_PACKAGE_LIBIDN),y)
+1 -1
View File
@@ -11,7 +11,7 @@ LIBICONV_LICENSE = GPL-3.0+ (iconv program), LGPL-2.0+ (library)
LIBICONV_LICENSE_FILES = COPYING COPYING.LIB
ifeq ($(BR2_PACKAGE_LIBICONV_EXTRA_ENCODINGS),y)
LIBICONV_CONF_OPTS = --enable-extra-encodings
LIBICONV_CONF_OPTS += --enable-extra-encodings
endif
# Don't build the preloadable library, as we don't need it (it's only
@@ -0,0 +1,41 @@
From 2c472bf55289ccbd7f305aa3e98d6fd70be4e3ab Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sat, 19 Feb 2022 12:02:10 +0100
Subject: [PATCH] gdk-pixbuf-loader/Makefile.am: set GDK_PIXBUF_MODULEDIR
Set GDK_PIXBUF_MODULEDIR to gdk_pixbuf_moduledir before calling
gdk-pixbuf-query-loaders to build a correct gdk_pixbuf_cache_file and
gdk-pixbuf.loaders on 'exotic' systems
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status:
https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/668]
---
gdk-pixbuf-loader/Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gdk-pixbuf-loader/Makefile.am b/gdk-pixbuf-loader/Makefile.am
index c3493736..de1f9641 100644
--- a/gdk-pixbuf-loader/Makefile.am
+++ b/gdk-pixbuf-loader/Makefile.am
@@ -49,7 +49,7 @@ rsvg_loader_LDADD = \
EXTRA_rsvg_loader_DEPENDENCIES = libpixbufloader-svg.la gdk-pixbuf-loaders
gdk-pixbuf-loaders: Makefile
- $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
+ $(AM_V_GEN) ( $(GDK_PIXBUF_QUERYLOADERS) ./libpixbufloader-svg.la && GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS)) > gdk-pixbuf.loaders 2>/dev/null
if CROSS_COMPILING
RUN_QUERY_LOADER_TEST=false
@@ -68,7 +68,7 @@ endif
install-data-hook:
@if $(RUN_QUERY_LOADER_TEST) ; then \
$(mkinstalldirs) $(DESTDIR)$(gdk_pixbuf_binarydir) ; \
- $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \
+ GDK_PIXBUF_MODULEDIR=$(gdk_pixbuf_moduledir) $(GDK_PIXBUF_QUERYLOADERS) > $(DESTDIR)$(gdk_pixbuf_cache_file) ; \
else \
echo "***" ; \
echo "*** Warning: loaders.cache not built" ; \
--
2.34.1
+2
View File
@@ -20,6 +20,8 @@ HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libglib2 host-libxml
LIBRSVG_LICENSE = LGPL-2.1+
LIBRSVG_LICENSE_FILES = COPYING.LIB
LIBRSVG_CPE_ID_VENDOR = gnome
# We're patching gdk-pixbuf-loader/Makefile.am
LIBRSVG_AUTORECONF = YES
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
LIBRSVG_CONF_OPTS += --enable-introspection
+5
View File
@@ -1,6 +1,7 @@
config BR2_PACKAGE_LIBUHTTPD
bool "libuhttpd"
depends on BR2_USE_MMU # fork()
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
select BR2_PACKAGE_LIBEV
select BR2_PACKAGE_WOLFSSL_ALL if BR2_PACKAGE_WOLFSSL
help
@@ -8,3 +9,7 @@ config BR2_PACKAGE_LIBUHTTPD
library based on libev
https://github.com/zhaojh329/libuhttpd
comment "libuhttpd needs a toolchain w/ gcc >= 4.9"
depends on BR2_USE_MMU
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9
@@ -0,0 +1,39 @@
From 0b857081d687f7ee41483a3d7e9846af44a5ba7d Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 7 Feb 2022 11:55:54 +0100
Subject: [PATCH] configure.ac: link with -latomic if needed
libusb unconditionally uses atomic_fetch_add since version 1.0.25 and
https://github.com/libusb/libusb/commit/1a08aa84d96397a3840a75abe66051f5360c2c84
https://github.com/libusb/libusb/commit/eed8a371ea53939096ba94d44001e0637d042572
but some architectures (e.g. sparc) needs to link with -latomic to be
able to use it. So check if -latomic is needed and update libusb-1.0.pc
accordingly to avoid the following build failure with openocd:
/home/buildroot/autobuild/instance-0/output-1/host/opt/ext-toolchain/bin/../lib/gcc/sparc-buildroot-linux-uclibc/10.3.0/../../../../sparc-buildroot-linux-uclibc/bin/ld: /home/buildroot/autobuild/instance-0/output-1/host/sparc-buildroot-linux-uclibc/sysroot/usr/lib/libusb-1.0.so: undefined reference to `__atomic_fetch_add_4'
collect2: error: ld returned 1 exit status
Fixes:
- http://autobuild.buildroot.org/results/4a27a769bb3cdf78643c3049b87d792178d6512c
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/libusb/libusb/pull/1064]
---
configure.ac | 1 +
1 file changed, 1 insertion(+)
diff --git a/configure.ac b/configure.ac
index f6cf2f9..002bcf6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -152,6 +152,7 @@ if test "x$platform" = xposix; then
AC_SEARCH_LIBS([pthread_create], [pthread],
[test "x$ac_cv_search_pthread_create" != "xnone required" && AC_SUBST(THREAD_LIBS, [-lpthread])],
[], [])
+ AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic])
elif test "x$platform" = xwindows; then
AC_DEFINE([PLATFORM_WINDOWS], [1], [Define to 1 if compiling for a Windows platform.])
else
--
2.34.1
@@ -0,0 +1,37 @@
From bea5891591402f14940a607eafbdcd169ff8827f Mon Sep 17 00:00:00 2001
From: Yegor Yefremov <yegorslists@googlemail.com>
Date: Sun, 6 Feb 2022 07:12:14 +0100
Subject: [PATCH] linux_usbfs: fix maybe-uninitialized error
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Initialize active_config to an invalid value to avoid the following
compilation error:
os/linux_usbfs.c: In function ‘op_get_configuration’:
os/linux_usbfs.c:1452:12: error: ‘active_config’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
1452 | *config = (uint8_t)active_config;
Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
Upstream: https://github.com/libusb/libusb/pull/1062
---
libusb/os/linux_usbfs.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libusb/os/linux_usbfs.c b/libusb/os/linux_usbfs.c
index c300675..285d9ca 100644
--- a/libusb/os/linux_usbfs.c
+++ b/libusb/os/linux_usbfs.c
@@ -1429,7 +1429,7 @@ static int op_get_configuration(struct libusb_device_handle *handle,
uint8_t *config)
{
struct linux_device_priv *priv = usbi_get_device_priv(handle->dev);
- int active_config;
+ int active_config = -1; /* to please compiler */
int r;
if (priv->sysfs_dir) {
--
2.17.0
+2
View File
@@ -13,6 +13,8 @@ LIBUSB_LICENSE_FILES = COPYING
LIBUSB_CPE_ID_VENDOR = libusb
LIBUSB_DEPENDENCIES = host-pkgconf
LIBUSB_INSTALL_STAGING = YES
# We're patching configure.ac
LIBUSB_AUTORECONF = YES
# Avoid the discovery of udev for the host variant
HOST_LIBUSB_CONF_OPTS = --disable-udev
+4
View File
@@ -20,6 +20,7 @@ comment "libv4l JPEG support not enabled"
config BR2_PACKAGE_LIBV4L_UTILS
bool "v4l-utils tools"
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
help
v4l-utils is a collection of various video4linux and DVB
utilities.
@@ -35,6 +36,9 @@ config BR2_PACKAGE_LIBV4L_UTILS
- rds-ctl
- qv4l2 (if Qt is enabled)
comment "v4l-utils tools needs a toolchain w/ C++11"
depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
endif
comment "libv4l needs a toolchain w/ threads, C++ and headers >= 3.0"
+3 -2
View File
@@ -59,6 +59,9 @@ ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y)
LIBV4L_CONF_OPTS += --enable-v4l-utils
LIBV4L_DEPENDENCIES += $(TARGET_NLS_DEPENDENCIES)
# v4l2-ctl needs c++11, use gnu++11 for typeof support
LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11"
# IR BPF decoder support needs toolchain with linux-headers >= 3.18
# libelf and clang support
LIBV4L_CONF_OPTS += --disable-bpf
@@ -71,8 +74,6 @@ LIBV4L_CONF_ENV += \
ac_cv_prog_MOC=$(HOST_DIR)/bin/moc \
ac_cv_prog_RCC=$(HOST_DIR)/bin/rcc \
ac_cv_prog_UIC=$(HOST_DIR)/bin/uic
# qt5 needs c++11 (since qt-5.7)/use gnu++11 for typeof support
LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11"
else
LIBV4L_CONF_OPTS += --disable-qv4l2
endif
+2 -2
View File
@@ -1,3 +1,3 @@
# Locally computed
sha256 7f7dad64117407f2484ff5b53e90804f923a99fcbde5872e54f6aba53f482da0 luasyslog-2.2.0.tar.gz
sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING
sha256 b1b19ca142130f93c3f8f2e85303ff50cc6f4ed4aa52b8569176ae56e3dc3f43 luasyslog-2.2.1.tar.gz
sha256 833457938f5155e65dabda12a5c9d4b6fd7fb92dd7ead584c1c30cfb0c84adf4 COPYING
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
LUASYSLOG_VERSION = 2.2.0
LUASYSLOG_VERSION = 2.2.1
LUASYSLOG_SITE = $(call github,ntd,luasyslog,$(LUASYSLOG_VERSION))
LUASYSLOG_DEPENDENCIES = host-luarocks luainterpreter
LUASYSLOG_LICENSE = MIT
@@ -0,0 +1,60 @@
From cc2dd3995dc9a9e6f0e705e11e791f3f3c7d7326 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 18 Jan 2022 22:41:36 +0100
Subject: [PATCH] fix build with gcc 4.8
Drop "-Wno-unused-const-variable -Wimplicit-fallthrough=0" as
"-Wno-implicit-fallthrough -Wno-unused-const-variable" is already set in
CFLAGS. This will avoid the following build failure with gcc 4.8 raised
since version 1.13.0 and
https://github.com/mongrel2/mongrel2/commit/725209578599bd7784753d86aee34f6441ff78a5:
arm-none-linux-gnueabi-gcc: error: unrecognized command line option '-Wimplicit-fallthrough=0'
Fixes:
- http://autobuild.buildroot.org/results/de324b733e09057c87352220069fe65f6e535eb8
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/mongrel2/mongrel2/pull/354]
---
Makefile | 1 -
tools/m2sh/Makefile | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index f6627ed..fb8d028 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,6 @@ all: bin/mongrel2 tests m2sh procer
${OBJECTS_NOEXT}: CFLAGS += ${NOEXTCFLAGS}
${OBJECTS}: | builddirs
-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0
.PHONY: builddirs
builddirs:
diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile
index 83e7ae4..86364af 100644
--- a/tools/m2sh/Makefile
+++ b/tools/m2sh/Makefile
@@ -10,7 +10,7 @@ LIB_SRC=$(filter-out src/m2sh.c,${SOURCES})
LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS})
RAGEL_OBJECTS=src/lexer.o src/cli.o
-$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-const-variable -Wimplicit-fallthrough=0 -Wno-unused-parameter
+$(RAGEL_OBJECTS): CFLAGS += -Wno-unused-parameter
all: ../lemon/lemon tests build/m2sh
@@ -20,7 +20,7 @@ dev: all
install: build/m2sh
install build/m2sh ${DESTDIR}${PREFIX}/bin
-src/parser.o: CFLAGS += -Wno-unused-const-variable -Wno-unused-parameter
+src/parser.o: CFLAGS += -Wno-unused-parameter
build/libm2sh.a: ${LIB_OBJ}
mkdir -p build
--
2.34.1
@@ -0,0 +1,76 @@
From 8f9e110b391f065536780d19c2257ad7afd83522 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Mon, 31 Jan 2022 23:42:13 +0100
Subject: [PATCH] Revert "Advertise TS_SSL feature with OpenSSL >= 1.1.0."
This reverts commit 281c84fc3996c757efdf6e9b3f906d7a1fc08b1d.
Indeed openssl can be built on toolchains without threads support which
will result in the following build failure:
ne_openssl.c:43:10: fatal error: pthread.h: No such file or directory
43 | #include <pthread.h>
| ^~~~~~~~~~~
Fixes:
- http://autobuild.buildroot.org/results/da995ef26001357e51a5907de9c6111b9ff89bdf
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: https://github.com/notroj/neon/pull/71]
---
macros/neon.m4 | 15 ++++-----------
src/ne_openssl.c | 4 ++--
2 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/macros/neon.m4 b/macros/neon.m4
index 129d4ac..5a5fb1b 100644
--- a/macros/neon.m4
+++ b/macros/neon.m4
@@ -960,13 +960,9 @@ yes|openssl)
AC_CHECK_HEADERS(openssl/ssl.h openssl/opensslv.h,,
[AC_MSG_ERROR([OpenSSL headers not found, cannot enable SSL support])])
+ # Enable EGD support if using 0.9.7 or newer
NE_CHECK_OPENSSLVER(ne_cv_lib_ssl097, 0.9.7, 0x00907000L)
- NE_CHECK_OPENSSLVER(ne_cv_lib_ssl110, 1.1.0, 0x10100000L)
- if test "$ne_cv_lib_ssl110" = "yes"; then
- NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION])
- AC_DEFINE(HAVE_OPENSSL11, 1, [Enable OpenSSL 1.1 support])
- elif test "$ne_cv_lib_ssl097" = "yes"; then
- # Enable EGD support if using 0.9.7 or newer
+ if test "$ne_cv_lib_ssl097" = "yes"; then
AC_MSG_NOTICE([OpenSSL >= 0.9.7; EGD support not needed in neon])
NE_ENABLE_SUPPORT(SSL, [SSL support enabled, using OpenSSL $NE_SSL_VERSION])
NE_CHECK_FUNCS(CRYPTO_set_idptr_callback SSL_SESSION_cmp)
@@ -1074,11 +1070,8 @@ CC/CFLAGS/LIBS must be used to make the POSIX library interfaces
available]),,
enable_threadsafe_ssl=no)
-case ${enable_threadsafe_ssl}X${ne_cv_lib_ssl110} in
-*Xyes)
- NE_ENABLE_SUPPORT(TS_SSL, [OpenSSL is natively thread-safe])
- ;;
-posixX*|yesX*)
+case $enable_threadsafe_ssl in
+posix|yes)
ne_pthr_ok=yes
AC_CHECK_FUNCS([pthread_mutex_init pthread_mutex_lock],,[ne_pthr_ok=no])
if test "${ne_pthr_ok}" = "no"; then
diff --git a/src/ne_openssl.c b/src/ne_openssl.c
index 41a5c05..96c768e 100644
--- a/src/ne_openssl.c
+++ b/src/ne_openssl.c
@@ -1194,8 +1194,8 @@ char *ne_vstrhash(unsigned int flags, va_list ap)
return ne__strhash2hex(v, vlen, flags);
}
-#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10100000L
-/* From OpenSSL 1.1.0 locking callbacks are no longer needed. */
+#if defined(NE_HAVE_TS_SSL) && OPENSSL_VERSION_NUMBER < 0x10101000L
+/* For OpenSSL 1.1.1 locking callbacks are no longer need at all. */
#define WITH_OPENSSL_LOCKING (1)
/* Implementation of locking callbacks to make OpenSSL thread-safe.
--
2.34.1
@@ -0,0 +1,28 @@
From cf779609a5dd38f0a8fdb3c4539371f13fd3a24a Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Tue, 8 Feb 2022 18:34:25 +0100
Subject: [PATCH] configure.ac: fix autoreconf
Add AC_CONFIG_MACRO_DIR(macros) to fix autoreconf
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
[Upstream status: not sent yet]
---
configure.ac | 2 ++
1 file changed, 2 insertions(+)
diff --git a/configure.ac b/configure.ac
index 37b14ec..122151d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,7 @@
AC_PREREQ(2.58) dnl 2.58 required for AS_HELP_STRING
+AC_CONFIG_MACRO_DIR(macros)
+
dnl Extract the version (sans LF) from .version, created at release-time.
m4_define(ne_version, [m4_translit(m4_include(.version), [
])])
--
2.34.1
+2
View File
@@ -10,6 +10,8 @@ NEON_LICENSE = LGPL-2.0+ (library), GPL-2.0+ (manual and tests)
NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README.md
NEON_CPE_ID_VENDOR = webdav
NEON_INSTALL_STAGING = YES
# We're patching configure.ac
NEON_AUTORECONF = YES
NEON_CONF_OPTS = --without-gssapi --disable-rpath
NEON_CONFIG_SCRIPTS = neon-config
NEON_DEPENDENCIES = host-pkgconf $(TARGET_NLS_DEPENDENCIES)
+1 -1
View File
@@ -18,7 +18,7 @@ HOST_PCRE_CONF_OPTS = --enable-unicode-properties
ifneq ($(BR2_INSTALL_LIBSTDCPP),y)
# pcre will use the host g++ if a cross version isn't available
PCRE_CONF_OPTS = --disable-cpp
PCRE_CONF_OPTS += --disable-cpp
endif
PCRE_CONF_OPTS += --enable-pcre8
+1 -1
View File
@@ -12,7 +12,7 @@ PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying
PERL_NETADDR_IP_DISTNAME = NetAddr-IP
ifeq ($(BR2_STATIC_LIBS),y)
PERL_NETADDR_IP_CONF_OPTS = -noxs
PERL_NETADDR_IP_CONF_OPTS += -noxs
endif
$(eval $(perl-package))
+1 -1
View File
@@ -1,5 +1,5 @@
# From https://www.php.net/downloads.php
sha256 5f33544061d37d805a2a9ce791f081ef08a7155bd7ba2362e69bba2d06b0f8b2 php-8.0.15.tar.xz
sha256 f27a2f25259e8c51e42dfd74e24a546ee521438ad7d9f6c6e794aa91f38bab0a php-8.0.16.tar.xz
# License file
sha256 a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
PHP_VERSION = 8.0.15
PHP_VERSION = 8.0.16
PHP_SITE = https://www.php.net/distributions
PHP_SOURCE = php-$(PHP_VERSION).tar.xz
PHP_INSTALL_STAGING = YES
+4 -4
View File
@@ -38,10 +38,10 @@ PKG_PYTHON_DISTUTILS_ENV = \
PATH=$(BR_PATH) \
$(TARGET_CONFIGURE_OPTS) \
LDSHARED="$(TARGET_CROSS)gcc -shared" \
PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
PYTHONPATH="$(PYTHON3_PATH)" \
PYTHONNOUSERSITE=1 \
_PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \
_PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \
_PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \
_PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \
_python_sysroot=$(STAGING_DIR) \
_python_prefix=/usr \
@@ -70,11 +70,11 @@ HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \
# Target setuptools-based packages
PKG_PYTHON_SETUPTOOLS_ENV = \
_PYTHON_HOST_PLATFORM="$(PKG_PYTHON_HOST_PLATFORM)" \
_PYTHON_PROJECT_BASE="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_DIR),$(PYTHON_DIR))" \
_PYTHON_PROJECT_BASE="$(PYTHON3_DIR)" \
_PYTHON_SYSCONFIGDATA_NAME="$(PKG_PYTHON_SYSCONFIGDATA_NAME)" \
PATH=$(BR_PATH) \
$(TARGET_CONFIGURE_OPTS) \
PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \
PYTHONPATH="$(PYTHON3_PATH)" \
PYTHONNOUSERSITE=1 \
_python_sysroot=$(STAGING_DIR) \
_python_prefix=/usr \
+1 -1
View File
@@ -13,7 +13,7 @@ PSMISC_DEPENDENCIES = ncurses $(TARGET_NLS_DEPENDENCIES)
ifeq ($(BR2_TOOLCHAIN_HAS_SSP),)
# Don't force -fstack-protector when SSP is not available in toolchain
PSMISC_CONF_OPTS = --disable-harden-flags
PSMISC_CONF_OPTS += --disable-harden-flags
endif
$(eval $(autotools-package))
+4 -4
View File
@@ -1,6 +1,6 @@
# md5, sha256 from https://pypi.org/pypi/ipython/json
md5 f733048322cd34ce392ec5404813540b ipython-7.28.0.tar.gz
sha256 2097be5c814d1b974aea57673176a924c4c8c9583890e7a5f082f547b9975b11 ipython-7.28.0.tar.gz
md5 6907b67691ba697173a3befb2c35f7ac ipython-7.31.1.tar.gz
sha256 b5548ec5329a4bcf054a5deed5099b0f9622eb9ea51aaa7104d215fece201d8c ipython-7.31.1.tar.gz
# Locally computed sha256 checksums
sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst
sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE
sha256 341afcbd729887b7046fe7b98fc4f4edff3aed8d38f06eefd9b30670f043df17 COPYING.rst
sha256 e0e390748ed440ab893ca1f135a88a920aaf5409dbb90a5b427c75c5e51268fb LICENSE
+2 -2
View File
@@ -4,9 +4,9 @@
#
################################################################################
PYTHON_IPYTHON_VERSION = 7.28.0
PYTHON_IPYTHON_VERSION = 7.31.1
PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz
PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/e2/c8/7046d0409a90e31263d5bbaa708347d522ac584a1140c01a951d9deb1792
PYTHON_IPYTHON_SITE = https://files.pythonhosted.org/packages/fb/39/c1947dc1bb993a35469ca474535cb3214c91f5f9a7752a1fcbd9b6b37dde
PYTHON_IPYTHON_LICENSE = BSD-3-Clause
PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst LICENSE
PYTHON_IPYTHON_CPE_ID_VENDOR = ipython
@@ -0,0 +1,26 @@
From 57c563f8b47a56feefc0a8bcbef05f4b54280549 Mon Sep 17 00:00:00 2001
From: mmbutter <mario.butter@gmail.com>
Date: Tue, 9 Jun 2020 11:50:41 -0500
Subject: [PATCH] Fix problem with re-raise exceptions in wrapped functions.
[Retrieved from:
https://github.com/whilp/cli/commit/57c563f8b47a56feefc0a8bcbef05f4b54280549]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
lib/cli/app.py | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/cli/app.py b/lib/cli/app.py
index 7b6db52..f487ab4 100644
--- a/lib/cli/app.py
+++ b/lib/cli/app.py
@@ -240,6 +240,9 @@ def run(self):
try:
returned = self.main(*args)
except Exception, e:
+ elif isinstance(e, self.reraise):
+ # raising the last exception preserves traceback
+ raise
returned = e
return self.post_run(returned)
@@ -0,0 +1,41 @@
From 2af95cff5609142ec14efdf13b394f9b0121ab2e Mon Sep 17 00:00:00 2001
From: mmbutter <mario.butter@gmail.com>
Date: Thu, 11 Jun 2020 15:50:03 -0500
Subject: [PATCH] except statement changed slightly in 2.6. This could cause
problems in newer versions. Updated to the new format.
[Retrieved from:
https://github.com/whilp/cli/commit/2af95cff5609142ec14efdf13b394f9b0121ab2e]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
lib/cli/app.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/cli/app.py b/lib/cli/app.py
index f487ab4..45256b8 100644
--- a/lib/cli/app.py
+++ b/lib/cli/app.py
@@ -239,10 +239,10 @@ def run(self):
args = ()
try:
returned = self.main(*args)
- except Exception, e:
- elif isinstance(e, self.reraise):
- # raising the last exception preserves traceback
- raise
+ except self.reraise:
+ # raising the last exception preserves traceback
+ raise
+ except Exception as e:
returned = e
return self.post_run(returned)
@@ -420,7 +420,7 @@ def pre_run(self):
"""
try:
ns = self.argparser.parse_args()
- except SystemExit, e:
+ except SystemExit as e:
if self.exit_after_main:
raise
else:
+1 -1
View File
@@ -103,7 +103,7 @@ PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS
ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y)
define PYTHON_PYGAME_REMOVE_EXAMPLES
rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/examples
rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/pygame/examples
endef
PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES
endif
+2
View File
@@ -1,3 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/regex/json
md5 cd206281327b4c087bb20bf93cee4ab9 regex-2021.4.4.tar.gz
sha256 52ba3d3f9b942c49d7e4bc105bb28551c44065f139a65062ab7912bef10c9afb regex-2021.4.4.tar.gz
# Locally computed sha256 checksums
sha256 bff55ef4cdcc8c14ce259f8e8ab60e264418440d6335f4dc138273fbd506144d LICENSE.txt
+2 -1
View File
@@ -8,7 +8,8 @@ PYTHON_REGEX_VERSION = 2021.4.4
PYTHON_REGEX_SOURCE = regex-$(PYTHON_REGEX_VERSION).tar.gz
PYTHON_REGEX_SITE = https://files.pythonhosted.org/packages/38/3f/4c42a98c9ad7d08c16e7d23b2194a0e4f3b2914662da8bc88986e4e6de1f
PYTHON_REGEX_SETUP_TYPE = setuptools
PYTHON_REGEX_LICENSE = CNRI-Python
PYTHON_REGEX_LICENSE = Apache-2.0
PYTHON_REGEX_LICENSE_FILES = LICENSE.txt
$(eval $(python-package))
$(eval $(host-python-package))
+3 -3
View File
@@ -1,5 +1,5 @@
# md5, sha256 from https://pypi.org/pypi/twisted/json
md5 fc16d575730db7d0cddd09fc35af3eea Twisted-20.3.0.tar.bz2
sha256 d72c55b5d56e176563b91d11952d13b01af8725c623e498db5507b6614fc1e10 Twisted-20.3.0.tar.bz2
md5 c818cb1ab241dc249517442e5a0e0412 Twisted-22.1.0.tar.gz
sha256 b7971ec9805b0f80e1dcb1a3721d7bfad636d5f909de687430ce373979d67b61 Twisted-22.1.0.tar.gz
# Locally computed sha256
sha256 98426fd47315df70098e0d85efbb5d7dd8001c9c536386937354640d6d8d75b9 LICENSE
sha256 686f6426a775450eb3afd00bc3a5c2621f305ddb9c8478ee9bf28a368ef2dece LICENSE
+3 -3
View File
@@ -4,9 +4,9 @@
#
################################################################################
PYTHON_TWISTED_VERSION = 20.3.0
PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2
PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/4a/b4/4973c7ccb5be2ec0abc779b7d5f9d5f24b17b0349e23240cfc9dc3bd83cc
PYTHON_TWISTED_VERSION = 22.1.0
PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.gz
PYTHON_TWISTED_SITE = https://files.pythonhosted.org/packages/77/b8/8108806ebf2b33654989fd1511281dc94a49fa7e03326d84fe5498ecfae4
PYTHON_TWISTED_SETUP_TYPE = setuptools
PYTHON_TWISTED_LICENSE = MIT
PYTHON_TWISTED_LICENSE_FILES = LICENSE
-1
View File
@@ -1,7 +1,6 @@
config BR2_PACKAGE_QT5LOCATION
bool "qt5location"
select BR2_PACKAGE_QT5BASE_GUI
select BR2_PACKAGE_QT5LOCATION_MAPBOXGL
help
Qt is a cross-platform application and UI framework for
developers using C++.
+1
View File
@@ -21,6 +21,7 @@ config BR2_PACKAGE_QT5WEBKIT
select BR2_PACKAGE_QT5LOCATION
select BR2_PACKAGE_QT5SENSORS
select BR2_PACKAGE_QT5WEBCHANNEL
select BR2_PACKAGE_LIBEXECINFO if !BR2_TOOLCHAIN_USES_GLIBC
select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_LIBXSLT
select BR2_PACKAGE_SQLITE
+4
View File
@@ -38,6 +38,10 @@ ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y)
QT5WEBKIT_DEPENDENCIES += qt5declarative
endif
ifeq ($(BR2_PACKAGE_LIBEXECINFO),y)
QT5WEBKIT_DEPENDENCIES += libexecinfo
endif
QT5WEBKIT_CONF_OPTS += \
-DENABLE_TOOLS=OFF \
-DPORT=Qt \
@@ -0,0 +1,95 @@
From be76b10a50749e2e11dce8dcc38b414a7f9d8747 Mon Sep 17 00:00:00 2001
From: Ben Walden <bwalden@redboxvoice.com>
Date: Sat, 22 Aug 2020 23:14:11 +0100
Subject: [PATCH] Fix some issue compiling with Visual Studio 16.7.0 and tidy
up Visual Studio 16 project files
[Retrieved (and updated to keep only RendKa.cxx update) from:
https://github.com/resiprocate/resiprocate/commit/be76b10a50749e2e11dce8dcc38b414a7f9d8747]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
VisualStudioReadme.htm | 65 +
contrib/GeoIP/GeoIP_12_0.vcxproj | 550 -------
contrib/GeoIP/GeoIP_16_0.vcxproj | 93 +-
.../db/build_windows/db_static_12_0.vcxproj | 1260 -----------------
.../db/build_windows/db_static_16_0.vcxproj | 696 +--------
contrib/db/dbinc/atomic.h | 4 +-
contrib/db/mp/mp_fget.c | 4 +-
contrib/db/mp/mp_mvcc.c | 4 +-
contrib/db/mp/mp_region.c | 4 +-
contrib/db/mutex/mut_method.c | 2 +-
contrib/pcre/pcre_12_0.vcxproj | 466 ------
contrib/pcre/pcre_16_0.vcxproj | 159 +--
contrib/popt/popt_12_0.vcxproj | 394 ------
contrib/popt/popt_16_0.vcxproj | 120 +-
reSIProcate_16_0.sln | 58 +-
.../queuetostream_12_0.vcxproj | 582 --------
.../queuetostream_16_0.vcxproj | 207 ++-
repro/repro_12_0.vcxproj | 825 -----------
repro/repro_12_0.vcxproj.filters | 47 -
repro/repro_16_0.vcxproj | 159 ++-
repro/reprocmd/reprocmd_12_0.vcxproj | 597 --------
repro/reprocmd/reprocmd_16_0.vcxproj | 139 +-
repro/reprolib_12_0.vcxproj | 596 --------
repro/reprolib_12_0.vcxproj.filters | 136 --
repro/reprolib_16_0.vcxproj | 132 +-
resip/dum/dum_12_0.vcxproj | 615 --------
resip/dum/dum_16_0.vcxproj | 124 +-
resip/dum/test/basicCall_12_0.vcxproj | 621 --------
resip/dum/test/basicCall_16_0.vcxproj | 145 +-
resip/dum/test/basicClient_12_0.vcxproj | 653 ---------
resip/dum/test/basicClient_16_0.vcxproj | 158 +--
resip/dum/test/basicMessage_12_0.vcxproj | 615 --------
resip/dum/test/basicMessage_16_0.vcxproj | 141 +-
resip/dum/test/basicRegister_12_0.vcxproj | 615 --------
resip/dum/test/basicRegister_16_0.vcxproj | 137 +-
resip/rend/RendKa.cxx | 2 +-
resip/rend/rend_12_0.vcxproj | 352 -----
resip/rend/rend_16_0.vcxproj | 89 +-
resip/stack/resiprocate_12_0.vcxproj | 873 ------------
resip/stack/resiprocate_12_0.vcxproj.filters | 351 -----
resip/stack/resiprocate_16_0.vcxproj | 165 ++-
resip/stack/test/test_12_0.vcxproj | 627 --------
resip/stack/test/test_16_0.vcxproj | 171 ++-
rutil/dns/ares/ares_12_0.vcxproj | 488 -------
rutil/dns/ares/ares_12_0.vcxproj.filters | 34 -
rutil/dns/ares/ares_16_0.vcxproj | 159 +--
rutil/rutil_12_0.vcxproj | 604 --------
rutil/rutil_16_0.vcxproj | 153 +-
48 files changed, 1409 insertions(+), 13782 deletions(-)
delete mode 100644 contrib/GeoIP/GeoIP_12_0.vcxproj
delete mode 100644 contrib/db/build_windows/db_static_12_0.vcxproj
delete mode 100644 contrib/pcre/pcre_12_0.vcxproj
delete mode 100644 contrib/popt/popt_12_0.vcxproj
delete mode 100644 repro/accountingconsumers/queuetostream_12_0.vcxproj
delete mode 100644 repro/repro_12_0.vcxproj
delete mode 100644 repro/repro_12_0.vcxproj.filters
delete mode 100644 repro/reprocmd/reprocmd_12_0.vcxproj
delete mode 100644 repro/reprolib_12_0.vcxproj
delete mode 100644 repro/reprolib_12_0.vcxproj.filters
delete mode 100644 resip/dum/dum_12_0.vcxproj
delete mode 100644 resip/dum/test/basicCall_12_0.vcxproj
delete mode 100644 resip/dum/test/basicClient_12_0.vcxproj
delete mode 100644 resip/dum/test/basicMessage_12_0.vcxproj
delete mode 100644 resip/dum/test/basicRegister_12_0.vcxproj
delete mode 100644 resip/rend/rend_12_0.vcxproj
delete mode 100644 resip/stack/resiprocate_12_0.vcxproj
delete mode 100644 resip/stack/resiprocate_12_0.vcxproj.filters
delete mode 100644 resip/stack/test/test_12_0.vcxproj
delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj
delete mode 100644 rutil/dns/ares/ares_12_0.vcxproj.filters
delete mode 100644 rutil/rutil_12_0.vcxproj
diff --git a/resip/rend/RendKa.cxx b/resip/rend/RendKa.cxx
index 8645f17636..8321ada1ee 100644
--- a/resip/rend/RendKa.cxx
+++ b/resip/rend/RendKa.cxx
@@ -66,7 +66,7 @@ bool operator<(const RendKaAssoc& a, const RendKaAssoc& b)
struct RendKaConn
{
- bool operator() (const RendKaAssocPtr& a, const RendKaAssocPtr& b)
+ bool operator()(const RendKaAssocPtr& a, const RendKaAssocPtr& b) const
{
return *a < *b;
}
+17 -6
View File
@@ -2,8 +2,14 @@ config BR2_PACKAGE_RYGEL
bool "rygel"
depends on BR2_USE_WCHAR # gupnp-av
depends on BR2_TOOLCHAIN_HAS_THREADS # gupnp-av
depends on BR2_USE_MMU # gupnp-av
depends on BR2_USE_MMU # gupnp-av, gobject-introspection
depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS # gobject-introspection
depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # gobject-introspection
depends on BR2_HOST_GCC_AT_LEAST_8 # gobject-introspection -> host-qemu
depends on BR2_TOOLCHAIN_USES_GLIBC # gobject-introspection
depends on BR2_PACKAGE_PYTHON3 # gobject-introspection
select BR2_PACKAGE_GDK_PIXBUF
select BR2_PACKAGE_GOBJECT_INTROSPECTION
select BR2_PACKAGE_GUPNP_AV
select BR2_PACKAGE_GUPNP_DLNA
select BR2_PACKAGE_LIBGEE
@@ -39,14 +45,19 @@ config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_SIMPLE
config BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1
bool "gstreamer1"
select BR2_PACKAGE_GSTREAMER1
select BR2_PACKAGE_GST1_PLUGINS_BASE
select BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES
depends on BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES
comment "gstreamer1 needs gst1-editing-services"
depends on !BR2_PACKAGE_GSTREAMER1_EDITING_SERVICES
endchoice
comment "rygel needs a toolchain w/ wchar, threads"
comment "rygel needs a glibc toolchain w/ wchar, threads, gcc >= 4.9, host gcc >= 8"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
depends on BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
!BR2_TOOLCHAIN_USES_GLIBC || \
!BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \
!BR2_HOST_GCC_AT_LEAST_8
endif # BR2_PACKAGE_RYGEL
+2 -7
View File
@@ -12,6 +12,7 @@ RYGEL_LICENSE = LGPL-2.1+, CC-BY-SA-3.0 (logo)
RYGEL_LICENSE_FILES = COPYING COPYING.logo
RYGEL_DEPENDENCIES = \
gdk-pixbuf \
gobject-introspection \
gupnp-av \
gupnp-dlna \
libgee \
@@ -24,16 +25,10 @@ RYGEL_CONF_ENV = LIBS=$(TARGET_NLS_LIBS)
RYGEL_CONF_OPTS += \
-Dapi-docs=false \
-Dexamples=false \
-Dintrospection=enabled \
-Dtests=false
RYGEL_PLUGINS = external,lms,mpris,ruih
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
RYGEL_CONF_OPTS += -Dintrospection=enabled
RYGEL_DEPENDENCIES += gobject-introspection
else
RYGEL_CONF_OPTS += -Dintrospection=disabled
endif
ifeq ($(BR2_PACKAGE_RYGEL_MEDIA_ENGINE_GSTREAMER1),y)
RYGEL_CONF_OPTS += \
-Dengines=gstreamer \
+1
View File
@@ -11,6 +11,7 @@ SAFECLIB_SOURCE = safeclib-$(SAFECLIB_VERSION).tar.xz
SAFECLIB_LICENSE = MIT
SAFECLIB_LICENSE_FILES = COPYING
SAFECLIB_INSTALL_STAGING = YES
SAFECLIB_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=c99"
# -fstack-protector-strong is used by default. Disable that so the
# BR2_SSP_* options in the toolchain wrapper are used instead
SAFECLIB_CONF_OPTS = --disable-hardening
+7 -2
View File
@@ -11,9 +11,14 @@ SDL2_TTF_LICENSE = Zlib
SDL2_TTF_LICENSE_FILES = COPYING.txt
SDL2_TTF_INSTALL_STAGING = YES
SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf
SDL2_TTF_CONF_OPTS = --disable-freetype-builtin
SDL2_TTF_CONF_ENV = \
FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
ifeq ($(BR2_PACKAGE_HARFBUZZ),y)
SDL2_TTF_DEPENDENCIES += harfbuzz
SDL2_TTF_CONF_OPTS += --enable-harfbuzz
else
SDL2_TTF_CONF_OPTS += --disable-harfbuzz
endif
# x-includes and x-libraries must be set for cross-compiling
# By default x_includes and x_libraries contains unsafe paths.
+1 -1
View File
@@ -13,7 +13,7 @@ SOCKETCAND_LICENSE_FILES = socketcand.c
ifeq ($(BR2_PACKAGE_LIBCONFIG),y)
SOCKETCAND_DEPENDENCIES += libconfig
else
SOCKETCAND_CONF_OPTS = --without-config
SOCKETCAND_CONF_OPTS += --without-config
endif
$(eval $(autotools-package))
+3 -3
View File
@@ -1,7 +1,7 @@
# From http://download.strongswan.org/strongswan-5.9.4.tar.bz2.md5
md5 9c387eb77f0159fdefbcf7e81c905c35 strongswan-5.9.4.tar.bz2
# From http://download.strongswan.org/strongswan-5.9.5.tar.bz2.md5
md5 53005324e3cba8592f1fb958b1c2d0e5 strongswan-5.9.5.tar.bz2
# Calculated based on the hash above
sha256 45fdf1a4c2af086d8ff5b76fd7b21d3b6f0890f365f83bf4c9a75dda26887518 strongswan-5.9.4.tar.bz2
sha256 983e4ef4a4c6c9d69f5fe6707c7fe0b2b9a9291943bbf4e008faab6bf91c0bdd strongswan-5.9.5.tar.bz2
# Locally calculated
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 2292e21797754548dccdef9eef6aee7584e552fbd890fa914e1de8d3577d23f0 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
STRONGSWAN_VERSION = 5.9.4
STRONGSWAN_VERSION = 5.9.5
STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2
STRONGSWAN_SITE = http://download.strongswan.org
STRONGSWAN_LICENSE = GPL-2.0+
+7 -7
View File
@@ -45,17 +45,17 @@ endif
ifeq ($(BR2_PACKAGE_OPENLDAP),y)
SUDO_DEPENDENCIES += openldap
SUDO_CONF_OPTS += --with-ldap
# If we are building sudo statically and openldap was linked with openssl, then
# when we link sudo with openldap we need to specify the openssl libs, otherwise
# it will fail with "undefined reference" errors.
ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_OPENSSL),yy)
SUDO_DEPENDENCIES += host-pkgconf
SUDO_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`"
endif
else
SUDO_CONF_OPTS += --without-ldap
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
SUDO_DEPENDENCIES += host-pkgconf openssl
SUDO_CONF_OPTS += --enable-openssl
else
SUDO_CONF_OPTS += --disable-openssl
endif
# mksigname/mksiglist needs to run on build host to generate source files
define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST
$(MAKE) $(HOST_CONFIGURE_OPTS) \
+5
View File
@@ -90,6 +90,11 @@ SYSTEMD_CONF_OPTS += \
-Dumount-path=/usr/bin/umount \
-Dutmp=false
ifeq ($(BR2_nios2),y)
# Nios2 ld emits warnings, make warnings not to be treated as errors
SYSTEMD_LDFLAGS = $(TARGET_LDFLAGS) -Wl,--no-fatal-warnings
endif
ifeq ($(BR2_PACKAGE_ACL),y)
SYSTEMD_DEPENDENCIES += acl
SYSTEMD_CONF_OPTS += -Dacl=true
+1 -1
View File
@@ -18,7 +18,7 @@ URG_CONF_OPTS += \
--with-sdl-prefix=$(STAGING_DIR)/usr \
--with-sdl-exec-prefix=$(STAGING_DIR)/usr
else
URG_CONF_OPTS = --without-sdl
URG_CONF_OPTS += --without-sdl
URG_CONF_ENV += ac_cv_path_SDL_CONFIG=""
endif
+4 -4
View File
@@ -1,7 +1,7 @@
# From https://webkitgtk.org/releases/webkitgtk-2.32.4.tar.xz.sums
md5 51a167e5d03bacf30c5c588e6aa23143 webkitgtk-2.32.4.tar.xz
sha1 f7255ffb488e727e9e250e0dae9f192266f50f01 webkitgtk-2.32.4.tar.xz
sha256 00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd webkitgtk-2.32.4.tar.xz
# From https://webkitgtk.org/releases/webkitgtk-2.34.6.tar.xz.sums
md5 a5eeedd02f5b4bba8bd891b92dc743d4 webkitgtk-2.34.6.tar.xz
sha1 bb82517289baf9c858fa406d1d845274f81e25cb webkitgtk-2.34.6.tar.xz
sha256 6bc8fd034aad0432a2459ce4fc7ee25ad65a4924c618bf8d93b52b0c1a84c1f6 webkitgtk-2.34.6.tar.xz
# Hashes for license files:
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
+11 -9
View File
@@ -4,7 +4,7 @@
#
################################################################################
WEBKITGTK_VERSION = 2.32.4
WEBKITGTK_VERSION = 2.34.6
WEBKITGTK_SITE = https://www.webkitgtk.org/releases
WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz
WEBKITGTK_INSTALL_STAGING = YES
@@ -24,10 +24,10 @@ WEBKITGTK_CONF_OPTS = \
-DENABLE_MINIBROWSER=ON \
-DENABLE_SPELLCHECK=ON \
-DPORT=GTK \
-DSILENCE_CROSS_COMPILATION_NOTICES=ON \
-DUSE_LIBNOTIFY=OFF \
-DUSE_LIBHYPHEN=OFF \
-DUSE_OPENJPEG=ON \
-DUSE_SOUP2=ON \
-DUSE_WOFF2=ON \
-DUSE_WPE_RENDERER=OFF
@@ -58,6 +58,13 @@ else
WEBKITGTK_CONF_OPTS += -DENABLE_WEBDRIVER=OFF
endif
ifeq ($(BR2_PACKAGE_LCMS2),y)
WEBKITGTK_CONF_OPTS += -DUSE_LCMS=ON
WEBKITGTK_DEPENDENCIES += lcms2
else
WEBKITGTK_CONF_OPTS += -DUSE_LCMS=OFF
endif
ifeq ($(BR2_PACKAGE_GOBJECT_INTROSPECTION),y)
WEBKITGTK_CONF_OPTS += -DENABLE_INTROSPECTION=ON
WEBKITGTK_DEPENDENCIES += gobject-introspection
@@ -74,7 +81,6 @@ ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y)
WEBKITGTK_CONF_OPTS += \
-DENABLE_ACCELERATED_2D_CANVAS=ON \
-DENABLE_GLES2=OFF \
-DENABLE_GRAPHICS_CONTEXT_GL=ON \
-DENABLE_X11_TARGET=ON
WEBKITGTK_DEPENDENCIES += libgl \
xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt
@@ -90,15 +96,11 @@ else # !X11
WEBKITGTK_DEPENDENCIES += libegl
# GLESv2 support is optional though
ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
WEBKITGTK_CONF_OPTS += \
-DENABLE_GLES2=ON \
-DENABLE_GRAPHICS_CONTEXT_GL=ON
WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=ON
WEBKITGTK_DEPENDENCIES += libgles
else
# Disable general OpenGL (shading) if there's no GLESv2
WEBKITGTK_CONF_OPTS += \
-DENABLE_GLES2=OFF \
-DENABLE_GRAPHICS_CONTEXT_GL=OFF
WEBKITGTK_CONF_OPTS += -DENABLE_GLES2=OFF
endif
# We must explicitly state the wayland target
ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y)
+1 -1
View File
@@ -1,4 +1,4 @@
# From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc
sha256 cff370c410d1e6d316ae0a7fa8ac6278fdf1efca5d3d664aca7cfd2aafa54446 wireless-regdb-2021.08.28.tar.xz
sha256 8828c25a4ee25020044004f57374bb9deac852809fad70f8d3d01770bf9ac97f wireless-regdb-2022.02.18.tar.xz
# Locally computed
sha256 678b0df753c86198fc496d1f1033429bbd57f101472132ee7eaaf9f5e0a7fae1 LICENSE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
WIRELESS_REGDB_VERSION = 2021.08.28
WIRELESS_REGDB_VERSION = 2022.02.18
WIRELESS_REGDB_SOURCE = wireless-regdb-$(WIRELESS_REGDB_VERSION).tar.xz
WIRELESS_REGDB_SITE = $(BR2_KERNEL_MIRROR)/software/network/wireless-regdb
WIRELESS_REGDB_LICENSE = ISC
+4 -4
View File
@@ -1,7 +1,7 @@
# From https://wpewebkit.org/releases/wpewebkit-2.34.4.tar.xz.sums
md5 b0f7dcb18acfa94cfb42fea0fe10fb0d wpewebkit-2.34.4.tar.xz
sha1 de58481b43a6dba054097f619ee486f7889d7a56 wpewebkit-2.34.4.tar.xz
sha256 3653ba42dbe22a4e6751b3f7cab8d2ebb2db5b7654c5d135a2f9bedf94778cee wpewebkit-2.34.4.tar.xz
# From https://wpewebkit.org/releases/wpewebkit-2.34.6.tar.xz.sums
md5 c9705270b342474cca28cf51632ccbbe wpewebkit-2.34.6.tar.xz
sha1 44ae95de1b5ebf0a2b0ea3630b3677153c597402 wpewebkit-2.34.6.tar.xz
sha256 301e895c8ed08ce7dccef3192b972f2ccfc2020463244c64069a636f2b05265f wpewebkit-2.34.6.tar.xz
# Hashes for license files:
sha256 0b5d3a7cc325942567373b0ecd757d07c132e0ebd7c97bfc63f7e1a76094edb4 Source/WebCore/LICENSE-APPLE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
WPEWEBKIT_VERSION = 2.34.4
WPEWEBKIT_VERSION = 2.34.6
WPEWEBKIT_SITE = http://www.wpewebkit.org/releases
WPEWEBKIT_SOURCE = wpewebkit-$(WPEWEBKIT_VERSION).tar.xz
WPEWEBKIT_INSTALL_STAGING = YES
@@ -16,9 +16,9 @@ XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \
xserver_xorg-server
ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy)
XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --enable-glamor
XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --enable-glamor
else
XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor
XDRIVER_XF86_VIDEO_ATI_CONF_OPTS += --disable-glamor
endif
# xdriver_xf86-video-ati requires O_CLOEXEC
@@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS = --disable-dri
XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --disable-dri
endif
$(eval $(autotools-package))
@@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
XDRIVER_XF86_VIDEO_MGA_CONF_OPTS = --disable-dri
XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri
endif
$(eval $(autotools-package))
@@ -12,7 +12,7 @@ XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING
XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
XDRIVER_XF86_VIDEO_R128_CONF_OPTS = --disable-dri
XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --disable-dri
endif
$(eval $(autotools-package))
@@ -13,7 +13,7 @@ XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS = --disable-dri
XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --disable-dri
endif
$(eval $(autotools-package))
@@ -16,7 +16,7 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \
xserver_xorg-server
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS = --disable-dri
XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri
endif
$(eval $(autotools-package))
+2 -2
View File
@@ -14,9 +14,9 @@ XZ_LICENSE_FILES = COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1
XZ_CPE_ID_VENDOR = tukaani
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y)
XZ_CONF_OPTS = --enable-threads
XZ_CONF_OPTS += --enable-threads
else
XZ_CONF_OPTS = --disable-threads
XZ_CONF_OPTS += --disable-threads
endif
# we are built before ccache
+1 -1
View File
@@ -44,7 +44,7 @@ ZFS_CONF_ENV += \
PYTHON_CPPFLAGS="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \
PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \
PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`" \
PYTHON_SITE_PKG="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages"
PYTHON_SITE_PKG="/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages"
ZFS_CONF_OPTS += --enable-pyzfs
else
ZFS_CONF_OPTS += --disable-pyzfs --without-python
+1 -5
View File
@@ -1,7 +1,3 @@
# From http://www.zsh.org/pub/MD5SUM
md5 e02a5428620b3dd268800c7843b3dd4d zsh-5.8.tar.xz
# Calculated based on the hash above and after checking signature
# http://www.zsh.org/pub/zsh-5.8.tar.xz.asc
sha256 dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27 zsh-5.8.tar.xz
# Locally calculated
sha256 b6973520bace600b4779200269b1e5d79e5f505ac4952058c11ad5bbf0dd9919 zsh-5.8.1.tar.xz
sha256 d06fdf3ef9b1ec69d6b9e170b0a9516fbad3523261ff1668bde3bfea6e0ef5f5 LICENCE
+1 -1
View File
@@ -4,7 +4,7 @@
#
################################################################################
ZSH_VERSION = 5.8
ZSH_VERSION = 5.8.1
ZSH_SITE = http://www.zsh.org/pub
ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz
ZSH_DEPENDENCIES = ncurses
+1 -1
View File
@@ -371,7 +371,7 @@ def get_pkglist(npackages, package_list):
def get_config_packages():
cmd = ["make", "--no-print-directory", "show-info"]
js = json.loads(subprocess.check_output(cmd))
return set([v["name"] for v in js.values()])
return set([v["name"] for v in js.values() if 'name' in v])
def package_init_make_info():
+1 -1
View File
@@ -189,7 +189,7 @@ config BR2_TOOLCHAIN_HAS_GCC_BUG_93847
config BR2_TOOLCHAIN_HAS_GCC_BUG_99140
bool
default y if !BR2_TOOLCHAIN_GCC_AT_LEAST_8
default y if BR2_TOOLCHAIN_GCC_AT_LEAST_10 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11
default y if BR2_TOOLCHAIN_GCC_AT_LEAST_9 && !BR2_TOOLCHAIN_GCC_AT_LEAST_11
depends on BR2_nios2
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101737
+6 -3
View File
@@ -1,4 +1,4 @@
#!/usr/bin/bash
#!/usr/bin/env bash
set -o errexit -o pipefail
DIR=$(dirname "${0}")
MAIN_DIR=$(readlink -f "${DIR}/..")
@@ -6,5 +6,8 @@ MAIN_DIR=$(readlink -f "${DIR}/..")
IMAGE=$(grep ^image: "${MAIN_DIR}/.gitlab-ci.yml" | \
sed -e 's,^image: ,,g' | sed -e 's,\$CI_REGISTRY,registry.gitlab.com,g')
set -x
exec docker run -v "${MAIN_DIR}:/home/br-user" -t "${IMAGE}" "$@"
exec docker run -it --rm \
--user $(id -u):$(id -g) \
--mount "type=bind,src=${MAIN_DIR},dst=${MAIN_DIR}" \
--workdir "${MAIN_DIR}" \
"${IMAGE}" "${@}"