Commit Graph

459 Commits

Author SHA1 Message Date
Robert Marko
35dff87f87
build: add GCC 10 version detection
Lets add GCC 10 detection to the build system as distributions like Fedora 32 have started shipping with it.
Some tools like mtd-utils need work to compile under GCC10, but that will be next step.

Signed-off-by: Robert Marko <robert.marko@sartura.hr>
2020-03-24 05:16:27 +08:00
CN_SZTL
96188264e6
Merge Lean's source 2020-03-23 02:36:07 +08:00
lean
8588a73269 luci-app-ssr-plus: add proxychains-ng depend 2020-03-23 02:21:09 +08:00
Koen Vandeputte
3891769528 kernel: bump 4.19 to 4.19.110
Refreshed all patches.

Fixes:
- CVE-2020-8648 (potentially)
- CVE-2020-8647
- CVE-2020-8649

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
2020-03-19 17:50:48 +08:00
AmadeusGhost
92d2f94e3d kernel: bump 4.14 to 4.14.173 2020-03-19 17:40:18 +08:00
lean
c9fe160157 kernel: bump 4.9 to 4.9.215 2020-03-13 12:17:42 +08:00
lean
3bef40a0cb kernel: bump to 4.14.172 / 4.19.108 2020-03-13 12:11:40 +08:00
Koen Vandeputte
efc4ae1c12
kernel: bump 4.9 to 4.9.215
Refreshed all patches.

Compile-tested on: ar71xx
Runtime-tested on: ar71xx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
2020-03-10 22:23:13 +08:00
Koen Vandeputte
46d074fa34 kernel: bump 4.19 to 4.19.108
Refreshed all patches.

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
2020-03-10 11:25:26 +08:00
Koen Vandeputte
aee0dfa544 kernel: bump 4.14 to 4.14.172
Refreshed all patches.

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
2020-03-10 11:16:01 +08:00
CN_SZTL
a5e7110824
Merge Lean's source 2020-03-08 17:59:19 +08:00
LEAN-ESX
a0adb27385 luci-app-cpufreq: unlocked for all target 2020-03-08 01:50:35 -08:00
CN_SZTL
e6404fcaa1
Merge Lean's source 2020-03-08 13:54:49 +08:00
LEAN-ESX
a95879a1de luci-app-unblockmusic: add to default target 2020-03-07 20:01:48 -08:00
Kevin Darbyshire-Bryant
6b195e37e7
build: simplify gnu-getopt search
getopt is the only command where /usr/local/bin is specified explicitly.
All other commands are assumed to exist in the PATH in one form or
another.  Remove this exception and require gnugetopt/getopt to be in
the user's PATH.

In the case of macos Homebrew, getopt is 'keg only' hence not linked
into /usr/local/bin whilst other commands are linked and likely found by
virtue of /usr/local/bin being in PATH.

Since 2019 Homebrew is very reluctant to install links that have
potential to override default OS behaviour, eg: following instructions
on our current 'how to build on macos' wiki page:

$ brew ln gnu-getopt --force
Warning: Refusing to link macOS-provided software: gnu-getopt
If you need to have gnu-getopt first in your PATH run:
  echo 'export PATH="/usr/local/opt/gnu-getopt/bin:$PATH"' >> ~/.zshrc

A better option for macos is to link getopt as 'gnugetopt' in
/usr/local/bin, thus the build system will find 'gnugetopt' but other
applications looking for just 'getopt' will find the original macos
binary.

