19 months agoupslug2: Update to git repository
Rosen Penev [Thu, 8 Aug 2019 22:57:56 +0000 (15:57 -0700)]
upslug2: Update to git repository

This has two improvements over the current version. An autotools fix and
application of the wrt350v2 patch.

Cleaned up Makefile as a result of makefiles being fixed.

Note that this package is not really used as it depends on orion, which is
classified as broken.

This is the last package that uses svn in the tree.

Signed-off-by: Rosen Penev <>
(cherry picked from commit ac31ec0f62af31cdbc348911503bae8c152f8516)

19 months agosdk: use to ship kernel objtool tools
Jo-Philipp Wich [Fri, 30 Aug 2019 13:45:06 +0000 (15:45 +0200)]
sdk: use to ship kernel objtool tools

Ensure that the kernel objtool utilities are processed by the library
bundler in order to ensure that they're usable on foreign systems with
different libc versions.

Fixes: a9f6fceb42 ("sdk: fix building external modules when CONFIG_STACK_VALIDATION=y")
Acked-by: Yousong Zhou <>
Signed-off-by: Jo-Philipp Wich <>
(cherry picked from commit efaaadb49e90b51ba3a6adc6fafc330c23b8f764)

19 months agoinclude: kernel-build: pass pkg-config overrides to kernel build
Jo-Philipp Wich [Fri, 30 Aug 2019 13:24:45 +0000 (15:24 +0200)]
include: kernel-build: pass pkg-config overrides to kernel build

Pass suitable pkg-config overrides to the kernel build process in
order to let our pkg-config wrapper discover libraries provided
by tools/.

This mainly affects the use of libelf which is required for the
CONFIG_STACK_VALIDATION features. So far, the build system either
silently used host system libraries or kbuild simply disabled the
feature due to the lack of a suitable libelf.

Signed-off-by: Jo-Philipp Wich <>
(cherry picked from commit fe43969336201f2cc7d103b68fd6e65989bee184)

19 months agotools: libelf: fix headers to trigger -Wundef warnings
Jo-Philipp Wich [Fri, 30 Aug 2019 13:22:01 +0000 (15:22 +0200)]
tools: libelf: fix headers to trigger -Wundef warnings

When libelf from tools/ is used for building the kernel, compilation
aborts due to access to undefined defines since Kbuild adds -Wundef
to the compiler flags.

Patch the header files to use `#if defined(...)` instead of `#if ...`
to prevent such issues.

Signed-off-by: Jo-Philipp Wich <>
(cherry picked from commit f3ab336d7ceda929dc8dc4a8b09a9552dc6be0b1)

19 months agotools: libelf: install pkg-config file
Jo-Philipp Wich [Fri, 30 Aug 2019 13:28:27 +0000 (15:28 +0200)]
tools: libelf: install pkg-config file

Install the pkg-config definition for libelf in order to allow the
kernel build process discover it later on.

Signed-off-by: Jo-Philipp Wich <>
(cherry picked from commit d3f86c9cc3e465fbca51aaadbb274856831ba56c)

19 months agoscripts/feeds: fix 'src-include' directive
Bjørn Mork [Mon, 2 Sep 2019 11:49:21 +0000 (13:49 +0200)]
scripts/feeds: fix 'src-include' directive

Commit 775b70f8d5df renamed parse_file() parameters without
updating the recursive call. This broke parsing of any feeds.conf
using 'src-include'.

 $ scripts/feeds update -a
 Can't use string ("defaults") as a HASH ref while "strict refs" in use at scripts/feeds line 63, <$fh> line 1.

Fixes: 775b70f8d5df ("scripts/feeds: allow adding parameters to feeds")
Signed-off-by: Bjørn Mork <>
(cherry picked from commit a21b70be31a9d8adda0ae65cc38d1b3b4b6680d4)

19 months agouci: update to latest Git HEAD
Hauke Mehrtens [Sun, 1 Sep 2019 17:52:41 +0000 (19:52 +0200)]
uci: update to latest Git HEAD

415f9e4 uci/file: replace mktemp() with mkstemp()

Signed-off-by: Hauke Mehrtens <>
(cherry picked from commit 6aa962a62288952aec08c1f67fb0735f420f720e)

19 months agoiwinfo: update to latest Git HEAD
Hauke Mehrtens [Sun, 1 Sep 2019 17:47:50 +0000 (19:47 +0200)]
iwinfo: update to latest Git HEAD

f599a8d iwinfo: Fix rate buffer size
71ec9be iwinfo: Fix buffer size
f8ef450 iwinfo: Add support for WPA3

Signed-off-by: Hauke Mehrtens <>
(cherry picked from commit 6658447534152b72a3341b369f1eb545618fa7cf)

19 months agoFix handling of BUILD_SUFFIX in remote-gdb script
Thomas Langer [Thu, 22 Aug 2019 12:21:14 +0000 (12:21 +0000)]
Fix handling of BUILD_SUFFIX in remote-gdb script

When CONFIG_BUILD_SUFFIX is enabled, the target-* folders in build_dir
and staging_dir have this suffix in the name, but not the
toolchain directories. When detecting the names for "arch" and "libc",
also accept the suffix and do not use it for the toolchain path.

Signed-off-by: Thomas Langer <>
(cherry picked from commit 035906fd05b2e5543cedd9471731043945fdcf13)

19 months agotools/cmake: Update to 3.15.1
Daniel Engberg [Sat, 16 Mar 2019 21:09:22 +0000 (21:09 +0000)]
tools/cmake: Update to 3.15.1

Update CMake to 3.15.1
Refresh patches
Remove inofficial and replace with GitHub (link on official site)
Remove 150-C-feature-checks-Match-warnings-more-strictly.patch as it's
a no longer needed backport from upstream.
Disable ccache if GCC is 4.8, 4.9 or 5.X to avoid build failures.

Signed-off-by: Daniel Engberg <>
(cherry picked from commit 413c68d120043cd8ff1f4aa057d33c140bfc6bfa)

19 months agonftables: bump to version 0.9.2
Konstantin Demin [Wed, 21 Aug 2019 06:25:06 +0000 (09:25 +0300)]
nftables: bump to version 0.9.2

- exclude Python-related stuff from build
- drop patches:
  * 010-uclibc-ng.patch, applied upstream

ipkg size decrease by 2.8%:
194.851 nftables_0.9.0-2_arm_cortex-a7_neon-vfpv4.ipk
189.581 nftables_0.9.2-1_arm_cortex-a7_neon-vfpv4.ipk

Signed-off-by: Konstantin Demin <>
(cherry picked from commit b74f1f335a792a15feb0fd839a69486050d3531f)

19 months agolibnftnl: bump to version 1.1.4
Konstantin Demin [Wed, 21 Aug 2019 06:41:07 +0000 (09:41 +0300)]
libnftnl: bump to version 1.1.4

ABI version is same.

The ipkg size increase by about 2.2%:
47.909 libnftnl11_1.1.3-1_arm_cortex-a7_neon-vfpv4.ipk
48.985 libnftnl11_1.1.4-1_arm_cortex-a7_neon-vfpv4.ipk

Signed-off-by: Konstantin Demin <>
(cherry picked from commit 699955a684eb8f6eb39123632ec7e193fa132753)

19 months agorpcd: update to latest Git HEAD
Jo-Philipp Wich [Sun, 1 Sep 2019 16:33:03 +0000 (18:33 +0200)]
rpcd: update to latest Git HEAD

821045f file: add path based read/write/exec ACL checks
fb337e5 file: add stat() information to directory listings

