.githooks/pre-push

@@ -64,12 +64,16 @@ done
 
 if [ -n "$push_master" ]; then
 	if [ -z "$push_develop" ]; then
-		echo "Develop branch has to be always updated with master branch." >&2
-		echo "Push both at the same time with: git push origin master develop" >&2
-		exit 1
-	fi
-	if ! git merge-base --is-ancestor "$push_master" "$push_develop"; then
-		echo "Tip commit of master is not merged to develop branch." >&2
-		exit 1
+		# We allow push only master if it is a fast-forward
+		if ! git merge-base --is-ancestor "$push_master" "$(git rev-parse "$remote_name/develop")"; then
+			echo "Develop branch has to be always updated with master branch." >&2
+			echo "Push both at the same time with: git push origin master develop" >&2
+			exit 1
+		fi
+	else
+		if ! git merge-base --is-ancestor "$push_master" "$push_develop"; then
+			echo "Tip commit of master is not merged to develop branch." >&2
+			exit 1
+		fi
 	fi
 fi

.gitlab-ci.yml

-image: registry.nic.cz/turris/os/updater-lists
-
 stages:
+  - docker
   - build
   - check
 
-.configure:
-  before_script:
-    - ./configure -f /feeds.conf
+image: "$CI_REGISTRY_IMAGE"
 
+## Docker stage ##################################################################
+docker:
+  stage: docker
+  image: $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/docker
+  services:
+    - $CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX/docker:dind
+  tags:
+    - dind
+    - privileged
+  before_script:
+    - echo "$CI_REGISTRY_PASSWORD" | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
+  script:
+    - docker pull "$CI_REGISTRY_IMAGE" || true
+    - docker build --pull --cache-from "$CI_REGISTRY_IMAGE" --tag "$CI_REGISTRY_IMAGE" --file .gitlab-ci/Dockerfile .gitlab-ci
+    - docker push "$CI_REGISTRY_IMAGE"
 
 ## Build stage ###################################################################
 build:
   stage: build
-  extends: .configure
+  needs:
+    - job: docker
+      artifacts: false
   script:
+    - ./configure -f /feeds.conf
     - make
+  artifacts:
+    paths:
+      - '.config.mk'
+      - 'output/'
 
 ## Check stage ###################################################################
 lint:
   stage: check
-  extends: .configure
+  needs: [build]
   script:
     - make lint
 
 test:
   stage: check
-  extends: .configure
+  needs: [build]
   script:
     - make -k test

.gitlab-ci/Dockerfile

@@ -6,7 +6,7 @@ RUN \
   apt-get update && \
   apt-get -y upgrade && \
   apt-get -y install --no-install-recommends \
-	make m4 \
+    make m4 \
     lua5.1 lua-check \
     && \
   apt-get clean
@@ -14,5 +14,3 @@ RUN \
 COPY feeds.conf /feeds.conf
 
 CMD [ "bash" ]
-
-# vim: ft=dockerfile

base-conditional.lua.m4

@@ -3,11 +3,13 @@ include(utils.m4)dnl
 
 _FEATURE_GUARD_
 
--- Install replacement link for python when python-base is not installed and python3-base is
-Install("python3-python", { condition = {Not("python-base"), "python3-base"}, priority = 40 })
-
 -- Reload of OpenVPN on network restart to ensure fast reconnect
 Install("openvpn-hotplug", { priority = 30, condition = "openvpn" })
 
+-- Install emulated atsha204 when we are running in the container
+if container then
+	Install("libatsha204-emul", { priority = 30, condition = "libatsha204" })
+end
+
 
 _END_FEATURE_GUARD_

base-fix.lua → base-fix.lua.m4

+include(utils.m4)dnl
 -- Fixes and hacks to migrate from older setups
 
 -- ABI changed in libubus with version 2019-12-27
@@ -140,13 +141,17 @@ end
 -- With uboot-envtools version 2018.03-4 environment configuration was fixed. Problem
 -- is that it is not applied in default as script checks for existence of
 -- /etc/config/ubootenv file and does nothing.
