aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* ipq40xx: essedma: Fix dead lockMasafumi UTSUGI2019-10-201-2/+2
| | | | | | | | | | | | | | | | | | edma_read_append_stats() gets called from two places in the driver. The first place is the kernel timer that periodically updates the statistics, so nothing gets lost due to overflows. The second one it's part of the userspace ethtool ioctl handler to provide up-to-date values. For this configuration, the use of spin_lock() is not sufficient and as per: <https://mirrors.edge.kernel.org/pub/linux/kernel/people/rusty/kernel-locking/c214.html> the locking has to be upgraded to spin_lock_bh(). Signed-off-by: Masafumi UTSUGI <mutsugi@allied-telesis.co.jp> [folded patch into 710-, rewrote message] Signed-off-by: Christian Lamparter <chunkeey@gmail.com> (cherry picked from commit f1d761f95e9664a9c11ce1b98f9e121b43c79d35)
* openssl: Add engine configuration to openssl.cnfEneas U de Queiroz2019-10-202-1/+57
| | | | | | | | | | | | | This adds engine configuration sections to openssl.cnf, with a commented list of engines. To enable an engine, all you have to do is uncomment the engine line. It also adds some useful comments to the devcrypto engine configuration section. Other engines currently don't have configuration commands. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> (cherry picked from commit cebf024c4d9fd761e55383a582f7e29ac7cc921c) Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
* ath79: correct ar71xx boardname for UniFi AC LiteDavid Bauer2019-10-191-1/+1
| | | | | | | | | | | This corrects the additional boardname for the image metadata to the one used in ar71xx. The previously present additional entry was never used on a running system. Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Signed-off-by: David Bauer <mail@david-bauer.net> (cherry picked from commit 1a256470e78a90ac97f41e3335b3fc6ee827e4bc) Signed-off-by: David Bauer <mail@david-bauer.net>
* mpc85xx: correct TP-LINK TL-WDR4900 MAC addressesDavid Bauer2019-10-192-4/+4
| | | | | | | | | | | | | | | | This commit fixes TP-Link TL-WDR4900 v1 MAC address assignment. Previously, the MAC addrss was read for the ethernet from the "config" partition. However, the content of this partition is dependent on the firmware which was previously installed on the device. Switch the MAC address source to the U-Boot partition, where the MAC address is always present at a fixed partition. The partition was previously already used for the WiFi MAC-addresses. Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Signed-off-by: David Bauer <mail@david-bauer.net> (cherry picked from commit 07e555d8735e8fa272e3f6abd35acc9f1ab44367) Signed-off-by: David Bauer <mail@david-bauer.net>
* tcpdump: update to 4.9.3DENG Qingfang2019-10-194-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed CVEs: CVE-2017-16808 CVE-2018-10103 CVE-2018-10105 CVE-2018-14461 CVE-2018-14462 CVE-2018-14463 CVE-2018-14464 CVE-2018-14465 CVE-2018-14466 CVE-2018-14467 CVE-2018-14468 CVE-2018-14469 CVE-2018-14470 CVE-2018-14879 CVE-2018-14880 CVE-2018-14881 CVE-2018-14882 CVE-2018-16227 CVE-2018-16228 CVE-2018-16229 CVE-2018-16230 CVE-2018-16300 CVE-2018-16301 CVE-2018-16451 CVE-2018-16452 CVE-2019-15166 CVE-2019-15167 Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn> (cherry picked from commit 394273c066b8f4317b77f3ede216cfcdd45250c1)
* libpcap: update to 1.9.1DENG Qingfang2019-10-196-38/+19
| | | | | | | | | | | | | Fixed CVEs: CVE-2018-16301 CVE-2019-15161 CVE-2019-15162 CVE-2019-15163 CVE-2019-15164 CVE-2019-15165 Signed-off-by: DENG Qingfang <dengqf6@mail2.sysu.edu.cn> (cherry picked from commit 44f11353de044834a442d3192b66579b99305720)
* kernel: fix typos in video KernelPackage descriptionSungbo Eo2019-10-191-2/+2
| | | | | | | | Fixes: 4b3d17b709a5 ("kernel: add kmod-fb-sys-ram") Fixes: b774acb47912 ("package/modules: add missing gspca video drivers for 2.6.32 (patch from #6595)") Signed-off-by: Sungbo Eo <mans0n@gorani.run> (cherry picked from commit 9f73fad359663fef4decc7440796ec7d3b2b70f7)
* kirkwood: Fix FS#505 - Can't install LEDE on Linksys EA3500Eubert Bao2019-10-191-0/+3
| | | | | | | | | The default sizes render Device/linksys_audi mage un-flashable. Restore the pagesize, subpagesize, and blocksize for linksys_audi from https://github.com/openwrt/archive. Signed-off-by: Eubert Bao <bunnier@gmail.com> (cherry picked from commit e11fc8439c9f7230441408c4d257efc46f372312)
* uClibc++: Fix three bugsRosen Penev2019-10-196-20/+221
| | | | | | | | | | | | | | | | | | | | | | | | The first allows usage of several functions in the std namespace, which broke compilation of gddrescue specifically with uClibc-ng and uClibc++. The second allows usage of long long with normal C++11, which is part of the standard. Before, std=gnu++11 needed to be passsed to work around it. As a result of the second patch, the pedantic patch can safely be removed. Both patches are upstream backports. Added -std=c++11 to CFLAGS to guarentee proper inclusion of long long. Added another patch that fixes a typo with the long long support. Sent to upstream. Fixed up license information according to SPDX. Small cleanups for consistency. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit 6ab386c9bc23420816fbcefc84b62cf5438b2c66)
* hostapd: adjust to removal of WOLFSSL_HAS_AES_GCMEneas U de Queiroz2019-10-191-1/+0
| | | | | | | WolfSSL is always built with AES-GCM support now. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> (cherry picked from commit ee5a3f6d605602bbff57cde337235088cf9c3ffa)
* trelay: fix deadlock on removeAli MJ Al-Nasrawy2019-10-191-7/+21
| | | | | | | | | | | | Upon writing to "remove" file, debugfs_remove_recursive() blocks while holding rtnl_lock. This is because debugfs' file_ops callbacks are executed in debugfs_use_file_*() context which prevents file removal. Fix this by only flagging the device for removal and then do the cleanup in file_ops.release callback which is executed out of that context. Signed-off-by: Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com> (cherry picked from commit c2635b871d1dd03a6608a9255222672decd49e09)
* trelay: handle netdevice events correctlyAli MJ Al-Nasrawy2019-10-191-1/+1
| | | | | | | | | | | | | | Since v3.11, netdevice notification data are of type "struct netdev_notifier_info". Handle it as such! This should fix a critical bug in which devices are unable get released because trelay does not release resources in response to UNREGISTER event spamming the log with something like: unregister_netdevice: waiting for eth0.1 to become free. Usage count = 1 Signed-off-by: Ali MJ Al-Nasrawy <alimjalnasrawy@gmail.com> (cherry picked from commit 77cfc0739d30c1282f7de24d2ec086d244e34bb7)
* bzip2: add linker option LDFLAGSleo chung2019-10-191-0/+11
| | | | | | | | | | | if gcc not linker whith this LDFLAGS, "file libbz2.so.1.0.8" will recognize as pie executable ELF file ( which should be shared object). this because the file command version before 5.36 not recognize correctly. Signed-off-by: leo chung <gewalalb@gmail.com> (cherry picked from commit 56ab58fb6ce29329963619d5a4fffa9d5828176e)
* kernel: layerscape: fix compilation errorBiwen Li2019-10-191-0/+28
| | | | | | | | | | This fixes a compilation error as follows: drivers/staging/fsl_qbman/qman_config.c:815:29: error: bitwise comparison always evaluates to false [-Werror=tautological-compare] if ((qman_ip_rev & 0xFF00) == QMAN_REV31) { Signed-off-by: Biwen Li <biwen.li@nxp.com> (cherry picked from commit 53b73131e9b38bcae556555de53203d52321794c)
* tplink-safeloader: fix compilation warningsIlya Gordeev2019-10-191-12/+13
| | | | | Signed-off-by: Ilya Gordeev <Mirraz@users.noreply.github.com> (cherry picked from commit 5daf09435311922cad32b66b75d13b9367db62f7)
* mac80211: Update to version 4.19.79Hauke Mehrtens2019-10-199-46/+27
| | | | Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
* build: add buildinfo as single Makefile targetPaul Spooren2019-10-181-1/+4
| | | | | | | | | | | | | | | | | The prepare target was added some 11 years ago to build tools and toolchain and was recently extended to create buildinfo files for reproducibility, meaning {feeds,version,config}.buildinfo. As the buildbot workflow is more complex than the single prepare (kmod feed insertion), prepare is only used to create those buildinfo files. Running prepare however runs `target/compile` as well, taking time even everything is already compiled. Splitting this allows the buildbot to run only the `buildinfo` target while others can still use the convenience feature `prepare`. Signed-off-by: Paul Spooren <mail@aparcar.org> (cherry picked from commit 6caf437652d858e5795ee16bdaf9f0436d2488f9)
* lantiq: Fix fw_cutter LzmaWrapperChristian Franke2019-10-181-1/+1
| | | | | | | | | The destination buffer size `d_len` is passed to `lzma_inflate` as a pointer. Therefore, it needs to be dereferenced to compare its content. Signed-off-by: Christian Franke <nobody@nowhere.ws> (cherry picked from commit d544bc84a07f299ac1e513715301cae5fbd30923) Signed-off-by: Daniel Golle <daniel@makrotopia.org>
* rpcd: update to latest Git HEADJo-Philipp Wich2019-10-181-3/+3
| | | | | | | 95f0973 file: increase minimum read buffer size to 4096 bytes Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 2a603cfcfccc4b20b10b7992bc07be0945345ed9)
* rpcd: update to latest Git HEADJo-Philipp Wich2019-10-181-3/+3
| | | | | | | e2a7bc4 iwinfo: add WPA3 support Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit d6a405280f0156a2dad7d9cfa96695d53ed87dab)
* rpcd: update to latest Git HEADJo-Philipp Wich2019-10-181-4/+4
| | | | | | | | | | | | 69eeb1b file: refactor message parsing and permission checking f65527a iwinfo: expose all rate info fields in assoclist reply 7fec636 sys: fix symbol redeclaration 27c24c7 rpcd: sys: actually move timespec declaration 345363b file: add remove operation 604db20 rpcd: Switch to nanosleep Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 2f9f8769e334d2e8d0bac4edadbcf6bcdd229519)
* fwtool: do not omit final 16 byte when image does not contain signatureJo-Philipp Wich2019-10-172-2/+4
| | | | | | | | | | | | | | | | | | | The fwutil command will interpret the final 16 byte of a given firmware image files as "struct fwimage_trailer". In case these bytes do look like a valid trailer, we must ensure that we print them out along with the remainder of the image to not accidentally truncate non-trailer-images by 16 bytes when they're piped through fwtool, e.g. as part of an image verification command sequence. Some command sequences pipe images through fwtool in order to strip any possible metadata, certificate or signature trailers and do not expect bare images without any of that metadata to get truncated as other non- fwtool specific metadata is expected at the end of the file, e.g. an information block with an md5sum in case of the combined image format. Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 889b841048c5eb7f975135cab363f1fdd9b6cfa1)
* iwinfo: update to latest Git HEADJo-Philipp Wich2019-10-161-3/+3
| | | | | | | | 07315b6 nl80211: handle hidden SSIDs in wpa_supplicant scan results 3ac846e lua: fix string description of mixed WPA3 modes Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit bc61458b73c04f900c358be8b7ed37c84298472a)
* bcm53xx: sysupgrade: support Luxul NAND devicesDan Haab2019-10-151-0/+2
| | | | | | | This adds support for UBI-aware sysupgrade using Luxul formats. Signed-off-by: Dan Haab <dan.haab@legrand.com> (cherry picked from commit 63c43e5674f346b8ed13377d551e5699afbeb673)
* brcm47xx: fix switch port labels for Asus WL500GP V2Michael Heimpold2019-10-151-1/+5
| | | | | | | | The switch port naming in LuCI does not fit the physical numbers on the front of this device. Since this is confusing, fix it. Signed-off-by: Michael Heimpold <mhei@heimpold.de> (cherry picked from commit e56e5a454e729f1067ba1fc8acfc18b99ccb88b4)
* gdb: bump to 8.3.1Koen Vandeputte2019-10-155-29/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GDB 8.3.1 brings the following fixes and enhancements over GDB 8.3: PR c++/20020 (GDB segfault on printing objects) PR gdb/24454 (nat/x86-linux-dregs.c failed assertion) PR breakpoints/24541 (Incorrect evaluation of systemtap probes due to register being signed and probe expression assuming unsigned) PR symtab/24545 (Symbol loading performance regression with cc1) PR gdb/24592 (amd64->i386 linux syscall restart problem) PR gdb/25009 (terminate called after throwing an instance of 'srchilite::ParserException') PR gdb/25010 (Calls to error () can cause SIGTTOU to send gdb to the background) PR breakpoints/25011 (Breakpoints on file reloads broken for PIE binaries) This corrective release also brings the following testsuite fixes and enhancements: PR testsuite/25005 (gdb-caching-proc.exp takes a lot of time on skip_opencl_tests) PR testsuite/25016 (Test-case failures for -pie) GDB 8.3 includes the following changes and enhancements: * Support for new native configurations (also available as a target configuration): - RISC-V GNU/Linux (riscv*-*-linux*) - RISC-V FreeBSD (riscv*-*-freebsd*) * Support for new target configurations: - CSKY ELF (csky*-*-elf) - CSKY GNU/Linux (csky*-*-linux) - NXP S12Z ELF (s12z-*-elf) - OpenRISC GNU/Linux (or1k*-*-linux*) * Native Windows debugging is only supported on Windows XP or later. * The Python API in GDB now requires Python 2.6 or later. * GDB now supports terminal styling for the CLI and TUI. Source highlighting is also supported by building GDB with GNU Highlight. * Experimental support for compilation and injection of C++ source code into the inferior (requires GCC 7.1 or higher, built with libcp1.so). * GDB and GDBserver now support IPv6 connections. * Target description support on RISC-V targets. * Various enhancements to several commands: - "frame", "select-frame" and "info frame" commands - "info functions", "info types", "info variables" - "info thread" - "info proc" - System call alias catchpoint support on FreeBSD - "target remote" support for Unix Domain sockets. * Support for displaying all files opened by a process * DWARF index cache: GDB can now automatically save indices of DWARF symbols on disk to speed up further loading of the same binaries. * Various GDB/MI enhancements. * GDBserver on PowerPC GNU/Linux now supports access to the PPR, DSCR, TAR, EBB/PMU, and HTM registers. * Ada task switching support when debugging programs built with the Ravenscar profile added to aarch64-elf. * GDB in batch mode now exits with status 1 if the last executed command failed. * Support for building GDB with GCC's Undefined Behavior Sanitizer. Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* toolchain/gdb: bump to 8.3.1Koen Vandeputte2019-10-154-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GDB 8.3.1 brings the following fixes and enhancements over GDB 8.3: PR c++/20020 (GDB segfault on printing objects) PR gdb/24454 (nat/x86-linux-dregs.c failed assertion) PR breakpoints/24541 (Incorrect evaluation of systemtap probes due to register being signed and probe expression assuming unsigned) PR symtab/24545 (Symbol loading performance regression with cc1) PR gdb/24592 (amd64->i386 linux syscall restart problem) PR gdb/25009 (terminate called after throwing an instance of 'srchilite::ParserException') PR gdb/25010 (Calls to error () can cause SIGTTOU to send gdb to the background) PR breakpoints/25011 (Breakpoints on file reloads broken for PIE binaries) This corrective release also brings the following testsuite fixes and enhancements: PR testsuite/25005 (gdb-caching-proc.exp takes a lot of time on skip_opencl_tests) PR testsuite/25016 (Test-case failures for -pie) GDB 8.3 includes the following changes and enhancements: * Support for new native configurations (also available as a target configuration): - RISC-V GNU/Linux (riscv*-*-linux*) - RISC-V FreeBSD (riscv*-*-freebsd*) * Support for new target configurations: - CSKY ELF (csky*-*-elf) - CSKY GNU/Linux (csky*-*-linux) - NXP S12Z ELF (s12z-*-elf) - OpenRISC GNU/Linux (or1k*-*-linux*) * Native Windows debugging is only supported on Windows XP or later. * The Python API in GDB now requires Python 2.6 or later. * GDB now supports terminal styling for the CLI and TUI. Source highlighting is also supported by building GDB with GNU Highlight. * Experimental support for compilation and injection of C++ source code into the inferior (requires GCC 7.1 or higher, built with libcp1.so). * GDB and GDBserver now support IPv6 connections. * Target description support on RISC-V targets. * Various enhancements to several commands: - "frame", "select-frame" and "info frame" commands - "info functions", "info types", "info variables" - "info thread" - "info proc" - System call alias catchpoint support on FreeBSD - "target remote" support for Unix Domain sockets. * Support for displaying all files opened by a process * DWARF index cache: GDB can now automatically save indices of DWARF symbols on disk to speed up further loading of the same binaries. * Various GDB/MI enhancements. * GDBserver on PowerPC GNU/Linux now supports access to the PPR, DSCR, TAR, EBB/PMU, and HTM registers. * Ada task switching support when debugging programs built with the Ravenscar profile added to aarch64-elf. * GDB in batch mode now exits with status 1 if the last executed command failed. * Support for building GDB with GCC's Undefined Behavior Sanitizer. Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com> (cherry picked from commit 942f020bf4d0f49e4c5586a59ddf21c00e9d8bbe)
* kernel: bump 4.14 to 4.14.149Koen Vandeputte2019-10-1522-154/+155
| | | | | | | | | | | | Refreshed all patches. Altered patches: - 820-sec-support-layerscape.patch Compile-tested on: ar71xx, brcm2708, cns3xxx, imx6, layerscape, x86_64 Runtime-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* toolchain/musl: bump to version 1.1.24Koen Vandeputte2019-10-155-350/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.1.24 release notes new features: - GLOB_TILDE extension to glob - non-stub catgets localization API, using netbsd binary catalog format - posix_spawn file actions for [f]chdir (extension, pending future standard) - secure_getenv function (extension) - copy_file_range syscall wrapper (Linux extension) - header-level support for new linux features in 5.2 performance: - new fast path for lrint (generic C version) on 32-bit archs major internal changes: - functions involving time are overhauled to be time64-ready in 32-bit archs - x32 uses the new time64 code paths to replace nasty hacks in syscall glue compatibility & conformance: - support for powerpc[64] unaligned relocation types - powerpc[64] and sh sys/user.h no longer clash with kernel asm/ptrace.h - select no longer modifies timeout on failure (or at all) - mips64 stat results are no longer limited to 32-bit time range - optreset (BSD extension) now has a public declaration - support for clang inconsistencies in wchar_t type vs some 32-bit archs - mips r6 syscall asm no longer has invalid lo/hi register clobbers - vestigial asm declarations of __tls_get_new are removed (broke some tooling) - riscv64 mcontext_t mismatch glibc's member naming is corrected bugs fixed: - glob failed to match broken symlinks consistently - invalid use of interposed calloc to allocate initial TLS - various dlsym symbol resolution logic errors - semctl with SEM_STAT_ANY didn't work - pthread_create with explicit scheduling was subject to priority inversion - pthread_create failure path had data race for thread count - timer_create with SIGEV_THREAD notification had data race getting timer id - wide printf family failed to support l modifier for float formats arch-specific bugs fixed: - x87 floating point stack imbalance in math asm (i386-only CVE-2019-14697) - x32 clock_adjtime, getrusage, wait3, wait4 produced junk (struct mismatches) - lseek broken on x32 and mipsn32 with large file offsets - riscv64 atomics weren't compiler barriers - riscv64 atomics had broken asm constraints (missing earlyclobber flag) - arm clone() was broken when compiled as thumb if start function returned - mipsr6 setjmp/longjmp did not preserve fpu register state correctly Refreshed all patches. Removed upstreamed. Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* iwinfo: update to latest Git HEADJo-Philipp Wich2019-10-151-3/+3
| | | | | | | a29b7d4 nl80211: align path to phy mapping logic with mac80211.sh Signed-off-by: Jo-Philipp Wich <jo@mein.io> (cherry picked from commit 57b834281b586839b5e2cb00d7907de50c68ebcc)
* ramips: remove memory node for ZBT-WE1326Adrian Schmutzler2019-10-111-5/+0
| | | | | | | | | | | | | | | | Memory auto-detection for mt7621 has just been added to 19.07 stable branch. This removes the memory node for the ZBT-WE1326, which will support revision 5 that has 256MiB RAM (Nanya NT5CC128M16IP-DI) instead of 512MiB (up to revision 4). ref: #1930 This is taken from master commit a2c19f1d2f65 ("ramips: dts: drop memory nodes"), where _all_ memory nodes were removed. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* ramips: mt7621: add support for memory detectionChuanhong Guo2019-10-111-0/+125
| | | | | | | | | | | | | | | | | | | | | | | mt7621 has the following memory map: 0x0-0x1c000000: lower 448m memory 0x1c000000-0x2000000: peripheral registers 0x20000000-0x2400000: higher 64m memory detect_memory_region in arch/mips/kernel/setup.c only add the first memory region and isn't suitable for 512m memory detection because it may accidentally read the memory area for peripheral registers. This commit adds memory detection capability for mt7621: 1. add the highmem area when 512m is detected. 2. guard memcmp from accessing peripheral registers: This only happens when some weird user decided to change kernel load address to 256m or higher address. Since this is a quite unusual case, we just skip 512m testing and return 256m as memory size. Signed-off-by: Chuanhong Guo <gch981213@gmail.com> (cherry picked from commit 6d91ddf5175d2eac3c4bc4a404cc0f5dd44cf25b) Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
* iwinfo: update to latest Git HEADJo-Philipp Wich2019-10-111-3/+3
| | | | | | | | | | | | | | | | Contains following updates squashed from 3 bump commits in master: 02112f9 cli: fix reporting of mixed WPA2/WPA3 versions 7faeaea nl80211: properly detect WEP encryption in wpa_supp scan results 629b5ff nl80211: do not confuse open connections with WEP ones 3d47ddd nl80211: rework hostapd and wpa_supplicant wpa suite parsing 313e827 nl80211: keep awaiting wpa_supplicant scan results on busy response a766751 nl80211: fix parsing of mixed wpa encryption in wpa_supp scan results f096bfd utils: support parsing SAE and OWE key management suites from IEs 2a95086 nl80211: recognize SAE encrypted mesh Signed-off-by: Jo-Philipp Wich <jo@mein.io> Signed-off-by: Petr Štetiar <ynezz@true.cz>
* build: adjust gcc/g++ version checks for newer apple compilersFelix Fietkau2019-10-101-2/+2
| | | | | Signed-off-by: Felix Fietkau <nbd@nbd.name> (cherry-picked from commit 46a129194de0f9e2f71b6526634569e1ec802504)
* build: fix xconfig targetleo chung2019-10-091-1/+1
| | | | | | | | | | | | | | | | | `make xconfig` fails with following linking error of qconf binary: g++ -lQt5Widgets -lQt5Gui -lQt5Core -o qconf qconf.o zconf.tab.o /usr/bin/ld: qconf.o: in function ConfigList::metaObject() const': qconf.cc:(.text+0x3eb): undefined reference to QObjectData::dynamicMetaObject() const' /usr/bin/ld: qconf.o: in function `ConfigList::qt_metacast(char const*)': link error. which is caused by the wrong order of the linked objects/libraries so this patch reorders the linker's arguments which makes the qconf compile again. Signed-off-by: leo chung <gewalalb@gmail.com> [commit subject and message tweaks, whitespace fix] Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit b2c55d50f8aeb21ef4cd3948034a158f7dd743c2)
* build: fix host menu config targets using ncursesPetr Štetiar2019-10-093-3/+11
| | | | | | | | | | | | | | | | | | | | | | On a recent Gentoo Linux installation, invoking `make menuconfig`, `make kernel_menuconfig` or `make kernel_nconfig` in the build system fails, whereas for example `make menuconfig` in the kernel tree alone works as expected. This is happening because STAGING_PREFIX is not defined when kernel's {menu,n}config target calls pkg-config from the toolchain/host and thus pkg-config returns an empty value, and the fallback values in the kernel config script are applied but those are off and the linking fails. Solution is to use system's pkg-config for all ncurses based menu config targets in order to provide proper compiler/linker flags. Ref: FS#2423 Cc: Thomas Albers <thomas.gameiro@gmail.com> Tested-by: Stijn Tintel <stijn@linux-ipv6.be> Tested-by: Eneas U de Queiroz <cotequeiroz@gmail.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit 965f341aa9fdb6e07d509d02a6ca188af050292a)
* kernel: Fix off-by-one error in FIT mtd partition search.Oldřich Jedlička2019-10-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This fixes off-by-one error introduced in commit dc76900021b8 ("kernel: Correctly search for the FIT image in mtd partition.") Function `mtd_read` starts reading at `offset` and needs `hdr_len` number of bytes to be available. Suppose the easiest case when `offset` is `0` and `hdr_len` equals to `mtd->size` - the `for` loop will not be entered even when enough bytes are available to be read. Same happens for any non-zero `offset`, when `hdr_len` is just enough bytes to be read until `mtd->size` is reached. Imagine that for example `mtd->size=5`, `offset=4` and `hdr_len=1`. Then `offset+hdr_len=5` and the check has to be `offset+hdr_len <= mtd->size`, i.e. `5 <= 5`. The check for `offset + hdr_len` value needs to be inclusive, therefore use `<=`. Fixes: dc76900021b8 ("kernel: Correctly search for the FIT image in mtd partition.") Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com> [adjusted commit ref, fixes tag] Signed-off-by: Petr Štetiar <ynezz@true.cz> (cherry picked from commit e0ce80d42ace6feba509da16795ab0eb81cf5bf4)
* kernel: Correctly search for the FIT image in mtd partition.Fredrik Olofsson2019-10-091-2/+2
| | | | | | | Previously all iterations of the loop checked offset=0 in the partition. Signed-off-by: Fredrik Olofsson <fredrik.olofsson@anyfinetworks.com> (cherry picked from commit dc76900021b880820adf981bb7b1cf5ff3ffe1fd)
* build: make device tree arg really optional in mkits.shJohann Neuhauser2019-10-091-5/+4
| | | | | | | | | | If no device tree is given there is no node generated, but the configuration does still include the name of the missing node. This will result in a successful build fit image, but bootm does throw a error message if we want to boot the bad configuration. Signed-off-by: Johann Neuhauser <jneuhauser@dh-electronics.com> (cherry picked from commit 205e0939f0a141a1524d94eaf84407ddcb6a1a09)
* kernel: bump 4.14 to 4.14.148Koen Vandeputte2019-10-085-6/+6
| | | | | | | | | Refreshed all patches. Compile-tested on: cns3xxx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* kernel: bump 4.14 to 4.14.147Koen Vandeputte2019-10-0810-44/+40
| | | | | | | | | | | | | Refreshed all patches. Altered patches: - 403-mtd_fix_cfi_cmdset_0002_status_check.patch (ar71xx) - 403-mtd_fix_cfi_cmdset_0002_status_check.patch (ath79) Compile-tested on: ar71xx, cns3xxx, imx6, x86_64 Compile-tested on: ar71xx, cns3xxx, imx6 Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* kernel: add missing symbol when enabling PTP supportKoen Vandeputte2019-10-081-0/+1
| | | | | | | | | | | | | | | | Discovered by enabling PTP_1588_CLOCK: net/sched/Kconfig:44: warning: menuconfig statement without prompt * * Restart config... * * * PTP clock support * PTP clock support (PTP_1588_CLOCK) [Y/n/?] y Driver for the National Semiconductor DP83640 PHYTER (DP83640_PHY) [N/m/y/?] (NEW) Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* treewide: remove 4.19 leftoversKoen Vandeputte2019-10-0822-7419/+0
| | | | | | | 19.07 branch focuses on kernel 4.14 so remove all remaining 4.19 configs Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
* bcm53xx: fix serial console on Luxul XWC-2000Rafał Miłecki2019-10-041-0/+11
| | | | | Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit fedc5b65dc67c0687f0d1b8dafbacf8e7ab899d2)
* bcm53xx: fix sysupgrade for Luxul XWC-2000Rafał Miłecki2019-10-041-1/+1
| | | | | | | Use a correct "compatible" value as in the upstream DTS file. Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 64b7dbb3000b7e8772fea40b35ac6ec717f9f822)
* bcm53xx: add pending patch adding Luxul XWC-2000 DTS fileRafał Miłecki2019-10-042-1/+81
| | | | | Signed-off-by: Rafał Miłecki <rafal@milecki.pl> (cherry picked from commit 06091afada06183f541106b3c688a5d30d85c25b)
* base-files: use get_mac_binary() in mtd_get_mac_binary_ubi()Adrian Schmutzler2019-09-291-6/+1
| | | | | | | | | | | | | The actual retrieval of the MAC address in mtd_get_mac_binary_ubi() is the same as in get_mac_binary(). Thus, use the latter function in the former to reduce duplicate code. This will also allow to benefit from the enhanced path check there and bring mtd_get_mac_binary_ubi() more in line with the similar mtd_get_mac_binary(). Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> (cherry picked from commit 45600124fcbd14ece6e289cb59b318ea44c598fe)
* ath79: image: add supported string for routerstations and ja76pf2Tomasz Maciej Nowak2019-09-292-0/+3
| | | | | | | | | | Now that the md5 check is fixed and metadata present, sysupgrade on ar71xx will complain about device not being supported by the image. Since the cause is not matching strings for supported devices add them accordingly. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> (cherry picked from commit a45cf75eca4069f24bf5bba8f245de2e553f7f78)
* ath79: image: append metadata to routerstations and ja76pf2 imagesTomasz Maciej Nowak2019-09-292-2/+2
| | | | | | | | | This target enforces metadata check so add the necessary information. It was previously removed because md5 sum check. When using these sysupgrade images on ar71xx target the check would complain about them not matching. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> (cherry picked from commit 077d06a1a5a23caae4d0c53afb60913955d2a3ea)
* ar71xx: sysupgrade: accept ath79 combined-imageTomasz Maciej Nowak2019-09-291-1/+1
| | | | | | | | | | | There is md5 sum of whole image embedded in combined-image header which is checked on sysupgrade. The check will fail for ath79 images which may have embedded metadata. This is because metadata are appended after the combined image is created. To allow smooth transition from ar71xx to ath79, strip metadata before calculating md5 sum for whole image. Signed-off-by: Tomasz Maciej Nowak <tomek_n@o2.pl> (cherry picked from commit 8b4109c2b4d60495d046157d1baca9b1cdbf8dc8)