Signed-off-by: Jo-Philipp Wich <>
(cherry picked from commit 02169bd3f8ccfa3076bb4d46e979d2fdcc7d413e)

19 months agouhttpd: add support to generate EC keys
Eneas U de Queiroz [Mon, 5 Aug 2019 18:34:39 +0000 (15:34 -0300)]
uhttpd: add support to generate EC keys

This adds the key_type and ec_curve options to enable the generation of
EC keys during initialization, using openssl or the new options added to

Signed-off-by: Eneas U de Queiroz <>
(cherry picked from commit 7f2b230b3b9d0a7fb758db3a9b1958845506a5a3)

19 months agopx5g: support EC keys
Eneas U de Queiroz [Mon, 5 Aug 2019 18:34:38 +0000 (15:34 -0300)]
px5g: support EC keys

This adds an 'eckey' command to generate an EC key, with an optional
curve name argument, with P-256 as default.

For the 'selfsigned' command, it adds an 'ec' algorithm argument to the
'-newkey' option, and a '-pkeyopt ec_paramgen_curve:<curvename>' option,
mirroring the way openssl specifies the curve name.

Notice that curve names are not necessarily the same in mbedtls and
openssl.  In particular, secp256r1 works for mbedtls, but openssl uses
prime256v1 instead. px5g uses mbedtls, but short NIST curve names P-256
and P-384 are specifically supported.

Package size increased by about 900 bytes (arm).

Signed-off-by: Eneas U de Queiroz <>
(cherry picked from commit a552ababd4ff8e91d3f03f7496f12d080a71ba28)

19 months agoopenssl: always build with EC support
Eneas U de Queiroz [Mon, 5 Aug 2019 18:34:37 +0000 (15:34 -0300)]
openssl: always build with EC support

Signed-off-by: Eneas U de Queiroz <>
(cherry picked from commit f40262697f5aebed25313a1b2eb8f68d37c97e60)

19 months agolibnfnetlink: Avoid passing both -fPIC and -fpic
Rosen Penev [Tue, 27 Aug 2019 22:49:22 +0000 (15:49 -0700)]
libnfnetlink: Avoid passing both -fPIC and -fpic

Instead, instruct the configure script to use $(FPIC) only.

Mixing -fPIC and -fpic can cause issues on some platforms like PPC.

Signed-off-by: Rosen Penev <>
(cherry picked from commit 926157c2ccb02aa06b343662ecbd2571faf6eddd)

19 months agoncurses: Do not pass both -fPIC and -fpic
Rosen Penev [Tue, 27 Aug 2019 22:49:21 +0000 (15:49 -0700)]
ncurses: Do not pass both -fPIC and -fpic

The configure scripts matches Linux with -fPIC, which is not exactly what
is desired. Since we are already passing $(FPIC), added a CONFIGURE_VAR to
avoid passing -fPIC.

Removed PKG_BUILD_DIR as it is already the default value.

Signed-off-by: Rosen Penev <>
(cherry picked from commit e2ecf39e8e49e43b4d358853f9da51e3897d042c)

19 months agobuild: remove harmful -nopad option from mksquashfs
Christian Lamparter [Fri, 30 Aug 2019 14:52:25 +0000 (16:52 +0200)]
build: remove harmful -nopad option from mksquashfs

While the -nopad option prevents mksquashfs from padding the
image to an arbitrary 4k. It does not take into consideration
that squashfs is programmed to have this 4k padding when it's
being used on on a block device... which is its main "use-case".

Now, after a week long discussion on the ML that included a
back-and-forth between some of the possible options.
But this is likely the best KISS patch to deal with the issue
right away given the limited resources.

From squashfs code point of view, be warned. The 4k padding is
not enough when dealing with devices that have a PAGE_SIZE
bigger than 4k.

if it turns out to be affecting you, then please look-up either:
"FS#2460 - kernel panic reading squashfs from ubi volume" bug
Or the discussion on the OpenWrt-Devel ML in
"amp821xx: use newly added pad-squashfs for Meraki MR24" and
"Squashfs breakage lottery with UBI..."
before making an educated guess.

Note: This will not affect the "tiny"/small flash devices as
much as it seems at first. This is because the the rootfs_data
partition that follows uses jffs2. And it requires to be aligned
to the flash block-size in order to work at all.

So either the involved FSes will meet in the middle as before,
or not at all. But in that latter case the image was already
hoping for the "undefined behaviour" gamble to turn out in its
favour and this is probably why this was unnoticed for so long.

Fixes: FS#2460
Reported-by: Russell Senior <>
Signed-off-by: Christian Lamparter <>
(cherry picked from commit 1c0290c5cc6258c48b8ba46b4f9c85a21de4f875)

19 months agobase-files: use JSON for storing firmware validation info
Rafał Miłecki [Fri, 23 Aug 2019 06:15:23 +0000 (08:15 +0200)]
base-files: use JSON for storing firmware validation info

So far firmware validation result was binary limited: it was either
successful or not. That meant various limitations, e.g.:
1) Lack of proper feedback on validation problems
2) No way of marking firmware as totally broken (impossible to install)

This change introduces JSON for storing detailed validation info. It
provides a list of performed validation tests and their results. It
allows marking firmware as non-forceable (broken image that can't be
even forced to install).
        "tests": {
                "fwtool_signature": true,
                "fwtool_device_match": true
        "valid": true,
        "forceable": true

Implementation is based on *internal* check_image bash script that:
1) Uses existing validation functions
2) Provides helpers for setting extra validation info

This allows e.g. platform_check_image() to call notify_check_broken()
when needed & prevent user from bricking a device.

Right now the new JSON info is used by /sbin/sysupgrade only. It still
doesn't make use of "forceable" as that is planned for later

Further plans for this feature are:
1) Expose firmware validation using some new ubus method
2) Move validation step from /sbin/sysupgrade into "sysupgrade" ubus
   method so:
   a) It's possible to safely sysupgrade using ubus only
   b) /sbin/sysupgrade can be more like just a CLI

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit f522047958f99ab7b506ec550f796c0460af1a85)

19 months agoscripts/feeds: allow adding parameters to feeds
Jo-Philipp Wich [Wed, 28 Aug 2019 13:21:35 +0000 (15:21 +0200)]
scripts/feeds: allow adding parameters to feeds

this allows adding "--" prefixed parameters inside feeds.conf between the
target and name. The first parameter is --force which has the same effect
as using -f when installing any of the packages. This allows creating
feeds that will override base packages by default.

Signed-off-by: Jo-Philipp Wich <>
(cherry picked from commit 775b70f8d5dfe9830aaf3b79fc8fb38c8148ee1f)

