Merge remote-tracking branch 'origin/master' into v4.0

lists/netutils.lua.m4 → lists/3g.lua.m4

 include(utils.m4)dnl Include utility macros
 _FEATURE_GUARD_
 
--- Tools
-Install("tcpdump", { priority = 40 })
-Install("relayd", { priority = 40 })
-Install("openvpn-openssl", { priority = 40 })
-
 -- 3G
 Install("br2684ctl", "comgt", "uqmi", { priority = 40 })
 Install("ppp-mod-pppoe", "pptpd", { priority = 40 })
 Install("usb-modeswitch", { priority = 40 })
 
--- IPv6
-Install("ds-lite", "6in4", "6rd", "6to4", { priority = 40 })
-
 -- Kernel
 forInstall(kmod,nf-nathelper-extra,usb-net-rndis,usb-net-qmi-wwan,usb-serial-option)
 

lists/base.lua.m4

@@ -6,6 +6,9 @@ include(luci.lua.m4)
 include(foris.lua)
 include(terminal-apps.lua)
 
+-- IPv6
+Install("ds-lite", "6in4", "6rd", "6to4", { priority = 40 })
+
 _END_FEATURE_GUARD_
 
 --[[

lists/cacerts.lua

--- This userlist is obsolete. It stays only for backward compatibility.

lists/smrt-support.lua.m4 → lists/dev-detect.lua.m4

 include(utils.m4)dnl Include utility macros
 _FEATURE_GUARD_
 
-Install("smrt", { priority = 40 })
+Install("pakon-dev-detect", { priority = 40 })
 
 _END_FEATURE_GUARD_

lists/i_agree_honeypot.lua.m4

--- This userlist is obsolete. It stays only for backward compatibility

lists/majordomo.lua

--- This userlist is obsolete. It stays only for backward compatibility.

lists/openvpn.lua.m4

 include(utils.m4)dnl Include utility macros
 _FEATURE_GUARD_
 
+Install("openvpn-openssl", { priority = 40 })
+
 Install("foris-openvpn-plugin", "dhparam", { priority = 40 })
 if for_l10n then
 	for_l10n("foris-openvpn-plugin-l10n-")

lists/printserver.lua.m4

 include(utils.m4)dnl Include utility macros
 _FEATURE_GUARD_
 
--- On Turris 1.x there is not enough space to install some of following packages
--- so we are just skipping them.
-
--- Tools
-if not model:match("^[Tt]urris$") then
-	Install("cups", "cups-client", { priority = 40 })
-	Install("openprinting-cups-filters", "gutenprint-cups", "ghostscript", "ghostscript-fonts-std", "ghostscript-gnu-gs-fonts-other", { priority = 40 })
-	Install("hplip", { priority = 40 })
-end
-
 -- Kernel
 Install("kmod-usb2", "kmod-usb-printer", { priority = 40 })
 
 -- Luci
 Install("luci-app-p910nd", { priority = 40 })
-if not model:match("^[Tt]urris$") then
-	Install("luci-app-cups", { priority = 40 })
-end
 _LUCI_I18N_(p910nd)
 
 _END_FEATURE_GUARD_

lists/shell-utils.lua

--- This userlist is obsolete. It stays only for backward compatibility.

lists/snd.lua.m4

-include(utils.m4)dnl Include utility macros
-_FEATURE_GUARD_
-
-Install("kmod-sound-core", "kmod-usb-audio", { priority = 40 })
-Install("mpd-mini", "mpc", { priority = 40 })
-Install("pulseaudio-daemon", "pulseaudio-tools", "pulseaudio-profiles", { priority = 40 })
-
-_END_FEATURE_GUARD_

lists/terminal-apps.lua

 -- Terminal tools
-Install("bash", "coreutils", "diffutils", "htop", "curl", "vim-full", "terminfo", "psmisc", "procps-ng-top", "procps-ng-ps", { priority = 40 })
+Install("bash", "coreutils", "diffutils", "htop", "curl", "vim-full", "terminfo", "psmisc", "procps-ng-top", "procps-ng-ps", "tcpdump", { priority = 40 })
 

patches/openwrt/branding/0006-Nicer-banner-better-branding.patch

@@ -39,7 +39,8 @@ index fa14868..edcc7f9 100755
  		delete system.@system[0]
  		add system system
 -		set system.@system[-1].hostname='OpenWrt'
+-		set system.@system[-1].timezone='UTC'
 +		set system.@system[-1].hostname='turris'
- 		set system.@system[-1].timezone='UTC'
++		set system.@system[-1].timezone='Europe/Prague'
  		set system.@system[-1].ttylogin='0'
  		set system.@system[-1].log_size='64'

patches/openwrt/wip/0002-kernel-Add-Turris-1.X-support.patch

-From d98698903e85a81962469dbef7c4d4998c9ec2fe Mon Sep 17 00:00:00 2001
+From b8d494de98ff76fefed6f9403dec2ac75b1e66d3 Mon Sep 17 00:00:00 2001
 From: Michal Hrusecky <Michal@Hrusecky.net>
 Date: Wed, 27 Dec 2017 17:19:45 +0100
 Subject: [PATCH] kernel: Add Turris 1.X support
@@ -9,16 +9,17 @@ some polishing.
 Signed-off-by: Michal Hrusecky <Michal@Hrusecky.net>
 ---
  .../mpc85xx/base-files/etc/board.d/02_network |   6 +
+ target/linux/mpc85xx/config-4.14              |   3 +
  .../arch/powerpc/boot/dts/turris.dts          | 252 ++++++++++++++++++
  target/linux/mpc85xx/p2020/profiles/turris.mk |  29 ++
  ...fsl_elbc_nand_add_ecc_mode_selection.patch | 227 ++++++++++++++++
- 7 files changed, 620 insertions(+), 1 deletion(-)
+ 5 files changed, 517 insertions(+)
  create mode 100644 target/linux/mpc85xx/files-4.14/arch/powerpc/boot/dts/turris.dts
  create mode 100644 target/linux/mpc85xx/p2020/profiles/turris.mk
  create mode 100644 target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
 
 diff --git a/target/linux/mpc85xx/base-files/etc/board.d/02_network b/target/linux/mpc85xx/base-files/etc/board.d/02_network
-index 19f01a6..7679728 100755
+index 19f01a6589..7679728294 100755
 --- a/target/linux/mpc85xx/base-files/etc/board.d/02_network
 +++ b/target/linux/mpc85xx/base-files/etc/board.d/02_network
 @@ -18,6 +18,12 @@ tplink,tl-wdr4900-v1)
@@ -34,9 +35,20 @@ index 19f01a6..7679728 100755
  *)
  	ucidef_set_interfaces_lan_wan "eth0" "eth1"
  	;;