--- In case of Mox we also move fw_env.config from mox-support package. Because of
--- that we have to update mox-support first so we would not remove generated file.
+-- In case of Mox the fw_env.config file was part of the mox-generic-support
+-- package. We can't rely on updater stealing files between packages because
+-- /etc/fw_env.config file is generated and not tracked as part of the package.
+-- Thus we have to make sure that file is removed before we generate the new
+-- content (to prevent removal by updater later on). We do this by adding
+-- dependency on mox-generic-support for uboot-envtools.
 if not version_match or not installed or
 		(installed["uboot-envtools"] and version_match(installed["uboot-envtools"].version, "<2018.03-4")) then
 	Package("uboot-envtools", { deps = "fix-uboot-env-reset" })
 	if board == "mox" then
-		Package("uboot-envtools", { deps = "mox-support" })
+		Package("uboot-envtools", { deps = "mox-generic-support" })
 	end
 end
 
@@ -191,3 +196,20 @@ if installed and installed["pkglists"] and version_match(installed["pkglists"].v
 	Install("fix-pkglists-nikola-to-fwlogs")
 	Package("fix-pkglists-nikola-to-fwlogs", { replan = "finished" })
 end
+
+-- Fix lighttpd configuration to incorporate upstream changes
+-- By moving files from one folder to another.
+-- This allows use to smoothly use upstream variant.
+if not version_match or not installed or
+                (installed["lighttpd"] and version_match(installed["lighttpd"].version, "<1.4.64-3")) then
+        Install("fix-lighttpd-sync-with-upstream")
+        Package("fix-lighttpd-sync-with-upstream", { replan = "finished" })
+end
+
+-- The Turris 1.x SD card controller gets sometimes switched to read only mode
+-- and there was previously nothing to switch it back. This fix adds such
+-- command to the boot command (U-Boot) that is executed on every bootup.
+if board == "turris1x" and os_release.VERSION and version_match(os_release.VERSION, "<=6.0.0") then
+	Install("fix-turris1x-btrfs-sdcard")
+	Package("fix-turris1x-btrfs-sdcard", { replan = "finished" })
+end

base-min.lua.m4

@@ -33,11 +33,10 @@ Install("urandom-seed", { priority = 40 })
 Install("turris-defaults", { priority = 40 })
 Install("cronie", { priority = 40 })
 Install("syslog-ng", "logrotate", { priority = 40 })
+Install("knot-resolver", { priority = 40 })
 if board == "turris1x" then
 	Install("unbound", "unbound-anchor", { priority = 40 })
 	Install("turris1x-btrfs", { priority = 40 }) -- Currently only SD card root is supported
-else
-	Install("knot-resolver", { priority = 40 })
 end
 
 -- Certificates
@@ -53,7 +52,7 @@ _FEATURE_GUARD_
 
 -- Network tools
 Install("ip-full", "tc", "genl", "ip-bridge", "ss", "nstat", "devlink", "rdma", { priority = 40 })
-Install("iputils-ping", "iputils-ping6", "iputils-tracepath", "iputils-tracepath6", "iputils-traceroute6", { priority = 40 })
+Install("iputils-ping", "iputils-tracepath", { priority = 40 })
 Install("iptables", "ip6tables", "conntrack", { priority = 40 })
 Install("bind-client", "bind-dig", { priority = 40 })
 Install("umdns", { priority = 40 })
@@ -72,9 +71,6 @@ end
 Install("turris-version", "start-indicator", { priority = 40 })
 Install("turris-utils", "user-notify", "watchdog_adjust", { priority = 40 })
 Install("turris-diagnostics", { priority = 40 })
-if for_l10n then
-	for_l10n("user-notify-l10n-")
-end
 if board == "mox" then
 	Install("mox-otp", { priority = 40 })
 elseif board == "omnia" then

base.lua.m4

@@ -10,6 +10,7 @@ list_script('luci.lua')
 list_script('foris.lua')
 list_script('terminal-apps.lua')
 list_script('webapps.lua')
+list_script('localization.lua')
 
 
 -- OpenWrt package management

contracts/cti.lua.m4

@@ -7,20 +7,6 @@ Install("omnia-cti-support", { priority = 60 })
 -- Extra security
 Install('common_passwords')
 
--- Data collection
-Install('sentinel-i_agree_with_eula')
-
-options = {
-    ["dynfw"] = true,
-    ["haas"] = true,
-    ["survey"] = true,
-    ["fwlogs"] = true,
-    ["minipot"] = true,
-}
-Export("options")
-Script("../pkglists/datacollect.lua")
-Unexport("options")
-
 
 -- Contracted routers have in boot environment set contract variable that is used
 -- in boot arguments. This variable should be preserved but due to bug in rescue

drivers/pci.lua

@@ -36,6 +36,21 @@ local db = {
 		device = 0x7612,
 		packages = {"kmod-mt76"}
 	},
+	{ -- MEDIATEK Corp. MT7915E 802.11ax PCI Express Wireless Network Adapter
+		vendor = 0x14c3,
+		device = 0x7915,
+		packages = {"kmod-mt7915e"}
+	},
+	{ -- MEDIATEK Corp. Device 7615
+		device = 0x7615,
+		vendor = 0x14c3,
+		packages = {"kmod-mt7615e", "kmod-mt7615-firmware"}
+	},
+	{ -- MEDIATEK Corp. RZ608 Wi-Fi 6E 80MHz
+		vendor = 0x14c3,
+		device = 0x0608,
+		packages = {"kmod-mt7921e"}
+	},
 }
 
 ----------------------------------------------------------------------------------