19 months agoprocd: fix compile issue with glibc (FS#2469)
Hans Dedecker [Wed, 28 Aug 2019 13:28:57 +0000 (15:28 +0200)]
procd: fix compile issue with glibc (FS#2469)

0430252 sysupgrade: add missing _GNU_SOURCE define (FS#2469)

Signed-off-by: Hans Dedecker <>
(cherry picked from commit 6e45ba4699eb8424951648cfeddc0a8633f8891e)

19 months agoopenssl: refresh patches
Christian Lamparter [Sat, 24 Aug 2019 09:23:55 +0000 (11:23 +0200)]
openssl: refresh patches

Signed-off-by: Christian Lamparter <>
(cherry picked from commit 5ef3fe614c1e8c350ca0083f61577a89c002bc53)

19 months agotreewide: sysupgrade: pass "save_partitions" option to the "sysupgrade" method
Rafał Miłecki [Fri, 16 Aug 2019 15:02:58 +0000 (17:02 +0200)]
treewide: sysupgrade: pass "save_partitions" option to the "sysupgrade" method

This explicitly lets stage2 know if partitions should be preserved. No
more "touch /tmp/sysupgrade.always.overwrite.bootdisk.partmap" hack.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit b6f4cd57e19a8cfcd9ff52582b65164ce6213c3d)

19 months agobase-files: pass "save_config" option to the "sysupgrade" method
Rafał Miłecki [Fri, 16 Aug 2019 14:54:38 +0000 (16:54 +0200)]
base-files: pass "save_config" option to the "sysupgrade" method

This explicitly lets stage2 know if config should be preserved.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit b534ba96110012d2697d19d71b7dcd60bd4cd375)

19 months agoprocd: update to latest git HEAD
Rafał Miłecki [Thu, 22 Aug 2019 11:45:45 +0000 (13:45 +0200)]
procd: update to latest git HEAD

9558031 system: support passing "options" to the "sysupgrade" ubus method

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit 2b1a6d263cc84ac6189447fe971b52d8b34cea51)

19 months agofirewall: update to latest git HEAD
Kevin Darbyshire-Bryant [Tue, 20 Aug 2019 11:29:47 +0000 (12:29 +0100)]
firewall: update to latest git HEAD

bf29c1e firewall3: ipset: Handle reload_set properly

Signed-off-by: Kevin Darbyshire-Bryant <>
(cherry picked from commit bd01346bb463d371627739fad539310ef5bd4146)

19 months agoelfutils: bump to 0.177
Luiz Angelo Daros de Luca [Mon, 19 Aug 2019 03:09:05 +0000 (00:09 -0300)]
elfutils: bump to 0.177

200-uclibc-ng-compat.patch is upstream now.

Signed-off-by: Luiz Angelo Daros de Luca <>
(cherry picked from commit 0851ce4ff97260a0fab2a507ee8370e60f78370d)

19 months agoiftop: update to HEAD of 2018-10-03 - 77901c
Christian Lamparter [Sun, 18 Aug 2019 00:31:01 +0000 (02:31 +0200)]
iftop: update to HEAD of 2018-10-03 - 77901c

Update iftop to commit 77901c8c53e01359d83b8090aacfe62214658183

git log --pretty=oneline --abbrev-commit 949ed0f7..77901c8c

77901c8 Support scales beyond 1Gbps

Created with the help of the script.

Signed-off-by: Christian Lamparter <>
(cherry picked from commit cfd0748497c5c27c6d0f80b0ad3698ffe4428352)

19 months agonghttp2: bump to 1.39.2
Hans Dedecker [Sun, 18 Aug 2019 16:54:47 +0000 (18:54 +0200)]
nghttp2: bump to 1.39.2

957abacf Bump up version number to 1.39.2, LT revision to 32:0:18
83d362c6 Don't read too greedily
a76d0723 Add nghttp2_option_set_max_outbound_ack
db2f612a nghttpx: Fix request stall

Signed-off-by: Hans Dedecker <>
(cherry picked from commit 58f929077f8687adbf75338504f319d054a96153)

19 months agoltq-ifxos: refer to
Yousong Zhou [Sun, 18 Aug 2019 15:21:23 +0000 (15:21 +0000)]
ltq-ifxos: refer to

Signed-off-by: Yousong Zhou <>
(cherry picked from commit f0f5cb26cb7ced03c70063d08c90d211f80b7a31)

19 months agoct-bugcheck: report to by default
Yousong Zhou [Sun, 18 Aug 2019 15:19:57 +0000 (15:19 +0000)]
ct-bugcheck: report to by default

Signed-off-by: Yousong Zhou <>
(cherry picked from commit 26615ededcdc7c6d30c72d77c3a890be1f777b32)

19 months use
Yousong Zhou [Sun, 18 Aug 2019 15:18:10 +0000 (15:18 +0000)] use now redirects to there returns 404, so remove it here

Signed-off-by: Yousong Zhou <>
(cherry picked from commit 0f3667864d5391c2d9ace63ccfc83ab270405cc9)

19 months use openwrt url instead of lede project
Luis Araneda [Sun, 18 Aug 2019 14:59:11 +0000 (10:59 -0400)] use openwrt url instead of lede project

The LEDE URL is automatically redirected to the OpenWRT one,
returning an HTTP 301 code (Moved Permanently).

Also, use https, as indicated by the redirect.

Signed-off-by: Luis Araneda <>
(cherry picked from commit b39ded4ab7e02cedd50810a206dadd71e1ea7fb7)

19 months agoustream-ssl: update to latest git HEAD
Hauke Mehrtens [Sat, 17 Aug 2019 15:09:42 +0000 (17:09 +0200)]
ustream-ssl: update to latest git HEAD

e8f9c22 Revise supported ciphersuites
7e9e269 wolfssl, openssl: use TLS 1.3, set ciphersuites

Signed-off-by: Hauke Mehrtens <>
(cherry picked from commit ced2b7bb988426aaece07a78c17d5a7c268e54c4)

19 months agotools/e2fsprogs: Update to 1.45.3
Daniel Engberg [Sat, 15 Jun 2019 09:47:21 +0000 (09:47 +0000)]
tools/e2fsprogs: Update to 1.45.3

Update e2fsprogs to 1.45.3
Remove OpenBSD patch
Remove Darwin patch, neither macports or brew patches these files
Add patch to avoid crond detection on host OS

Signed-off-by: Daniel Engberg <>
(cherry picked from commit 234f7a9e5dccfaa449d75a120ef90080d0715436)

19 months agobuild: fix indent in
Adrian Schmutzler [Fri, 9 Aug 2019 11:55:43 +0000 (13:55 +0200)]
build: fix indent in

Convert leading spaces to tab to match rest of the file.

Signed-off-by: Adrian Schmutzler <>
(cherry picked from commit 7e5a0da6426b3b14bde8798524826b64e16cf219)

19 months agohostapd: Allow CONFIG_IEEE80211W for all but mini variant
Hauke Mehrtens [Wed, 7 Aug 2019 19:37:25 +0000 (21:37 +0200)]
hostapd: Allow CONFIG_IEEE80211W for all but mini variant

This commit will activate CONFIG_IEEE80211W for all, but the mini
variant when at least one driver supports it. This will add ieee80211w
support for the mesh variant for example.

Fixes: FS#2397
Signed-off-by: Hauke Mehrtens <>
(cherry picked from commit 1d4df52c215874a5238ddef7bccf0139f7758c24)

19 months agohostapd: Remove ROBO switch support
Hauke Mehrtens [Sat, 4 May 2019 12:16:52 +0000 (14:16 +0200)]
hostapd: Remove ROBO switch support

The driver was removed from OpenWrt a long time ago.

Signed-off-by: Hauke Mehrtens <>
(cherry picked from commit f34e8258340f5994a2506bd087fc6e6d4a3d5d5e)

19 months agofirewall: improve ipset support
Kevin Darbyshire-Bryant [Fri, 16 Aug 2019 09:05:12 +0000 (10:05 +0100)]
firewall: improve ipset support

Bump to latest git HEAD

509e673 firewall3: Improve ipset support

The enabled option did not work properly for ipsets, as it was not
checked on create/destroy of a set. After this commit, sets are only
created/destroyed if enabled is set to true.

Add support for reloading, or recreating, ipsets on firewall reload.  By
setting "reload_set" to true, the set will be destroyed and then
re-created when the firewall is reloaded.

Add support for the counters and comment extensions. By setting
"counters" or "comment" to true, then counters or comments are added to
the set.