+diff --git a/target/linux/mpc85xx/config-4.14 b/target/linux/mpc85xx/config-4.14
+index b60133e30e..3cba7aeb87 100644
+--- a/target/linux/mpc85xx/config-4.14
++++ b/target/linux/mpc85xx/config-4.14
+@@ -369,3 +369,6 @@ CONFIG_WATCHDOG_CORE=y
+ # CONFIG_XPS_USB_HCD_XILINX is not set
+ CONFIG_XZ_DEC_BCJ=y
+ CONFIG_XZ_DEC_POWERPC=y
++CONFIG_FB_FSL_DIU=n
++CONFIG_VGA_CONSOLE=y
++CONFIG_VGACON_SOFT_SCROLLBACK=n
 diff --git a/target/linux/mpc85xx/files-4.14/arch/powerpc/boot/dts/turris.dts b/target/linux/mpc85xx/files-4.14/arch/powerpc/boot/dts/turris.dts
 new file mode 100644
-index 0000000..5c5555f
+index 0000000000..5c5555fde9
 --- /dev/null
 +++ b/target/linux/mpc85xx/files-4.14/arch/powerpc/boot/dts/turris.dts
 @@ -0,0 +1,252 @@
@@ -294,7 +306,7 @@ index 0000000..5c5555f
 +/include/ "fsl/p2020si-post.dtsi"
 diff --git a/target/linux/mpc85xx/p2020/profiles/turris.mk b/target/linux/mpc85xx/p2020/profiles/turris.mk
 new file mode 100644
-index 0000000..6c1d542
+index 0000000000..6c1d5420ce
 --- /dev/null
 +++ b/target/linux/mpc85xx/p2020/profiles/turris.mk
 @@ -0,0 +1,29 @@
@@ -329,7 +341,7 @@ index 0000000..6c1d542
 +$(eval $(call Profile,TURRIS))
 diff --git a/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch b/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
 new file mode 100644
-index 0000000..d661626
+index 0000000000..d6616263f3
 --- /dev/null
 +++ b/target/linux/mpc85xx/patches-4.14/230-fsl_elbc_nand_add_ecc_mode_selection.patch
 @@ -0,0 +1,227 @@
@@ -561,5 +573,5 @@ index 0000000..d661626
 + 	 * line, these take precedence over device tree information */
 + 	mtd_device_parse_register(mtd, part_probe_types, NULL,
 -- 
-2.19.0
+2.20.1
 

patches/packages/hack/0003-squid-disable-ccache.patch

@@ -11,15 +11,6 @@ diff --git a/net/squid/Makefile b/net/squid/Makefile
 index 19c5786..1e8213b 100644
 --- a/net/squid/Makefile
 +++ b/net/squid/Makefile
-@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=squid
- PKG_VERSION:=4.4
--PKG_RELEASE:=1
-+PKG_RELEASE:=2
- 
- PKG_LICENSE:=GPL-2.0
- PKG_MAINTAINER:=Marko Ratkaj <marko.ratkaj@sartura.hr>
 @@ -26,6 +26,12 @@ PKG_FIXUP:=autoreconf
  
  include $(INCLUDE_DIR)/package.mk