Ultimately it makes sense that 'GNU' dependencies are placed in
/usr/local/bin and /usr/local/bin is included in the user's PATH.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
2020-03-03 11:31:47 +08:00
AmadeusGhost
691def3cad
kernel: bump to 4.9.214, 4.14.171, 4.19.106 (#3375) 2020-02-29 16:28:07 +08:00
AmadeusGhost
7dc881dd79 kernel: bump to 4.9.214, 4.14.171, 4.19.106
Remove error commit from
15a0701cdd
2020-02-29 01:23:18 +08:00
CN_SZTL
3ab67a8217
Revert "kernel: bump to 4.9.214, 4.14.171, 4.19.106 (#3318)"
This reverts commit 4d68a12e34.
2020-02-28 20:50:04 +08:00
CN_SZTL
4d68a12e34
kernel: bump to 4.9.214, 4.14.171, 4.19.106 (#3318)
This reverts commit 191ace6dff.
2020-02-27 17:39:41 +08:00
CN_SZTL
59d9e97911
Merge Lean's source 2020-02-27 17:39:13 +08:00
coolsnowwolf
22f8981639 target: rip of netease-unlock 2020-02-26 19:34:11 +08:00
coolsnowwolf
191ace6dff Revert "kernel: bump to 4.9.214, 4.14.171, 4.19.106 (#3318)"
This reverts commit 01ab5cf3c9.
2020-02-26 16:47:18 +08:00
CN_SZTL
d1dcde5e92
kernel/iptables: add modules for qos-gargoyle 2020-02-25 23:03:16 +08:00
CN_SZTL
94220db7c3
kernel/iptables: fix IMQ support 2020-02-25 20:27:24 +08:00
CN_SZTL
831dd702a9
Merge Lean's source 2020-02-25 13:45:26 +08:00
AmadeusGhost
01ab5cf3c9
kernel: bump to 4.9.214, 4.14.171, 4.19.106 (#3318)
* kernel: bump 4.14 to 4.14.171

Refreshed all patches.

Fixes:
- CVE-2013-1798

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

* kernel: bump 4.19 to 4.19.105

Refreshed all patches.

Fixes:
- CVE-2013-1798
- CVE-2019-3016

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

* kernel: bump 4.19 to 4.19.106

Refreshed all patches.

Remove upstreamed:
- 950-0786-leds-pca963x-Fix-open-drain-initialization.patch

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

* kernel: bump to 4.9.214, 4.14.171, 4.19.106

Co-authored-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
2020-02-25 12:24:44 +08:00
CN_SZTL
6b2161f94c
Merge Lean's source 2020-02-21 14:35:45 +08:00
coolsnowwolf
1c4ae206b8 target: add zerotier by default 2020-02-21 14:30:58 +08:00
CN_SZTL
6b88026728
Merge Lean's source 2020-02-21 14:09:03 +08:00
AmadeusGhost
e5f08410e0
adjust build script (#3235)
* download.pl: add jsDelivr mirror for GitHub and add utsc mirrors

* m520: fix 'hlos' not found

* dependence: add python3

* netfilter: Revert delete support for kernel 4.9

* scons: move to packages feed
2020-02-21 11:55:07 +08:00
CN_SZTL
14609a8f8a
Merge Lean's source 2020-02-21 02:50:38 +08:00
coolsnowwolf
9f8000a6d6 sync build script for OpenWrt 19.07 2020-02-21 02:41:00 +08:00
CN_SZTL
4f5684f572
Merge Lean's source 2020-02-20 22:04:38 +08:00
coolsnowwolf
35b3616c50 add luci-app-unblockneteasemusic-mini by default 2020-02-20 21:13:54 +08:00
CN_SZTL
73e90d62cc
Merge Lean's source 2020-02-20 02:46:33 +08:00
coolsnowwolf
5e65d8e2e1 build: add ABI_VERSION to binary package names 2020-02-19 18:56:44 +08:00
CN_SZTL
1061343ae6
Merge Lean's source 2020-02-15 21:05:10 +08:00
coolsnowwolf
11a4f90f1a target: add luci-proto-relay 2020-02-15 20:33:02 +08:00
CN_SZTL
3af8520a2c
include/target: unselect coremark by default 2020-02-14 17:50:34 +08:00
CN_SZTL
442f3761fd
Merge Lean's source 2020-02-14 17:39:59 +08:00
coolsnowwolf
8f6642da9c uhttpd: enable ssl 2020-02-14 17:24:56 +08:00
CN_SZTL
0625c87abb
kernel: bump 4.9 to 4.9.212 (#2964)
* kernel: bump 4.9 to 4.9.212

Refreshed all patches.

Fixes:
- CVE-2019-14896
- CVE-2019-14897

Compile-tested on: x86_64
Runtime-tested on: none

Signed-off-by: CN_SZTL <cnsztl@gmail.com>

* kernel4.9: remove patches for layerscape
2020-02-13 18:00:21 +08:00
AmadeusGhost
6901278ef0
kernel: bump to 4.14.169, 4.19.101 (#2963)
* kernel: bump to 4.14.169, 4.19.101

* uboot: update to latest

* mediatek: bump to v4.19

* ath79: switch to wpad

* Revert 'grub2: update to latest'
2020-02-06 21:45:40 +08:00
CN_SZTL
6029b1ac46
Merge AmadeusGhost's source 2020-02-06 19:51:47 +08:00
CN_SZTL
c00c457432
kernel: bump 4.9 to 4.9.212 2020-02-06 17:47:35 +08:00
AmadeusGhost
1d26d45a48 kernel: bump to 4.14.169, 4.19.101 2020-02-06 12:00:10 +08:00
CN_SZTL
33742e4ad9
Merge Lean's source 2020-02-04 00:05:05 +08:00
AmadeusGhost
2d7f1ed162
ath79: sync and fix wireless (#2919)
This commit sync target ath79 from openwrt master, and revert some commit which will causes wireless to not work.
Use ath10k-ct-smallbuffers by default, so that small memory devices can normal work.
2020-02-03 23:45:16 +08:00
CN_SZTL
5893c0d03c
Merge Lean's source 2020-02-03 14:13:23 +08:00
coolsnowwolf
ecea39f109 Revert "files: sync from openwrt v19.07 (#2690)"
This reverts commit 2289184a62.
2020-02-03 12:33:25 +08:00
coolsnowwolf
4f81d5b082 Revert "OpenWrt v19.07.1: adjust config defaults"
This reverts commit b7007324c0.
2020-02-03 12:33:12 +08:00
CN_SZTL
207049c82f
kernel: bump 4.9 to 4.9.211 2020-02-01 22:01:43 +08:00
CN_SZTL
4de61217a3
Revert "OpenWrt v19.07.1: adjust config defaults"
This reverts commit b7007324c0.
2020-02-01 20:06:28 +08:00
CN_SZTL
2e213cc242
Merge Lean's source 2020-02-01 20:06:04 +08:00
coolsnowwolf
b7007324c0 OpenWrt v19.07.1: adjust config defaults 2020-02-01 19:25:36 +08:00
CN_SZTL
fb220578c6
Merge Lean's source 2020-02-01 19:01:52 +08:00
coolsnowwolf
bffe4e4f82 import urandom-seed and urngd for v19.07 2020-02-01 18:35:27 +08:00
CN_SZTL
e6abd4e3ba
Merge Lean's source 2020-02-01 17:10:56 +08:00
AmadeusGhost
2289184a62
files: sync from openwrt v19.07 (#2690) 2020-02-01 16:50:37 +08:00
CN_SZTL
a9e0831728
kernel/iptables: add cgroup support 2020-02-01 04:53:36 +08:00
CN_SZTL
ffce816dc9
Merge Lean's source 2020-02-01 00:36:16 +08:00
AmadeusGhost
ae48c01089
target: remove support for kernel 3.18 (#2900) 2020-01-31 21:48:59 +08:00
AmadeusGhost
06dc25a010
kernel: bump to 4.14.167, 4.19.98 (#2871)
* kernel: bump to 4.14.167, 4.19.98

* ipq40xx: fix error patch

* bcm2708: sh: use /bin/sh

* kernel: sfp: add Nokia SFP fix from net-next
2020-01-30 01:43:29 +08:00
CN_SZTL
9ac9db22e8
Merge AmadeusGhost's source 2020-01-28 15:08:08 +08:00
CN_SZTL
be84b7e4ef
config: fix libcxx settings 2020-01-27 22:06:40 +08:00
AmadeusGhost
14d42a488d kernel: bump to 4.14.167, 4.19.98 2020-01-26 17:18:34 +08:00
CN_SZTL
4c170030cc
Merge Lean's source 2020-01-24 13:35:20 +08:00
coolsnowwolf
fbb58b4bcc target: add ddns-scripts_aliyun ddns-scripts_dnspod by default 2020-01-24 12:59:17 +08:00
LEAN-ESX
6c5dcf4fb8 buildsystem: Make PIE ASLR option tristate 2020-01-17 10:55:30 -08:00
CN_SZTL
365809fafb
netfilter.mk: update 2020-01-15 02:20:42 +08:00
CN_SZTL
141d3bef84
toolchain: update 2020-01-15 02:18:19 +08:00
CN_SZTL
c6fe53a995
buildsystem: Make PIE ASLR option tristate 2020-01-15 02:00:14 +08:00
CN_SZTL
d7dfa4199a
Merge Leam's source 2020-01-12 12:53:19 +08:00
AmadeusGhost
7c7a6f2e55 kernel: bump to 4.9.208, 4.14.162, 4.19.93 (#2745)
* generic: support mtd-mac-address-ascii

* kernel: bump to 4.9.208, 4.14.162, 4.19.93

* bcm2708: sync from openwrt v19.07

* firmware: update to latest version

* correct mistakes

* ipq40xx: fixed wrong patch
2020-01-11 23:39:11 +08:00
CN_SZTL
393fc6172d
cmake: Install host packages to lib instead of lib64 2020-01-01 16:05:20 +08:00
CN_SZTL
d8108b844a
Merge Lean's source 2019-12-25 16:35:22 +08:00
LEAN-ESX
70e66b06b1 kernel: bump to 4.9.207, 4.14.160, 4.19.91 2019-12-24 23:57:52 -08:00
kaes1a
ecf24ed7f5 build: prereq: add support for build on macos 10.15 or lasted (#2478) 2019-12-19 12:08:43 +08:00
CN_SZTL
2bcf58feab
Merge Lean's source 2019-12-15 22:16:04 +08:00
LEAN-ESX
8380473e7b target: shrink to support 8M rom 2019-12-15 02:59:57 -08:00
CN_SZTL
580d990dcd
Merge Lean's source 2019-12-14 12:18:29 +08:00
LEAN-ESX
7ea08e97fe ramips: mt7621: add support for Netgear R6800 2019-12-13 08:25:54 -08:00
CN_SZTL
54557b1240
Merge Lean's source 2019-12-11 12:39:15 +08:00
LEAN-ESX
a70a719e81 kernel: bump to 4.9.206, 4.14.158, 4.19.88 2019-12-10 19:40:41 -08:00
CN_SZTL
e9f7e8cb70
Merge Lean's source 2019-12-04 00:30:59 +08:00
LEAN-ESX
7c38a93048 x86: add AMD Ryzen (The Zen Core Architecture) target 2019-12-03 06:40:51 -08:00
CN_SZTL
d8d96065b2
Merge Lean's source 2019-12-01 22:11:47 +08:00
LEAN-ESX
6e8290d715 kernel: bump to 4.9.205, 4.14.156, 4.19.86 2019-12-01 05:59:29 -08:00
CN_SZTL
5c25afb827
Merge Lean's source 2019-11-25 13:07:32 +08:00
LEAN-ESX
c90e5bff65 packages: target rip of some packages 2019-11-24 20:05:42 -08:00
CN_SZTL
9c20c1a58a
Merge Lean's source 2019-11-23 08:47:06 +08:00
LEAN-ESX
851d616c7a kernel: bump to 4.14.155, 4.19.85 2019-11-22 09:25:25 -08:00
CN_SZTL
9b7eb065b2
Merge Lean's source 2019-11-22 12:39:14 +08:00
LEAN-ESX
4730b1260e kernel: bump to 4.9.202, 4.14.154, 4.19.84 2019-11-21 17:42:54 -08:00
CN_SZTL
bdc5323ec4
Merge Lean's Source 2019-11-21 22:12:22 +08:00
LEAN-ESX
a196a98f00 Revert "kernel: bump to 4.9.202, 4.14.154, 4.19.84"
This reverts commit 2070dec20d.
2019-11-21 04:03:03 -08:00
CN_SZTL
67fb85e84a
Merge Lean's source 2019-11-21 17:51:29 +08:00
LEAN-ESX
2070dec20d kernel: bump to 4.9.202, 4.14.154, 4.19.84 2019-11-20 23:04:05 -08:00
CN_SZTL
c842a5141c
Merge Lean's source 2019-11-13 12:57:54 +08:00
LEAN-ESX
422b5a1db9 kernel: bump to 4.9.199, 4.14.152, 4.19.82 2019-11-12 06:39:20 -08:00
CN_SZTL
5f569986c8
Don't build coremark by default 2019-11-08 22:15:33 +08:00
CN_SZTL
efe8e45009
build: image: fix build breakage of some images 2019-11-08 22:09:50 +08:00
CN_SZTL
088f2a41d8
build: label kernel and rootfs ext4 volumes 2019-11-08 21:17:06 +08:00
CN_SZTL
7c922022fb
Merge Lean's source 2019-11-01 22:59:46 +08:00
LEAN-ESX
db7a92c009 kernel: bump to 4.9.198, 4.14.151, 4.19.81 2019-11-01 06:54:04 -07:00
CN_SZTL
cf62f3f2b2
Merge Lean's source 2019-10-29 12:46:36 +08:00
LEAN-ESX
4e99359819 netfilter: fix NAT packaging with kernels 5.2+ 2019-10-28 19:23:17 -07:00
CN_SZTL
e2373ba648
Merge Lean's source 2019-10-28 22:18:48 +08:00
LEAN-ESX
6b1b71e667 toolchain: ARM: Fix toolchain compilation for gcc 8.x 2019-10-28 02:46:48 -07:00
LEAN-ESX
e21c8c95e1 "toolchain: switch to GCC v7.4"
This reverts commit 7548d17823.
2019-10-28 01:19:41 -07:00
CN_SZTL
e0bd746722
build: fix separator 2019-10-27 15:17:03 +08:00
CN_SZTL
254ff014da
Merge Lean's source 2019-10-27 10:11:26 +08:00
LEAN-ESX
7548d17823 toolchain: switch to v8.3.2 2019-10-26 10:27:03 -07:00
CN_SZTL
09a29e8324
build: call Host/Uninstall before wiping the host build dir 2019-10-26 08:45:57 +08:00
CN_SZTL
54a924203d
Merge Lean's source 2019-10-23 17:57:09 +08:00
LEAN-ESX
6d0aa62fcc ipq40xx: add G-DOCK 2.0 (P&W R619AC) support 2019-10-22 23:14:35 -07:00
CN_SZTL
e0bca8c036
Merge https://github.com/coolsnowwolf/lede into dev 2019-10-21 13:22:31 +08:00
LEAN-ESX
39a642a130 build: create JSON files containing image info 2019-10-20 05:03:52 -07:00
CN_SZTL
d218fced9a
Merge Lean's source 2019-10-20 08:14:12 +08:00
LEAN-ESX
4e08c225ca build: allow overriding default selection state for devices 2019-10-19 11:35:16 -07:00
CN_SZTL
6fe5f3bda3
build: fix seq host tool check 2019-10-19 08:33:22 +08:00
CN_SZTL
f1fdb26d1a
Merge Lean's source 2019-10-16 12:44:01 +08:00
LEAN-ESX
1aa668b3e8 kernel: bump to 4.14.149 and 4.19.79 2019-10-15 09:31:54 -07:00
CN_SZTL
445483c096
kernel.mk: add KCFLAGS to make kmods reproducible 2019-10-12 15:56:42 +08:00
CN_SZTL
f8323465d0
build: adjust gcc/g++ version checks for newer apple compilers 2019-10-12 08:17:27 +08:00
CN_SZTL
fc184df3d4
Merge Lean's source 2019-10-12 08:03:19 +08:00
LEAN-ESX
101c974800 x64: improve docker support 2019-10-10 09:34:30 -07:00
LEAN-ESX
6e2f8766af kernel: bump to 4.9.196, 4.14.148, 4.19.78 2019-10-08 07:38:30 -07:00
CN_SZTL
2e2284d6fe
fix permission 2019-09-30 13:52:50 +08:00
CN_SZTL
b4507b0342
merge lean's source 2019-09-30 13:23:48 +08:00
LEAN-ESX
eb05272f01 kernel: bump to 4.9.194, 4.14.146, 4.17.75 2019-09-24 09:44:15 -07:00
CN_SZTL
2c67c31c9c
merge lean source 2019-09-15 15:32:13 +08:00
LEAN-ESX
753e1f22ab kernel: bump to 4.9.192, 4.14.143, 4.19.72 2019-09-14 20:43:54 -07:00
CN_SZTL
8387b23b0b
Merge https://github.com/coolsnowwolf/lede into dev 2019-09-07 15:10:06 +08:00
LEAN-ESX
6219af90ab kernel: bump to 4.14.141, 4.19.69 2019-09-05 21:28:35 -07:00
CN_SZTL
4a18c488a9
Merge https://github.com/coolsnowwolf/lede into dev 2019-08-30 02:16:43 +08:00
LEAN-ESX
1f104a9591 kernel: bump to 4.9.190 ,4.14.140, 4.19.68 2019-08-29 10:27:17 -07:00
CN_SZTL
d00dd2eb0a
fix & merge 2019-08-17 13:13:16 +08:00
LEAN-ESX
515be49711 kernel: bump to 4.9.189,4.14.138,4.19.66 2019-08-16 22:09:02 -07:00
CN_SZTL
76c1272dae
fix permisson 2019-08-16 15:09:42 +08:00
CN_SZTL
11de7d4f1b
fix conflicts & merge 2019-08-06 22:23:57 +08:00
LEAN-ESX
54cbf45e0c kernel: bump to 4.9.187, 4.14.136, 4.19.64 2019-08-06 06:10:35 -07:00
CN_SZTL
e7ffe7907e
resolve conflict 2019-08-05 15:50:30 +08:00
LEAN-ESX
95d74fb479 kernel bump to 4.9.186, 4.14.134, 4.19.62 2019-08-04 22:11:18 -07:00
CN_SZTL
350f06cfea
resolve confilct 2019-07-06 23:15:34 +08:00
LEAN-ESX
1d882a86f6 kernel: bump to 4.9.183, 4.14.129, 4.19.53 2019-07-06 07:02:01 -07:00
LEAN-ESX
610721a2e7 Version update to R9.7.6 2019-07-06 05:50:30 -07:00
CN_SZTL
f59a5f9ad9
resolve conflict 2019-06-21 18:34:23 +08:00
LEAN-ESX
4456b485cb kernel: bump to 4.9.182, 4.14.127, 4.19.52 to fix SACK Panic 2019-06-19 02:46:58 -07:00
CN_SZTL
d51120cee3
Merge branch 'master' of https://github.com/coolsnowwolf/lede 2019-06-14 15:28:52 +08:00
coolsnowwolf
129f56731e kernel: bump to 4.9.180, 4.14.123, 4.19.48 2019-06-11 18:42:29 +08:00
CN_SZTL
eaa0870504
Merge pull request #7 from coolsnowwolf/master
merge newest source from lean
2019-05-31 22:27:03 +08:00
LEAN-ESX
63bfcf90e1 kernel: bump to 4.9.178, 4.14.121 ,4.19.45 2019-05-31 07:23:07 -07:00
CN_SZTL
66faf21953
Merge branch 'master' of https://github.com/coolsnowwolf/lede into coolsnowwolf-master
Conflicts:
	target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
	target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
	target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch

 It looks like you may be committing a merge.
 If this is not correct, please remove the file
	.git/MERGE_HEAD
 and try again.

 Please enter the commit message for your changes. Lines starting
 with '' will be ignored, and an empty message aborts the commit.

 On branch coolsnowwolf-master
 All conflicts fixed but you are still merging.

 Changes to be committed:
	modified:   include/kernel-version.mk
	modified:   target/linux/ath79/patches-4.19/910-unaligned_access_hacks.patch
	modified:   target/linux/generic/backport-4.14/301-v4.16-netfilter-core-only-allow-one-nat-hook-per-hook-poin.patch
	modified:   target/linux/generic/backport-4.14/303-v4.16-netfilter-nf_tables-remove-multihook-chains-and-fami.patch
	modified:   target/linux/generic/backport-4.14/312-v4.16-netfilter-nf_tables-remove-hooks-from-family-definit.patch
	modified:   target/linux/generic/backport-4.14/320-v4.16-netfilter-nf_conntrack-add-IPS_OFFLOAD-status-bit.patch
	modified:   target/linux/generic/backport-4.14/321-v4.16-netfilter-nf_tables-add-flow-table-netlink-frontend.patch
	modified:   target/linux/generic/backport-4.14/327-v4.16-netfilter-nf_tables-remove-nhooks-field-from-struct-.patch
	modified:   target/linux/generic/backport-4.14/328-v4.16-netfilter-nf_tables-fix-a-typo-in-nf_tables_getflowt.patch
	modified:   target/linux/generic/backport-4.14/330-v4.16-netfilter-nf_tables-remove-flag-field-from-struct-nf.patch
	modified:   target/linux/generic/backport-4.14/331-v4.16-netfilter-nf_tables-no-need-for-struct-nft_af_info-t.patch
	modified:   target/linux/generic/backport-4.14/332-v4.16-netfilter-nf_tables-remove-struct-nft_af_info-parame.patch
	modified:   target/linux/generic/backport-4.14/334-v4.15-netfilter-nf_tables-fix-potential-NULL-ptr-deref-in-.patch
	modified:   target/linux/generic/backport-4.14/335-v4.16-netfilter-nf_tables-add-single-table-list-for-all-fa.patch
	modified:   target/linux/generic/backport-4.14/336-v4.15-netfilter-exit_net-cleanup-check-added.patch
	modified:   target/linux/generic/backport-4.14/337-v4.16-netfilter-nf_tables-get-rid-of-pernet-families.patch
	modified:   target/linux/generic/backport-4.14/338-v4.16-netfilter-nf_tables-get-rid-of-struct-nft_af_info-ab.patch
	modified:   target/linux/generic/backport-4.14/339-v4.16-netfilter-nft_flow_offload-wait-for-garbage-collecto.patch
	modified:   target/linux/generic/backport-4.14/342-v4.16-netfilter-nf_tables-fix-flowtable-free.patch
	modified:   target/linux/generic/backport-4.14/344-v4.16-netfilter-nf_tables-allocate-handle-and-delete-objec.patch
	modified:   target/linux/generic/backport-4.14/357-v4.18-netfilter-nf_flow_table-move-init-code-to-nf_flow_ta.patch
	modified:   target/linux/generic/backport-4.14/358-v4.18-netfilter-nf_flow_table-fix-priv-pointer-for-netdev-.patch
	modified:   target/linux/generic/backport-4.14/359-v4.18-netfilter-nf_flow_table-track-flow-tables-in-nf_flow.patch
	modified:   target/linux/generic/backport-4.14/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
	modified:   target/linux/generic/backport-4.19/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
	deleted:    target/linux/generic/pending-4.14/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
	modified:   target/linux/generic/pending-4.14/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
	modified:   target/linux/generic/pending-4.14/642-net-8021q-support-hardware-flow-table-offload.patch
	modified:   target/linux/generic/pending-4.14/680-NET-skip-GRO-for-foreign-MAC-addresses.patch
	deleted:    target/linux/generic/pending-4.19/103-MIPS-perf-ath79-Fix-perfcount-IRQ-assignment.patch
	modified:   target/linux/generic/pending-4.19/640-netfilter-nf_flow_table-add-hardware-offload-support.patch
	modified:   target/linux/generic/pending-4.19/642-net-8021q-support-hardware-flow-table-offload.patch
	modified:   target/linux/ipq806x/patches-4.14/0067-generic-Mangle-bootloader-s-kernel-arguments.patch
	modified:   target/linux/layerscape/patches-4.14/202-core-linux-support-layerscape.patch
	modified:   target/linux/layerscape/patches-4.14/810-kvm-support-layerscape.patch
	modified:   target/linux/mvebu/patches-4.14/006-mvebu-Mangle-bootloader-s-kernel-arguments.patch
	deleted:    target/linux/oxnas/patches-4.14/060-fix-oxnas-rps-dt-match.patch
	modified:   target/linux/oxnas/patches-4.14/996-generic-Mangle-bootloader-s-kernel-arguments.patch
	modified:   target/linux/sunxi/patches-4.14/002-net-stmmac-dwmac-sun8i-Handle-integrated-external-MD.patch
	modified:   target/linux/sunxi/patches-4.14/003-net-stmmac-sun8i-Restore-the-compatibles.patch
	modified:   target/linux/x86/patches-4.14/200-pcengines-apu2-reboot.patch
	modified:   target/linux/x86/patches-4.19/200-pcengines-apu2-reboot.patch
2019-05-27 00:35:12 +08:00
LEAN-ESX
b720b9bbd4 kernel: bump to 4.9.177, 4.14.120 , 4.19.44 2019-05-25 19:53:25 -07:00
CN_SZTL
ce8ed9121b
add luci-app-haproxy & luci-app-udpspeederv2 2019-05-25 21:05:51 +08:00
LEAN-ESX
b5daaadc0c Love & Peace 2019-05-16 08:52:22 -07:00
coolsnowwolf
91ed8a05f4 kernel: bump to 4.9.175, 4.14.118, 4.19.42 2019-05-15 00:13:16 +08:00
coolsnowwolf
45401c9a0d kernel: bump to 4.9.171, 4.14.114, 4.19.37 2019-05-02 22:08:19 +08:00
coolsnowwolf
a776110414 kernel: bump to 4.9.170, 4.14.113, 4.19.36 2019-04-24 12:05:32 +08:00
coolsnowwolf
37b4a94597 kernel: version bump to 4.9.169, 4.14.112, 4.19 to 4.19.35 2019-04-23 14:42:35 +08:00
coolsnowwolf
bc1448c2b1 target: add luci-app-xlnetacc by default 2019-04-21 01:48:35 +08:00
coolsnowwolf
87e3eb1556 opkg: add https ssl support 2019-04-21 01:43:48 +08:00
coolsnowwolf
5e8c8751b3 target: replace ipsec-vpnd with zerotier 2019-04-21 01:20:53 +08:00
coolsnowwolf
8c4e69f34d linux-firmware: update to 2019-04 2019-04-20 17:51:24 +08:00
coolsnowwolf
eaaf67692d coremark: add cpu coremark support (need update luci) 2019-04-18 17:43:27 +08:00
coolsnowwolf
f9937359c3 ath10k: bump to latest version 2019-04-18 10:25:26 +08:00
coolsnowwolf
ab24168802 kernel: bump to 4.9.168 , 4.14.111, 4.19.34 2019-04-12 11:39:40 +08:00
coolsnowwolf
5fa08c60db netfilter: nf_nat_snmp_basic: use nf_ct_helper_log 2019-04-07 10:53:30 +08:00
coolsnowwolf
f47089ddf8 target: adjust some packages 2019-04-06 00:15:38 +08:00
coolsnowwolf
d5107528bc kernel: bump to 4.9.166 and 4.14.109 2019-03-30 20:46:18 +08:00
coolsnowwolf
8c6dff711b kernel: bump to 4.9.164 and 4.14.107 2019-03-23 14:50:46 +08:00
coolsnowwolf
d118a76231 rip of luci-app-wrtbwmon by default 2019-03-20 14:16:30 +08:00
coolsnowwolf
ec09753204 kernel: bump to 4.9.163 and 4.14.106 2019-03-20 13:52:57 +08:00
coolsnowwolf
dc442cd994 kernel: bump to 4.9.161 and 4.14.104 2019-03-07 19:53:19 +08:00
coolsnowwolf
646f4ae77a build: add a script for generating Linksys EA6350v3 factory image 2019-03-07 19:45:12 +08:00
coolsnowwolf
3da298931b kernel: bump 3.18.136, 4.9.160, 4.14.103, 4.19.25 2019-02-26 22:12:35 +08:00
coolsnowwolf
f16d4fe369 kernel: bump to 3.8.134, 4.9.155, 4.14.98, 4.19.20 2019-02-12 23:17:22 +08:00
coolsnowwolf
d9b83ef6fd kernel: bump to 3.8.133, 4.9.153, 4.14.96 2019-02-12 23:04:43 +08:00
coolsnowwolf
154e9d9828 kernel: bump to 4.9.151 and 4.14.94 2019-01-22 10:45:29 +08:00
coolsnowwolf
167b195588 kernel: bump 4.19 to 4.19.16 2019-01-18 14:54:03 +08:00
coolsnowwolf
2b97e7a8e5 kernel: bump 4.9 to 4.9.150 2019-01-18 14:50:48 +08:00
coolsnowwolf
13169a3561 kernel: bump 3.18 to 3.18.132 2019-01-18 14:46:10 +08:00
coolsnowwolf
dc726eeb7b kernel: bump 4.14 to 4.14.93 2019-01-15 10:36:07 +08:00
coolsnowwolf
415d563eeb kernel:update kernel verson to 3.18.131, 4.9.148, 4.14.91 2019-01-11 11:25:40 +08:00
coolsnowwolf
fad9520b11 remove luci-app-xlnetacc default sel 2019-01-03 20:41:23 +08:00
coolsnowwolf
347daa04b2 Merge branch master of https://github.com/coolsnowwolf/lede 2019-01-03 19:29:28 +08:00
coolsnowwolf
1afb013dfe Revert "kernel: bump 4.14 to 4.14.90"
This reverts commit e5d66977f7.
2019-01-03 17:26:06 +08:00
coolsnowwolf
e5d66977f7 kernel: bump 4.14 to 4.14.90 2018-12-27 21:08:44 +08:00
coolsnowwolf
2069e1736d default add luci-app-accesscontrol package 2018-12-20 21:55:22 +08:00
coolsnowwolf
b47f7cfbd0 kernel:bump to 4.14.89, import 4.19.9 2018-12-20 14:46:51 +08:00
coolsnowwolf
111fb6c665 kernel: bump to 3.18.129, 4.9.145, 4.14.88 2018-12-15 13:29:45 +08:00
coolsnowwolf
334048b2c4 kernel: bump to 3.18.128, 4.9.144, 4.14.87 2018-12-12 15:39:25 +08:00
coolsnowwolf
8adb90b287 package: add luci-app-accesscontrol 2018-11-30 18:32:52 +08:00
coolsnowwolf
fdc4c68781 target: add luci-app-mwan3helper and luci-app-syncdial by default 2018-11-29 22:11:21 +08:00
coolsnowwolf
abb35b773b add luci-app-wireguard by default 2018-11-28 21:07:09 +08:00
coolsnowwolf
07903a1da4 kernel: bump to 3.18.126, 4.9.138, 4.14.82 2018-11-24 14:43:39 +08:00
coolsnowwolf
f3b07a1c18 kernel: bump to 3.18.125 ,4.9.137, 4.14.81 2018-11-24 14:33:38 +08:00
coolsnowwolf
f23390f8bc kernel:bump 4.14 to 4.14.80 2018-11-24 14:23:59 +08:00
coolsnowwolf
4e6f1808f3 kernel: bump 4.14 to 4.14.79 2018-11-24 14:16:28 +08:00