Signed-off-by: Kevin Darbyshire-Bryant <>
(cherry picked from commit 51ffce069424f86e894369cee5cd327dd503db5f)

19 months agobuild: allow overriding default selection state for devices
Jonas Gorski [Tue, 13 Aug 2019 10:33:47 +0000 (12:33 +0200)]
build: allow overriding default selection state for devices

Allow overriding the default selection state for Devices, similar to
setting a default for packages.

E.g. by setting DEFAULT to n, they won't be selected by default anymore
when enabling all device in the multi device profile.

This allows preventing images being built by the default config for
known broken devices, devices without enough RAM/flash, or devices not
working with a certain kernel versions.

This does not prevent the devices from being manually selected or images
being built by the ImageBuilder. These devices often still have worth
with a reduced package-set, or as a device for regression testing, when
no better device is available.

Signed-off-by: Jonas Gorski <>
(cherry picked from commit 7546be60074e452751ba2a48eddbc13910bec708)

19 months agobuild: add buildinfo files for reproducibility
Paul Spooren [Thu, 13 Jun 2019 00:24:04 +0000 (02:24 +0200)]
build: add buildinfo files for reproducibility

generate feeds.buildinfo and version.buildinfo in build dir after
containing the feed revisions (via ./scripts/feeds list -sf) as well as
the current revision of buildroot (via ./scripts/

With this information it should be possible to reproduce any build,
especially the release builds.

Usage would be to move feeds.buildinfo to feeds.conf and git checkout the
revision hash of version.buildinfo.

Content of feeds.buildinfo would look similar to this:

    src-git routing^bf475d6
    src-git telephony^470eb8e

Content of version.buildinfo would look similar to this:


Without the exact feed revision it is not possible to determine
installed package versions.

Also rename config.seed to config.buildinfo to follow the recommended
style of

Signed-off-by: Paul Spooren <>
(cherry picked from commit 454021581f630d5d04afeb8ff6581c1bda295c87)

19 months agosdk: fix GCC and Python dangling symlinks
Petr Štetiar [Thu, 8 Aug 2019 19:16:02 +0000 (21:16 +0200)]
sdk: fix GCC and Python dangling symlinks

Force prereq again in SDK in order to fix GCC and Python dangling

 staging_dir/host/bin/g++ -> /builder/ath79_generic/
 staging_dir/host/bin/gcc -> /builder/ath79_generic/
 staging_dir/host/bin/python -> /usr/bin/python3.5
 staging_dir/host/bin/python3 -> /usr/bin/python3.5

Ref: FS#2424
Signed-off-by: Petr Štetiar <>
(cherry picked from commit 200f2666fb1c8d9d128824dc5586e0e66386971f)

19 months agodnsmasq: use nettle ecc_curve access functions
Hans Dedecker [Fri, 9 Aug 2019 19:25:37 +0000 (21:25 +0200)]
dnsmasq: use nettle ecc_curve access functions

Fixes compile issues with nettle 3.5.1

Signed-off-by: Hans Dedecker <>
(cherry picked from commit 63ced140484e072dddbba39bb729adc98d94d522)

19 months agonettle: Update to 3.5.1
Daniel Engberg [Sat, 3 Aug 2019 20:27:36 +0000 (22:27 +0200)]
nettle: Update to 3.5.1

Update (lib)nettle to 3.5.1

Signed-off-by: Daniel Engberg <>
(cherry picked from commit 9e489b41b596a768b04b796a9b375d7d005b6ec7)

19 months agocomgt-ncm: add driver dependencies again
Vincent Wiemann [Sun, 4 Aug 2019 23:42:45 +0000 (01:42 +0200)]
comgt-ncm: add driver dependencies again

In the commit 623716dd4318 ("comgt-ncm: Fix NCM protocol")
the dependencies to vendor NCM drivers were removed, because:

> comgt-ncm should not depend on the USB-serial-related kernel modules,
> as the cdc-wdm control device works without them. There is also no need
> to depend on kmod-huawei-cdc-ncm, since other manufacturers (like
> Ericsson and Samsung) which use other kernel modules should also be
> supported.

From a user-perspective this does not make sense, as installing comgt-ncm
(or luci-proto-ncm) should install all needed dependencies for using such
a device.

Furthermore depending on kmod-huawei-cdc-ncm does not mean that Ericsson
and Samsung devices can't be supported. By the way it seems that Ericsson
and Samsung devices never used NCM, but act as serial modems.

Thus this commit adds the dependencies again.

Signed-off-by: Vincent Wiemann <>
[fixed title capitalization, formatted commit message,
renamed Sony-Ericsson to Ericsson]
Signed-off-by: David Bauer <>
(cherry picked from commit ccb4b96b8a4990178512c7a785f998a5e6f74cc3)

19 months agogpio-button-hotplug: add volume button handling
Chuanhong Guo [Sun, 4 Aug 2019 08:29:39 +0000 (16:29 +0800)]
gpio-button-hotplug: add volume button handling

This is used by PISEN WMB001N.

Signed-off-by: Chuanhong Guo <>
(cherry picked from commit 11182349e1f31f873ebddd69d6b87dec638eaabf)

19 months agoprocd: update to latest git HEAD (FS#2425)
Hans Dedecker [Wed, 7 Aug 2019 11:52:00 +0000 (13:52 +0200)]
procd: update to latest git HEAD (FS#2425)

8323690 state: fix shutdown when running in a container (FS#2425)

Signed-off-by: Hans Dedecker <>
(cherry picked from commit d9364c1cbc6a13f1dc2ea8432c98962ed157991f)

19 months agonetifd: update to latest git HEAD
Hans Dedecker [Wed, 7 Aug 2019 11:37:00 +0000 (13:37 +0200)]
netifd: update to latest git HEAD

5e02f94 system-linux: fix resource leak

Signed-off-by: Hans Dedecker <>
(cherry picked from commit d70a35c365ae607671f8698fee10f29fd9023161)

19 months agoexpat: Update to 2.2.7
Daniel Engberg [Sat, 3 Aug 2019 20:30:36 +0000 (22:30 +0200)]
expat: Update to 2.2.7

Update (lib)expat to 2.2.7

Signed-off-by: Daniel Engberg <>
(cherry picked from commit 7270fdb62ff86f7b85c6dfbc0ea4ff0ba5ff9b9e)

19 months agolinux-atm: Add missing headers
Rosen Penev [Thu, 18 Jul 2019 01:37:17 +0000 (18:37 -0700)]
linux-atm: Add missing headers

This fixes compilation with -Werror=implicit-function-declaration.

Signed-off-by: Rosen Penev <>
(cherry picked from commit 1b1c47577bac99bdd8ab9ecde928ab0398f78799)

19 months agotoolchain: fix gcc depends on kernel headers
Hauke Mehrtens [Tue, 23 Jul 2019 14:53:51 +0000 (16:53 +0200)]
toolchain: fix gcc depends on kernel headers

GCC needs the kernel headers to compile.
Some GCC file includes asm/unistd.h which is provided by the kernel headers.
Normally the kernel headers build is very fast and ready before the gcc uses
it, but if it clones the kernel from a slow git repository it takes longer
and then it could be that the gcc already wants to use the kernel headers
before they are available. This patch fixes this problem by adding the
missing dependency.

Signed-off-by: Hauke Mehrtens <>
(cherry picked from commit b20156ba704ed8e03d030b2f294d8d19bebd2f71)

19 months agobuild: include BUILD_VARIANT in PKG_BUILD_DIR
Jeffery To [Sat, 3 Aug 2019 20:45:06 +0000 (04:45 +0800)]

This changes the default PKG_BUILD_DIR to take BUILD_VARIANT into
account (if set), so that packages do not need to manually override
PKG_BUILD_DIR just to handle variants.

This also updates most base packages with variants to use the updated
default PKG_BUILD_DIR.

Signed-off-by: Jeffery To <>
(cherry picked from commit e545fac8d968864a965edb9e50c6f90940b0a6c9)

19 months agoethtool: bump to 5.2
Hans Dedecker [Mon, 5 Aug 2019 18:59:38 +0000 (20:59 +0200)]
ethtool: bump to 5.2

379c096 Release version 5.2.
2bce6d9 ethtool: Add 100BaseT1 and 1000BaseT1 link modes
67ffbf5 ethtool: sync ethtool-copy.h with linux-next from 30/05/2019
687152b ethtool.spec: Use standard file location macros

Signed-off-by: Hans Dedecker <>
(cherry picked from commit 018395392c2608698201042bbaa180b82eb7120f)

19 months agofirewall: update to latest git HEAD
Hans Dedecker [Mon, 5 Aug 2019 12:16:14 +0000 (14:16 +0200)]
firewall: update to latest git HEAD

de94097 utils: coverity resource leak warning

Signed-off-by: Hans Dedecker <>
(cherry picked from commit efb7b7a12af55758458cdb945a0833af411289f7)

19 months agoipset: update to 7.3
DENG Qingfang [Wed, 31 Jul 2019 00:26:57 +0000 (08:26 +0800)]
ipset: update to 7.3

Signed-off-by: DENG Qingfang <>
(cherry picked from commit edd9b39fab46a7231b8662697ba8c10de42d5a66)

19 months agosdk: Fix cryptodev-linux build when CONFIG_ARM64_MODULE_PLTS=y
Jeffery To [Fri, 2 Aug 2019 19:03:14 +0000 (03:03 +0800)]
sdk: Fix cryptodev-linux build when CONFIG_ARM64_MODULE_PLTS=y

When CONFIG_ARM64_MODULE_PLTS=y, arch/arm64/kernel/ is
required to build cryptodev-linux. This updates the sdk to include this

Signed-off-by: Jeffery To <>
(cherry picked from commit 6e300f6a0c94812d0f4d8f67df6604c763f7552f)

19 months agoccache: update to 3.7.2
DENG Qingfang [Wed, 31 Jul 2019 00:23:12 +0000 (08:23 +0800)]
ccache: update to 3.7.2

Update ccache to 3.7.2

Release notes:

Signed-off-by: DENG Qingfang <>
(cherry picked from commit 2caf747116337645420653ec003799a8eef69229)

19 months agotoolchain/fortify-headers: Update to 1.1
Kevin Darbyshire-Bryant [Fri, 26 Jul 2019 13:19:22 +0000 (14:19 +0100)]
toolchain/fortify-headers: Update to 1.1

Update fortify-headers to 1.1

Signed-off-by: Kevin Darbyshire-Bryant <>
(cherry picked from commit cbe08e6b563438054c1efcb0daa0b965ec902052)

19 months autoreconf: fix missing install-sh
Petr Štetiar [Tue, 4 Dec 2018 13:47:23 +0000 (14:47 +0100)] autoreconf: fix missing install-sh

I'm trying to create a package for libgpiod, which uses
AC_CONFIG_AUX_DIR macro, which is probably leading to the following
configure error:

 autoreconf: running: /openwrt.git/staging_dir/host/bin/libtoolize --force
 OpenWrt-libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `autostuff'.
 OpenWrt-libtoolize: linking file `autostuff/'
 OpenWrt-libtoolize: putting macros in `m4'.
 configure: error: cannot find install-sh,, or shtool in autostuff "."/autostuff

>From the build output it's clear, that libtoolize isn't installing
install-sh symlink, because libtoolize would install install-sh only if
it's being run with --install parameter. Corresponding part in

 if $opt_install; then
   func_config_update config.guess \
     "$pkgdatadir/config" "$auxdir" pkgconfig_header
   func_config_update config.sub \
     "$pkgdatadir/config" "$auxdir" pkgconfig_header
   func_install_update install-sh \
     "$pkgdatadir/config" "$auxdir" pkgconfig_header
 func_ltmain_update \
    "$pkgdatadir/config" "$auxdir" pkgconfig_header

Adding --install parameter to libtoolize fixes this build issue:

 autoreconf: running: /openwrt.git/staging_dir/host/bin/libtoolize --install --force
 OpenWrt-libtoolize: putting auxiliary files in AC_CONFIG_AUX_DIR, `autostuff'.
 OpenWrt-libtoolize: linking file `autostuff/config.guess'
 OpenWrt-libtoolize: linking file `autostuff/config.sub'
 OpenWrt-libtoolize: linking file `autostuff/install-sh'
 OpenWrt-libtoolize: linking file `autostuff/'
 OpenWrt-libtoolize: putting macros in `m4'.

Cc: Felix Fietkau <>
Signed-off-by: Petr Štetiar <>
(cherry picked from commit 5cf897779eacf63cdbcdebd1af68c109096665c6)

19 months agotools: libressl: fix compilation for non-glibc clib (FS#2400)
Hans Dedecker [Tue, 23 Jul 2019 12:47:56 +0000 (14:47 +0200)]
tools: libressl: fix compilation for non-glibc clib (FS#2400)

Fixes compilaton issue for non glibc clibs :

libtool: compile:  gcc -DPACKAGE_NAME=\"libressl\" -DPACKAGE_TARNAME=\"libressl\" -DPACKAGE_VERSION=\"2.9.2\" "-DPACKAGE_STRING=\"libressl 2.9.2\"" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libressl\" -DVERSION=\"2.9.2\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_SYMLINK=1 -DHAVE_ERR_H=1 -DHAVE_ASPRINTF=1 -DHAVE_MEMMEM=1 -DHAVE_STRLCAT=1 -DHAVE_STRLCPY=1 -DHAVE_STRNDUP=1 -DHAVE_STRNLEN=1 -DHAVE_STRSEP=1 -DHAVE_TIMEGM=1 -DHAVE_SYSLOG=1 -DHAVE_ACCEPT4=1 -DHAVE_PIPE2=1 -DHAVE_POLL=1 -DHAVE_SOCKETPAIR=1 -DHAVE_EXPLICIT_BZERO=1 -DHAVE_GETAUXVAL=1 -DHAVE_GETAUXVAL=1 -DHAVE_DL_ITERATE_PHDR=1 -DHAVE_CLOCK_GETTIME=1 -DHAVE_VA_COPY=1 -DHAS_GNU_WARNING_LONG=1 -DSIZEOF_TIME_T=8 -I. -I../include -I../include/compat -DLIBRESSL_INTERNAL -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -I../crypto/asn1 -I../crypto/bn -I../crypto/ec -I../crypto/ecdsa -I../crypto/evp -I../crypto/modes -I../crypto -I/builds/pantacor/pv-platforms/openwrt-base/openwrt/staging_dir/host/include -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE -D__STRICT_ALIGNMENT -O2 -I/builds/pantacor/pv-platforms/openwrt-base/openwrt/staging_dir/host/include -fpic -Wall -std=gnu99 -fno-strict-aliasing -fno-strict-overflow -D_FORTIFY_SOURCE=2 -fstack-protector-strong -DHAVE_GNU_STACK -Wno-pointer-sign -MT compat/getprogname_linux.lo -MD -MP -MF compat/.deps/getprogname_linux.Tpo -c compat/getprogname_linux.c -o compat/getprogname_linux.o
compat/getprogname_linux.c: In function 'getprogname':
compat/getprogname_linux.c:32:2: error: #error "Cannot emulate getprogname"
 #error "Cannot emulate getprogname"

Reported-by: Anibal Portero <>
Signed-off-by: Hans Dedecker <>
(cherry picked from commit 1282a630272c59dfd105262772a2ca136084db03)

19 months agonetifd: update to latest git HEAD
Hans Dedecker [Mon, 22 Jul 2019 19:46:31 +0000 (21:46 +0200)]
netifd: update to latest git HEAD

899f168 system-linux: Coverity fixes

Signed-off-by: Hans Dedecker <>
(cherry picked from commit 11617bcb3be6778d5427723a09922aae50956a8c)

19 months agotools: libressl: fix build on MacOS
Kevin Darbyshire-Bryant [Mon, 22 Jul 2019 13:38:54 +0000 (14:38 +0100)]
tools: libressl: fix build on MacOS

Making all in tests
depbase=`echo handshake_table.o | sed 's|[^/]*$|.deps/&|;s|\.o$||'`;\
gcc -DPACKAGE_NAME=\"libressl\" -DPACKAGE_TARNAME=\"libressl\" -DPACKAGE_VERSION=\"2.9.2\" -DPACKAGE_STRING=\"libressl\ 2.9.2\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" -DPACKAGE=\"libressl\" -DVERSION=\"2.9.2\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_DLFCN_H=1 -DLT_OBJDIR=\".libs/\" -DHAVE_SYMLINK=1 -DHAVE_ERR_H=1 -DHAVE_READPASSPHRASE_H=1 -DHAVE_ASPRINTF=1 -DHAVE_MEMMEM=1 -DHAVE_READPASSPHRASE=1 -DHAVE_STRLCAT=1 -DHAVE_STRLCPY=1 -DHAVE_STRNDUP=1 -DHAVE_STRNLEN=1 -DHAVE_STRSEP=1 -DHAVE_TIMEGM=1 -DHAVE_GETPROGNAME=1 -DHAVE_SYSLOG=1 -DHAVE_POLL=1 -DHAVE_SOCKETPAIR=1 -DHAVE_ARC4RANDOM=1 -DHAVE_ARC4RANDOM_BUF=1 -DHAVE_ARC4RANDOM_UNIFORM=1 -DHAVE_TIMINGSAFE_BCMP=1 -DHAVE_CLOCK_GETTIME=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DSIZEOF_TIME_T=8 -I.  -I../include -I../include/compat -DLIBRESSL_INTERNAL -D__BEGIN_HIDDEN_DECLS= -D__END_HIDDEN_DECLS= -I ../crypto/modes -I ../crypto/asn1 -I ../ssl -I ../tls -I ../apps/openssl -I ../apps/openssl/compat -D_PATH_SSL_CA_FILE=\"../apps/openssl/cert.pem\" -I/Users/kevin/wrt/staging_dir/host/include  -D__STRICT_ALIGNMENT  -O2 -I/Users/kevin/wrt/staging_dir/host/include  -fpic -Wall -std=gnu99 -fno-strict-aliasing  -fno-strict-overflow -D_FORTIFY_SOURCE=2 -fstack-protector-strong  -Qunused-arguments -Wno-pointer-sign -MT handshake_table.o -MD -MP -MF $depbase.Tpo -c -o handshake_table.o handshake_table.c &&\
mv -f $depbase.Tpo $depbase.Po
make[4]: *** No rule to make target `/Users/kevin/wrt/build_dir/host/libressl-2.9.2/crypto/.libs/libcrypto_la-cpuid-macosx-x86_64.o', needed by `handshake_table'.  Stop.
make[3]: *** [all-recursive] Error 1

A similar error & clues from

LibreSSL 2.9.1 now has a test that requires libtls.a, however, when building a
shared library only build, the --disable-static flag is passed to libressl,
which prevents the building of libtls.a.

With libtls.a not being built, the following error occurs:
libressl-2.9.1/tls/.libs/libtls.a', needed by 'handshake_table'.  Stop.

There are three options to fix this:
1) Stick with autotools, and provide a patch that removes building anything in
   the tests folder.
2) Pass --enable-static to LIBRESSL_CONF_OPTS
3) Change the package type to cmake, as a cmake build does not have this issue."

It appears we cannot change to cmake because cmake has a dependency on
an ssl library.

Take option 1 and do not build the tests.

Also take the opportunity to remove man page building as well.

Signed-off-by: Kevin Darbyshire-Bryant <>
(cherry picked from commit 8d6d227bb653b7cce7092a5a9d55180c3e022848)

19 months agocurl: update to 7.65.3
Hans Dedecker [Sun, 21 Jul 2019 21:25:15 +0000 (23:25 +0200)]
curl: update to 7.65.3

For changes in 7.65.3; see

Signed-off-by: Hans Dedecker <>
(cherry picked from commit fc2df4f7050adae3ca6284a499fa914e07cba70b)

19 months agotools: libressl: update to 2.9.2 version
Roman Yeryomin [Thu, 18 Jul 2019 16:35:50 +0000 (19:35 +0300)]
tools: libressl: update to 2.9.2 version

To keep in sync with OpenSSL 1.1.x branch version options.

Signed-off-by: Roman Yeryomin <>
(cherry picked from commit 3f1e8c01316a5ea0162197cd8eb6dbbabe396176)

19 months agoopenvpn: add new list option tls_ciphersuites
Martin Schiller [Tue, 28 May 2019 10:50:15 +0000 (12:50 +0200)]
openvpn: add new list option tls_ciphersuites

To configure the list of allowable TLS 1.3 ciphersuites, the option
tls_ciphersuites is used instead of tls_ciphers.

Signed-off-by: Martin Schiller <>
(cherry picked from commit 261df949faad6dda43454868628f79265e9cc5e7)

19 months agobase-files: don't set ARGV and ARGC
Rafał Miłecki [Sun, 14 Jul 2019 17:00:00 +0000 (19:00 +0200)]
base-files: don't set ARGV and ARGC

Those are not used by any image check function anymore.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit 3f4c785a6bbde87296e362c315f10b55c98843e3)