foris.lua.m4

 include(utils.m4)dnl
 _FEATURE_GUARD_
 
-local foris_plugins = {
-	["diagnostics"] = "turris-diagnostics",
-	["netmetr"] = "netmetr",
-	["openvpn"] = "openvpn",
-	["pakon"] = "pakon",
-	["storage"] = false,
-	["subordinates"] = "turris-netboot-tools",
-}
-
-local reforis_plugins = {
+-- These are reForis plugins to be installed as extension for specific other package
+local reforis_optional_plugins = {
 	["data-collection"] = "sentinel-proxy",
 	["haas"] = "haas-proxy",
 	["diagnostics"] = "turris-diagnostics",
 	["netboot"] = "turris-netboot-tools",
 	["netmetr"] = "netmetr",
 	["openvpn"] = "openvpn",
-	["remote-access"] = false,
-	["remote-devices"] = false,
-	["remote-wifi-settings"] = false,
 	["snapshots"] = "schnapps",
 }
 
 ----------------------------------------------------------------------------------
 
-Install("foris", "foris-storage-plugin", { priority = 40 })
+Install("lighttpd-https-cert", { priority = 40 })
 Install("reforis", "reforis-storage-plugin", { priority = 40 })
 
-for plugin, condition in pairs(foris_plugins) do
-	local fplugin = "foris-" .. plugin .. "-plugin"
-	if condition ~= false then
-		Install(fplugin, { priority = 40, condition = condition })
-	end
-	for _, lang in pairs(l10n or {}) do
-		Install(fplugin .. "-l10n-" .. lang, {
-			priority = 10,
-			optional = true,
-			condition = fplugin
-		})
-	end
+for plugin, condition in pairs(reforis_optional_plugins) do
+	Install("reforis-" .. plugin .. "-plugin", {
+		priority = 40,
+		condition = condition
+	})
 end
 
-for plugin, condition in pairs(reforis_plugins) do
-	local refplugin = "reforis-" .. plugin .. "-plugin"
-	if condition ~= false then
-		Install(refplugin, { priority = 40, condition = condition or nil })
-	end
-	for _, lang in pairs(l10n or {}) do
-		Install(refplugin .. "-l10n-" .. lang, {
-			priority = 10,
-			optional = true,
-			condition = refplugin
-		})
-	end
-end
-
-if for_l10n then
-	for_l10n("foris-l10n-")
-	for_l10n("reforis-l10n-")
-	for_l10n('pkglists-l10n-')
-end
-
-Install("lighttpd-https-cert", { priority = 40 })
-
--- Workaround how to install foris-controller-nextcloud-module
--- because there is no nextcloud-plugin
-Install("foris-controller-nextcloud-module", { condition = {"nextcloud", "foris-controller-storage-module"} })
-
 _END_FEATURE_GUARD_

kmod-mox.list

+# I2C (to enable RTC)
+i2c-pxa
+
 # Real time clock
 rtc-ds1307
+
 # Button and led on A module
 gpio-button-hotplug
-ledtrig-heartbeat
 
 # SDIO Wi-Fi and BT
 mwlwifi

kmod-omnia.list

 # Turris Omnia specific drivers
-switch-mvsw61xx
 usb-serial-qualcomm
 gpio-pca953x
 i2c-mux-pca954x
 eeprom-at24
+leds-turris-omnia
 
 # Various led triggers
-ledtrig-default-on
 ledtrig-gpio
-ledtrig-heartbeat
-ledtrig-netdev
 ledtrig-oneshot
-ledtrig-timer
 ledtrig-transient

kmod-turris1x.list

@@ -2,9 +2,14 @@
 button-hotplug
 hwmon-lm90
 
+leds-turris-1x
 leds-gpio
 input-gpio-keys
+gpio-pca953x
 
+ptp-qoriq
+
+# RTC
 rtc-ds1307
 
 # For Turris 1.1

kmod.list

 # Wi-Fi drivers
 ath9k
 ath10k
+mt7915e
 
 # Firewall
 ipt-offload

lists.mk

@@ -5,7 +5,7 @@ ENTRY_LISTS := \
 LISTS := \
 	$(ENTRY_LISTS) \
 	base-fix base-conditional repository \
-	updater foris luci terminal-apps webapps \
+	updater foris luci localization terminal-apps webapps \
 
 include contracts/lists.mk
 include drivers/lists.mk

localization.lua.m4

+include(utils.m4)dnl
+_FEATURE_GUARD_
+
+-- Our own version of for_l10n to override priority and use condition
+local function for_l10n(package)
+	for _, lang in pairs(l10n or {}) do
+		Install(package .. "-l10n-" .. lang, {
+			optional = true,
+			priority = 10,
+			condition = {package, "l10n-supported"}
+		})
+	end
+end
+
+
+-- reForis
+for_l10n("reforis")
+for_l10n("reforis-data-collection-plugin")
+for_l10n("reforis-haas-plugin")
+for_l10n("reforis-diagnostics-plugin")
+for_l10n("reforis-netboot-plugin")
+for_l10n("reforis-netmetr-plugin")
+for_l10n("reforis-openvpn-plugin")
+for_l10n("reforis-remote-access-plugin")
+for_l10n("reforis-remote-devices-plugin")
+for_l10n("reforis-remote-wifi-settings-plugin")
+for_l10n("reforis-snapshots-plugin")
+
+-- Package lists
+for_l10n('pkglists')
+
+-- User-notify
+for_l10n("user-notify")
+
+-- Diagnostics
+for_l10n("turris-diagnostics")
+
+
+_END_FEATURE_GUARD_

luci.lua.m4

@@ -2,6 +2,7 @@ include(utils.m4)dnl
 _FEATURE_GUARD_
 
 local luci_apps = {
+	"acl",
 	"acme",
 	"adblock",
 	"advanced-reboot",
@@ -9,12 +10,9 @@ local luci_apps = {
 	"aria2",
 	"attendedsysupgrade",
 	"banip",
+	"base",
 	"bcp38",
-	"bird1-ipv4",
-	"bird1-ipv6",
-	"bmx6",
 	"bmx7",
-	"cjdns",
 	"clamav",
 	"commands",
 	"cshark",
@@ -22,31 +20,29 @@ local luci_apps = {
 	"ddns",
 	"diag-core",
 	"dnscrypt-proxy",
+	"dockerman",
 	"dump1090",
 	"dynapoint",
-	"e2guardian",
+	"eoip",
 	"firewall",
+	"frpc",
+	"frps",
 	"fwknopd",
 	"hd-idle",
-	"hnet",
 	"https-dns-proxy",
-	"ipfixprobe",
 	"ksmbd",
 	"lxc",
 	"minidlna",
 	"mjpg-streamer",
-	"mosquitto",
 	"mwan3",
 	"nextdns",
 	"nft-qos",
 	"nlbwmon",
-	"noddos",
 	"ntpc",
 	"nut",
 	"ocserv",
 	"olsr",
-	"olsr-services",
-	"olsr-viz",
+	"omcproxy",
 	"openvpn",
 	"opkg",
 	"p910nd",
@@ -56,16 +52,13 @@ local luci_apps = {
 	"qos",
 	"radicale",
 	"radicale2",
-	"rainbow",
-	"rosy-file-server",
 	"rp-pppoe-server",
-	"samba",
 	"samba4",
+	"ser2net",
 	"shadowsocks-libev",
 	"shairplay",
-	"siitwizard",
 	"simple-adblock",
-	"snmpd",
+	"smartdns",
 	"splash",
 	"sqm",
 	"squid",
@@ -79,14 +72,28 @@ local luci_apps = {
 	"unbound",
 	"upnp",
 	"vnstat",
-	"vpn-policy-routing",
+	"vnstat2",
 	"vpnbypass",
+	"vpn-policy-routing",
 	"watchcat",
 	"wifischedule",
 	"wireguard",
 	"wol",
+	"xinetd",
+	"yggdrasil",
 }
 
+
+Install("luci", "luci-base", { priority = 40 })
+Install("luci-i18n-base-en", { optional = true, priority = 10 })
+
+Install("luci-mod-dashboard", { priority = 40 })
+
+Install("luci-app-commands", { priority = 40 })
+Install("luci-proto-ipv6", "luci-proto-ppp", { priority = 40 })
+-- Install resolver-debug for DNS debuging
+Install("resolver-debug", { priority = 40 })
+
 -- Conditional install requests for language packages
 for _, lang in pairs({"en", unpack(l10n or {})}) do
 	for _, name in pairs(luci_apps) do
@@ -96,18 +103,11 @@ for _, lang in pairs({"en", unpack(l10n or {})}) do
 			condition = "luci-app-" .. name
 		})
 	end
+	Install("luci-i18n-base-" .. lang, {
+		priority = 10,
+		optional = true,
+		condition = "luci-base"
+	})
 end
 
-
-Install("luci", "luci-base", { priority = 40 })
-if for_l10n then
-	Install("luci-i18n-base-en", { optional = true, priority = 10 })
-	for_l10n("luci-i18n-base-")
-end
-
-Install("luci-app-commands", { priority = 40 })
-Install("luci-proto-ipv6", "luci-proto-ppp", { priority = 40 })
--- Install resolver-debug for DNS debuging
-Install("resolver-debug", { priority = 40 })
-
 _END_FEATURE_GUARD_

migrate3x.lua

@@ -28,7 +28,7 @@ if not version_match or not self_version or version_match(self_version, "<64.0")
 	Install('updater-ng', { critical = true })
 	Package('updater-ng', {
 		replan = 'immediate',
-		deps = { 'libgcc', 'busybox' }
+		deps = { 'libgcc', 'busybox', 'tos3to4-earliest' }
 	})
 	--[[
 	Updater package does not depend on libgcc but it requires it and dependency

pkglists/drivers.lua.m4

@@ -5,7 +5,7 @@ if options then
 if options.ath10k_ct or options.ath10k_ct_htt then
 	Install("kmod-ath10k-ct", { priority = 40 })
 	if options.ath10k_ct_htt then
-		Install("ath10k-firmware-qca988x-ct-htt", { priority = 40 })
+		Install("ath10k-firmware-qca988x-ct-full-htt", { priority = 40 })
 	else
 		Install("ath10k-firmware-qca988x-ct", { priority = 40 })
 	end

pkglists/nas.lua.m4

@@ -18,7 +18,7 @@ end
 Install("mount-utils", "losetup", "lsblk", "blkid", "file", { priority = 40 })
 Install("fdisk", "cfdisk", "hdparm", "resize2fs", "partx-utils", { priority = 40 })
 Install("acl", "attr", { priority = 40 })
-Install("blockd" , "smartd", "smartmontools", { priority = 40 })
+Install("blockd" , "smartd", "smartmontools", "smartmontools-drivedb", { priority = 40 })
 Install("swap-utils", { priority = 40 })
 
 -- File systems userspace utilities
@@ -63,6 +63,13 @@ if options and options.encrypt then
 	forInstall(kmod-crypto,cbc,ctr,pcbc,des,ecb,xts)
 	forInstall(kmod-crypto,cmac,crc32c,sha1,sha256,sha512,md4,md5,hmac)
 	forInstall(kmod-crypto,seqiv,ccm,deflate)
+
+        if board == "mox" then
+                Install("kmod-crypto-hw-safexcel", { priority = 40 })
+        elseif board == "turris1x" then
+                Install("kmod-crypto-hw-talitos", { priority = 40 })
+        end
+
 end
 
 _END_FEATURE_GUARD_