19 months agomvebu: sysupgrade: drop platform_copy_config_sdcard() argument
Rafał Miłecki [Sun, 14 Jul 2019 20:08:58 +0000 (22:08 +0200)]
mvebu: sysupgrade: drop platform_copy_config_sdcard() argument

That function doesn't take any arguments so don't pass anything when
calling it.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit 670ce65a44db4263ee21a3fce962c47378ef042b)

19 months agotarget/toolchain/files/ simplify 'case'
Eneas U de Queiroz [Mon, 15 Jul 2019 17:08:00 +0000 (14:08 -0300)]
target/toolchain/files/ simplify 'case'

Removed an eglibc remnant, and while at it, grouped all of the
TOOLCHAIN_PLATFORMs using the same FLAGS together.

Signed-off-by: Eneas U de Queiroz <>
(cherry picked from commit 7d97bc19f08fc3f9a644b70323daa58e58291227)

19 months agolibs/toolchain: remove eglibc remnant file
Eneas U de Queiroz [Mon, 15 Jul 2019 17:07:59 +0000 (14:07 -0300)]
libs/toolchain: remove eglibc remnant file

This removes package/libs/toolchain/eglibc-files/etc/nsswitch.conf.

Signed-off-by: Eneas U de Queiroz <>
(cherry picked from commit c47eff0df3270199a69552587355834e57d6b782)

19 months agoubox: implement service_running() in log init.d script
Rafał Miłecki [Wed, 3 Jul 2019 09:16:22 +0000 (11:16 +0200)]
ubox: implement service_running() in log init.d script

It allows checking if service is running.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit 1b937cb14184b5ff9a7a75fbc5d226032f931c35)

19 months agorpcd: implement service_running() in init.d script
Rafał Miłecki [Wed, 3 Jul 2019 09:16:21 +0000 (11:16 +0200)]
rpcd: implement service_running() in init.d script

It allows checking if service is running.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit 285c83a004ea57d484e6f27df9ac04d0d7b0f00f)

19 months agoprocd: update to latest git HEAD
Hans Dedecker [Sat, 13 Jul 2019 11:24:56 +0000 (13:24 +0200)]
procd: update to latest git HEAD

31f0765 procd: check strchr() result before using it

Signed-off-by: Hans Dedecker <>
(cherry picked from commit 9a72e7f60171d73e4eb83b5ec71df20e48ee5f18)

19 months agobase-files: move stage2 upgrade to separated file
Rafał Miłecki [Wed, 3 Jul 2019 07:51:49 +0000 (09:51 +0200)]
base-files: move stage2 upgrade to separated file

do_upgrade_stage2() isn't really any common code. It isn't used anywhere
except for /sbin/sysupgrade that passes it to the stage2.

Moving its code to separated file also simplifies COMMAND variable.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit f7edd94a6588aa6a3e2e7a72410a34392a9fbe78)

19 months agoinclude/ Add support for src-checkout/ folder
John Crispin [Wed, 10 Jul 2019 11:32:24 +0000 (13:32 +0200)]
include/ Add support for src-checkout/ folder

This feature is similar to the SRC_TREE_OVERRIDE. However instead of having
to manually create a symlink inside the package folder, the buildsystem
will check if $(TOP_DIR)/src-checkout/$(PKG_NAME)/.git is present and use
this instead.

Signed-off-by: John Crispin <>
(cherry picked from commit 9e57b627834166f0b0e365a165975fafd72ab951)

19 months agousbreset: Add missing header
Rosen Penev [Sun, 7 Jul 2019 21:30:17 +0000 (14:30 -0700)]
usbreset: Add missing header

Fixes undefined reference to strtoul

Signed-off-by: Rosen Penev <>
(cherry picked from commit 653e05d27f13fee2ab925031c5162ddb34b755f0)

19 months agoutil-linux: Update to 2.34
Daniel Engberg [Sat, 15 Jun 2019 10:20:44 +0000 (10:20 +0000)]
util-linux: Update to 2.34

Update util-linux to 2.34
Refresh patch

Signed-off-by: Daniel Engberg <>
(cherry picked from commit d51f53b5badd684af702b946dea47cf5501ead6d)

19 months agotools/gengetopt: Update to 2.23
Daniel Engberg [Sat, 15 Jun 2019 09:07:53 +0000 (09:07 +0000)]
tools/gengetopt: Update to 2.23

Update gengetopt to 2.23
Remove 100-dependency_fix.patch, fixed upstream
Rework no tests and docs patch
Fix typo in copyright section

Signed-off-by: Daniel Engberg <>
(cherry picked from commit 6fac9077c674e151e86cb02319c76f6d526579c7)

19 months agoiperf3: update to 3.7
DENG Qingfang [Fri, 5 Jul 2019 18:42:23 +0000 (02:42 +0800)]
iperf3: update to 3.7

Signed-off-by: DENG Qingfang <>
(cherry picked from commit 42b3a3a89b6d60e10c6c266d29ebc779b7fee718)

19 months agobase-files: drop support for NAND upgrade in platform_pre_upgrade()
Rafał Miłecki [Tue, 2 Jul 2019 14:10:57 +0000 (16:10 +0200)]
base-files: drop support for NAND upgrade in platform_pre_upgrade()

With bcm53xx switched to the new procedure there is no more need for
keeping that backward compatibility code.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit ea4e1dac71dfa015c0da10e68149478fa25878f9)

19 months agobcm53xx: sysupgrade: call nand_do_upgrade() from platform_do_upgrade()
Rafał Miłecki [Tue, 2 Jul 2019 14:10:56 +0000 (16:10 +0200)]
bcm53xx: sysupgrade: call nand_do_upgrade() from platform_do_upgrade()

Calling nand_do_upgrade() from platform_pre_upgrade() was obsoleted in
the commit 30f61a34b4cf ("base-files: always use staged sysupgrade").

This change brings bcm53xx in sync with other targets and allows
dropping backward compatibility code. It shouldn't change any user
visible behavior.

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit ccf8a8e8633ccfd94fda233b06055ac42e4c9fd5)

19 months agobase-files: drop unused jffs2_copy_config()
Rafał Miłecki [Tue, 2 Jul 2019 11:16:08 +0000 (13:16 +0200)]
base-files: drop unused jffs2_copy_config()

Its last usage was dropped back in 2013 in the commit b95bdc8ab56e
("kernel/base-files: clean up old code related to refreshing mtd
partitions, it is no longer used anywhere").

Signed-off-by: Rafał Miłecki <>
(cherry picked from commit f58ca6ee57b77350c69639defdceacb2e77e2249)

19 months agozram-swap: Add extra commands for status/compaction
Emil Muratov [Sun, 24 Feb 2019 07:00:03 +0000 (10:00 +0300)]
zram-swap: Add extra commands for status/compaction

This patch adds two new commands:
  zram status - shows memory stats for all zram swaps
  zram compaction - trigger compaction for all zram swaps

Signed-off-by: Emil Muratov <>
Signed-off-by: Christian Lamparter <>
(cherry picked from commit a9deed62af569608af3e4e076138d788e24b1652)

19 months agobusybox: enable swapon/off by default to make it consistent with mkswap
Emil Muratov [Thu, 1 Nov 2018 18:53:43 +0000 (21:53 +0300)]
busybox: enable swapon/off by default to make it consistent with mkswap

  No size increase on busybox binary.
  Since busybox mkswap is already enabled by default it seems reasonable
  to enable swapon/off too. For ex. this obsoletes installing block-mount
  dependency for zram-swap.

Signed-off-by: Emil Muratov <>
(cherry picked from commit afa5ce2493505dc0a0de4cefa9ccbf3a6389bdbc)

19 months agozram-swap: Add zram compaction and statistics info output
Emil Muratov [Wed, 31 Oct 2018 21:16:58 +0000 (00:16 +0300)]
zram-swap: Add zram compaction and statistics info output

Executing '/etc/init.d/zram start' during runtime (with a swap being already
mounted) triggers zram device compaction and prints out nice stats info about
zram memory usage

Signed-off-by: Emil Muratov <>
Signed-off-by: Christian Lamparter <> [use IEC's MiB unit]
(cherry picked from commit b062c90f47dd0745562a8f2618c2a43136a4c7e1)

19 months agozram-swap: Fix busybox dependency check
Emil Muratov [Wed, 31 Oct 2018 08:43:49 +0000 (11:43 +0300)]
zram-swap: Fix busybox dependency check

   - fix dependency on BUSYBOX_CONFIG_SWAPONOFF (removed in 84da2a6)
   - add busybox defaults checking (fix zram-swap always installs swap-utils
     and libblkid as dependency, even if busybox includes mkswap by default)

Signed-off-by: Emil Muratov <>
(cherry picked from commit c0d93432f2446fbf193ec15e4880cbafa9980779)

19 months agolibnftnl: bump to version 1.1.3
Konstantin Demin [Mon, 1 Jul 2019 14:15:50 +0000 (17:15 +0300)]
libnftnl: bump to version 1.1.3

bump ABI version accordingly (thanks to Jo-Philipp Wich).

Signed-off-by: Konstantin Demin <>
(cherry picked from commit ce8027ed296f812099be813182f8b2f65ce16abf)

19 months agobuild: skip kernel stack validation when building on macOS
Felix Fietkau [Wed, 3 Jul 2019 11:29:13 +0000 (13:29 +0200)]
build: skip kernel stack validation when building on macOS

Since we switched to 4.19, the kernel build checks for libelf to decide if
it should build tools for stack validation.

On macOS, this check fails during target/compile, but succeeds during package
build (because of the pkg-config path picking up target libraries).

Signed-off-by: Felix Fietkau <>
(cherry picked from commit c3e31b6a9b040912be0b532f9bf29d91c6c74382)

19 months agocomgt: add delay option for 3g proto
Florian Eckert [Wed, 26 Jun 2019 10:36:01 +0000 (12:36 +0200)]
comgt: add delay option for 3g proto

All protos for wwan (ncm,qmi,mbim) do have a delay option.
To standardize that add also the missing delay option to the 3g proto.

Signed-off-by: Florian Eckert <>
(cherry picked from commit 313444a79e9d1ced42223a9c92cb677b6e6e286e)

19 months agobase-files: supress service restart of umount
Karel Kočí [Sat, 29 Jun 2019 09:10:19 +0000 (11:10 +0200)]
base-files: supress service restart of umount

Restart is in default implemented so it calls stop and start. This is
pretty unsafe to call on umount service. This service should not do
anything on restart the same way as on start. Only use of this service
is on stop.

Signed-off-by: Karel Kočí <>
(cherry picked from commit 537b801c5490a85a3ef36456b12f064fc6c665a2)

19 months agouqmi: fix indentation style and boundary
Florian Eckert [Mon, 1 Jul 2019 07:30:26 +0000 (09:30 +0200)]
uqmi: fix indentation style and boundary

Fix indentation style and boundary.

Signed-off-by: Florian Eckert <>
(cherry picked from commit c06f2a2dcb2350d00cc6bd8300ec3861353d96ae)

19 months agouqmi: add mtu config option possibility
Florian Eckert [Thu, 27 Jun 2019 12:42:48 +0000 (14:42 +0200)]
uqmi: add mtu config option possibility

There are mobile carrier who have different MTU size in their network.
With this change it is now possible to configure this with the qmi
proto handler.

Signed-off-by: Florian Eckert <>
(cherry picked from commit 8eb63cb7df4db3c92a9a010accc9b8444d06d4a2)

19 months agoscripts: Don't print the time on stderr
Alban Bedel [Sat, 15 Jun 2019 10:18:01 +0000 (12:18 +0200)]
scripts: Don't print the time on stderr

Having the build time written on stderr make it appear with V=w
although it is not an error or warning. Just write the time on stdout
to have it part of the build log like all the rest, but not clutter
the output when only warnings and errors should be shown.

Signed-off-by: Alban Bedel <>
(cherry picked from commit 340df72e0745236379554dc9ff487e260a424465)

19 months agowireguard: bump to 0.0.20190702
Jason A. Donenfeld [Tue, 2 Jul 2019 12:42:50 +0000 (14:42 +0200)]
wireguard: bump to 0.0.20190702

* curve25519: not all linkers support bmi2 and adx

This should allow WireGuard to build on older toolchains.

* global: switch to coarse ktime

Our prior use of fast ktime before meant that sometimes, depending on how
broken the motherboard was, we'd wind up calling into the HPET slow path. Here
we move to coarse ktime which is always super speedy. In the process we had to
fix the resolution of the clock, as well as introduce a new interface for it,
landing in 5.3. Older kernels fall back to a fast-enough mechanism based on

* netlink: cast struct over cb->args for type safety

This follow recent upstream changes such as:

* peer: use LIST_HEAD macro

Style nit.

* receive: queue dead packets to napi queue instead of empty rx_queue

This mitigates a WARN_ON being triggered by the workqueue code. It was quite
hard to trigger, except sporadically, or reliably with a PC Engines ALIX, an
extremely slow board with an AMD LX800 that Ryan Whelan of Axatrax was kind
enough to mail me.

Signed-off-by: Jason A. Donenfeld <>
(cherry picked from commit 7c23f741e97f6645bb5cd662a4943796a344b26a)

19 months agoMake linux kernel builds reproducible when BUILDBOT selected
Alexander Couzens [Wed, 12 Jun 2019 00:59:05 +0000 (02:59 +0200)]
Make linux kernel builds reproducible when BUILDBOT selected

The linux kernel is not reproducible because the build user
and domain is included into the kernel. Set the build user
to `builder` and build domain to buildhost.

It's also possible to build reproducible builds by setting

Signed-off-by: Alexander Couzens <>
(cherry picked from commit fdd0a8d49118134070c13231b6d10ec88b9105da)

19 months agoscripts/feeds: add src-include method
Bjørn Mork [Wed, 5 Jun 2019 12:19:11 +0000 (14:19 +0200)]
scripts/feeds: add src-include method

The src-include method allows recursive inclusion of feeds.conf snippets.

This can for example be used for adding static local feeds to
feeds.conf.default without ever having to update the local feeds.conf:

 src-include defaults feeds.conf.default
 src-link custom /usr/local/src/lede/custom

Signed-off-by: Bjørn Mork <>
(cherry picked from commit 7a1b575ac4ede2778bb21cfafa7a1152d9d2555f)

19 months agobase-files: add network_get_uptime() to /lib/functions/
Florian Eckert [Fri, 28 Jun 2019 10:59:19 +0000 (12:59 +0200)]
base-files: add network_get_uptime() to /lib/functions/

Add missing ubus api call for uptime value.

Signed-off-by: Florian Eckert <>
(cherry picked from commit 9e780ed5f7b834e06ec5c82323731917aef4ee53)

19 months agoupgs: update to latest git HEAD
Petr Štetiar [Tue, 25 Jun 2019 16:45:02 +0000 (18:45 +0200)]
upgs: update to latest git HEAD

cd7eabcd8c9d ugps: Fix compilation under 64-bit
198c06051dd0 Fix build error caused by enabled extra compiler warnings
fc2ab8756b3b Enable extra compiler warnings

Signed-off-by: Petr Štetiar <>
(cherry picked from commit f924fab3dccb348479bede006d9cf6792193e9ce)

19 months agobuild: warn when packages have no associated install section
Jonas Gorski [Sat, 22 Jun 2019 12:02:27 +0000 (14:02 +0200)]
build: warn when packages have no associated install section

Declaring a package without the appropriate install section is an easy
mistake to make, especially when renaming packages. Since this is also
easy to detect, warn about it when it happens.

Signed-off-by: Jonas Gorski <>
No-objections-at-all-by: Jo-Philipp Wich <>
(cherry picked from commit 5ede3fcdf74dcc1b1b4c9415152b2e8b26a45ead)

19 months agoustream-ssl: update to 2019-06-24
Eneas U de Queiroz [Mon, 24 Jun 2019 19:24:00 +0000 (16:24 -0300)]
ustream-ssl: update to 2019-06-24

This adds chacha20-poly1305 support to the mbedtls variant.

Signed-off-by: Eneas U de Queiroz <>
(cherry picked from commit 82a8ddd603707a130acf5ec1f54d9093d46acad4)