docs/user/supported_devices.rst

+Supported Devices & Architectures
+=================================
+
+armsr-armv7
+-----------
+
+* Arm SystemReady (EFI) 32-bit
+
+armsr-armv8
+-----------
+
+* Arm SystemReady (EFI) 64-bit
+
+ath79-generic
+--------------
+
+* ALFA Network
+
+  - AP121F
+
+* AVM
+
+  - FRITZ!WLAN Repeater 300E [#avmflash]_
+  - Fritz!WLAN Repeater 450E [#avmflash]_
+  - Fritz!Box 4020 [#avmflash]_
+
+* Buffalo
+
+  - WZR-HP-AG300H / WZR-600DHP
+  - WZR-HP-G300NH (rtl8366s)
+
+* devolo
+
+  - WiFi pro 1200e [#lan_as_wan]_
+  - WiFi pro 1200i
+  - WiFi pro 1750c
+  - WiFi pro 1750e [#lan_as_wan]_
+  - WiFi pro 1750i
+  - WiFi pro 1750x
+
+* D-Link
+
+  - DAP-1330 A1 [#lan_as_wan]_
+  - DAP-1365 A1 [#lan_as_wan]_
+  - DAP-2660 A1 [#lan_as_wan]_
+  - DAP-2680 A1 [#lan_as_wan]_
+  - DAP-2695 A1 [#lan_as_wan]_
+  - DIR-505 A1 [#lan_as_wan]_
+  - DIR-505 A2 [#lan_as_wan]_
+  - DIR-825 B1
+
+* Enterasys
+
+  - WS-AP3705i
+
+* Extreme Networks
+
+  - WS-AP3805i
+
+* GL.iNet
+
+  - 6416A
+  - GL-AR150
+  - GL-AR300M-Lite
+  - GL-AR300M16
+  - GL-AR750
+  - GL-USB150 (Microuter)
+
+* Joy-IT
+
+  - JT-OR750i
+
+* LibreRouter
+
+  - LibreRouter v1 [#missing_radios]_
+
+* NETGEAR
+
+  - WNDR3700 (v1, v2)
+  - WNDR3800
+  - WNR2200 (8M, 16M)
+  - WNDRMAC (v2)
+
+* OCEDO
+
+  - Koala
+  - Raccoon
+
+* Onion
+
+  - Omega [#modular_ethernet]_
+
+* OpenMesh
+
+  - A40
+  - A60
+  - MR600 (v1, v2)
+  - MR900 (v1, v2)
+  - MR1750 (v1, v2)
+  - OM2P (v1, v2, v4)
+  - OM2P-HS (v1, v2, v3, v4)
+  - OM2P-LC
+  - OM5P
+  - OM5P-AC (v1, v2)
+  - OM5P-AN
+
+* Plasma Cloud
+
+  - PA300
+  - PA300E
+
+* Siemens
+
+  - WS-AP3610
+
+* Sophos
+
+  - AP15C
+  - AP100
+  - AP100c
+  - AP55
+  - AP55c
+
+* Teltonika
+
+  - RUT230 (v1)
+
+* TP-Link
+
+  - Archer A7 (v5)
+  - Archer C5 (v1)
+  - Archer C6 (v2 EU/RU/JP)
+  - Archer C7 (v2, v4, v5)
+  - Archer C59 (v1)
+  - Archer C60 (v1)
+  - CPE210 (v1.0, v1.1, v2.0, v3.0, v3.1, v3.20)
+  - CPE220 (v3.0)
+  - CPE510 (v1.0, v1.1, v2.0, v3.0)
+  - CPE710 (v1.0, v2.0)
+  - EAP225-Outdoor (v1, v3)
+  - TL-WDR3500 (v1)
+  - TL-WDR3600 (v1)
+  - TL-WDR4300 (v1)
+  - TL-WR810N (v1)
+  - TL-WR842N/ND (v3)
+  - TL-WR1043N/ND (v2, v3, v4, v5)
+  - TL-WR2543N/ND (v1)
+  - WBS210 (v1.20, v2.0)
+  - WBS510 (v1.20)
+
+* Ubiquiti
+
+  - NanoBeam 5AC 19 (XC)
+  - NanoBeam M5 (XW)
+  - NanoStation Loco M2/M5 (XW)
+  - NanoStation M2/M5 (XW)
+  - UniFi AC Lite
+  - UniFi AC LR
+  - UniFi AC Mesh
+  - UniFi AC Mesh Pro
+  - UniFi AC Pro
+  - UniFi AP
+  - UniFi AP LR
+  - UniFi AP Outdoor+
+  - UniFi AP PRO
+  - UniFi Swiss Army Knife Ultra
+
+ath79-mikrotik
+--------------
+
+* Mikrotik
+
+  - RB951Ui-2nD (hAP)
+  - RBwAPR-2nD (wAP R)
+
+ath79-nand
+----------
+
+* Aerohive
+
+  - HiveAP 121
+
+* GL.iNet
+
+  - GL-AR300M
+  - GL-AR750S
+  - GL-XE300
+
+* NETGEAR
+
+  - WNDR3700 (v4)
+  - WNDR4300 (v1)
+
+* Zyxel
+
+  - NBG6716
+
+brcm2708-bcm2708
+----------------
+
+* Raspberry Pi 1
+
+brcm2708-bcm2709
+----------------
+
+* Raspberry Pi 2
+
+
+ipq40xx-generic
+---------------
+
+* 8devices
+
+  - Jalapeno
+
+* Aruba
+
+  - AP-303
+  - AP-303H
+  - AP-365
+  - Instant On AP11
+  - Instant On AP11D
+  - Instant On AP17
+
+* AVM
+
+  - FRITZ!Box 4040 [#avmflash]_
+  - FRITZ!Box 7520 (v1) [#eva_ramboot]_ [#lan_as_wan]_
+  - FRITZ!Box 7530 [#eva_ramboot]_ [#lan_as_wan]_
+  - FRITZ!Repeater 1200 [#eva_ramboot]_
+
+* Extreme Networks
+
+  - WS-AP3915i
+
+* GL.iNet
+
+  - GL-AP1300
+  - GL-B1300
+
+* Linksys
+
+  - EA6350 (v3)
+
+* NETGEAR
+
+  - EX6100 (v2)
+  - EX6150 (v2)
+
+* OpenMesh
+
+  - A42
+  - A62
+
+* Plasma Cloud
+
+  - PA1200
+  - PA2200
+
+* Zyxel
+
+  - NBG6617
+
+ipq40xx-mikrotik
+----------------
+
+* Mikrotik
+
+  - DISC Lite5 ac (RBDiscG-5acD)
+  - hAP ac2
+  - SXTsq 5 ac (RBSXTsqG-5acD)
+
+ipq806x-generic
+---------------
+
+* NETGEAR
+
+  - R7800
+
+* Ubiquiti
+
+  - UniFi AC HD
+
+lantiq-xrx200
+-------------
+
+* Arcadyan
+
+  - VGV7510KW22 (o2 Box 6431)
+
+* AVM
+
+  - FRITZ!Box 7360 (v1, v2) [#avmflash]_ [#lan_as_wan]_
+  - FRITZ!Box 7360 SL [#avmflash]_ [#lan_as_wan]_
+  - FRITZ!Box 7362 SL [#eva_ramboot]_ [#lan_as_wan]_
+  - FRITZ!Box 7412 [#eva_ramboot]_
+  - FRITZ!Box 7430 [#eva_ramboot]_
+
+lantiq-xrx200_legacy
+--------------------
+
+* TP-Link
+
+  - TD-W8970 (v1) [#lan_as_wan]_
+
+lantiq-xway
+-----------
+
+* AVM
+
+  - FRITZ!Box 7312 [#avmflash]_
+
+* NETGEAR
+
+  - DGN3500B [#lan_as_wan]_
+
+mediatek-filogic
+----------------
+
+* ASUS
+
+  - RT-AX52
+  - TUF AX4200
+  - TUF AX6000
+
+* Cudy
+
+  - AP3000 Outdoor (v1)
+  - TR3000 (v1)
+  - WR3000 (v1)
+
+* D-Link
+
+  - AQUILA PRO AI M30 A1
+  - AQUILA PRO AI M60 A1
+
+* GL.iNet
+
+  - GL-MT2500
+  - GL-MT3000
+
+* NETGEAR
+
+  - WAX220
+
+* OpenWrt
+
+  - One
+
+* Ubiquiti
+
+  - UniFi 6 Plus
+
+* Wavlink
+
+  - WL-WN573HX3 [#lan_as_wan]_
+
+* Xiaomi
+
+  - Mi Router AX3000T
+
+* Zyxel
+
+  - NWA50AX Pro
+
+mediatek-mt7622
+---------------
+
+* Linksys
+
+  - E8450
+
+* Ubiquiti
+
+  - UniFi 6 LR (v1)
+
+mpc85xx-p1010
+-------------
+
+* Enterasys
+
+  - WS-AP3715i
+
+* Sophos
+
+  - RED 15w Rev.1
+
+* TP-Link
+
+  - TL-WDR4900 (v1)
+
+mpc85xx-p1020
+---------------
+
+* Aerohive
+
+  - HiveAP 330
+
+* Enterasys
+
+  - WS-AP3710i
+
+* Extreme Networks
+
+  - WS-AP3825i
+
+* Hewlett-Packard
+
+  - MSM460
+
+* Ocedo
+
+  - Panda
+
+ramips-mt7620
+-------------
+
+* ASUS
+
+  - RT-AC51U
+
+* GL.iNet
+
+  - GL-MT300A
+  - GL-MT300N
+  - GL-MT750
+
+* NETGEAR
+
+  - EX3700
+  - EX3800
+  - EX6130
+
+* Nexx
+
+  - WT3020AD/F/H
+
+* TP-Link
+
+  - Archer C2 (v1)
+  - Archer C20 (v1)
+  - Archer C20i
+  - Archer C50 (v1)
+
+* Xiaomi
+
+  - MiWiFi Mini
+
+ramips-mt7621
+-------------
+
+* ASUS
+
+  - RT-AC57U (v1)
+  - RT-AX53U
+
+* Cudy
+
+  - WR1300 (v1)
+  - WR2100
+  - X6 (v1, v2)
+
+* D-Link
+
+  - COVR-X1860 (A1)
+  - DAP-X1860 (A1)
+  - DIR-860L (B1)
+  - DIR-878 (A1)
+  - DIR-882 (A1)
+
+* Genexis
+
+  - Pulse EX400
+
+* GL.iNet
+
+  - GL-MT1300
+
+* MERCUSYS
+
+  - MR70X (v1)
+
+* NETGEAR
+
+  - EX6150 (v1)
+  - R6220
+  - R6260
+  - WAC104
+  - WAX202
+
+* TP-Link
+
+  - EAX11 (v2)
+  - EAX12
+  - EAX15 (v2)
+  - EAP615-Wall (v1)
+  - RE500 (v1)
+  - RE650 (v1)
+
+* Ubiquiti
+
+  - EdgeRouter X
+  - EdgeRouter X-SFP
+  - UniFi 6 Lite
+  - UniFi nanoHD
+
+* Wavlink
+
+  - WS-WN572HP3 (4G)
+
+* Xiaomi
+
+  - Xiaomi Mi Router 3G (v1, v2)
+  - Xiaomi Mi Router 4A (Gigabit Edition v1, v2)
+
+* Zbtlink
+
+  - WG3526-16M
+  - WG3526-32M
+
+* Zyxel
+
+  - NWA50AX
+  - WSM20
+
+ramips-mt76x8
+-------------
+
+* Cudy
+
+  - TR1200 (v1)
+  - WR1000 (v1)
+
+* GL.iNet
+
+  - GL-MT300N (v2)
+  - microuter-N300
+  - VIXMINI
+
+* NETGEAR
+
+  - R6020
+  - R6120
+
+* RAVPower
+
+  - RP-WD009
+
+* TP-Link
+
+  - Archer C20 (v4, v5)
+  - Archer C50 (v3, v4)
+  - RE200 (v2, v3, v4)
+  - TL-MR3020 (v3)
+  - TL-MR3420 (v5)
+  - TL-MR6400 (v5)
+  - TL-WA801ND (v5)
+  - TL-WR841N (v13)
+  - TL-WR902AC (v3, v4)
+
+* VoCore
+
+  - VoCore2
+
+* Xiaomi
+
+  - Xiaomi Mi Router 4A (100M Edition) - MIR4A
+  - Xiaomi Mi Router 4A (100M International Edition) - R4AC
+  - Xiaomi Mi Router 4A (100M International Edition v2) - R4ACv2
+  - Xiaomi Mi Router 4C - R4CM
+
+rockchip-armv8
+--------------
+
+* FriendlyElec
+
+  - NanoPi R2S
+  - NanoPi R3S
+  - NanoPi R4S (4GB LPDDR4)
+
+sunxi-cortexa7
+--------------
+
+* LeMaker
+
+  - Banana Pi M1
+
+x86-generic
+-----------
+
+* x86-generic
+* x86-virtualbox
+* x86-vmware
+
+See also: :doc:`x86`
+
+x86-geode
+---------
+
+* x86-geode
+
+See also: :doc:`x86`
+
+x86-64
+------
+
+* x86-64-generic
+* x86-64-virtualbox
+* x86-64-vmware
+
+See also: :doc:`x86`
+
+Footnotes
+---------
+
+.. [#avmflash]
+  For instructions on how to flash AVM devices, visit https://fritz-tools.readthedocs.io
+
+.. [#eva_ramboot]
+  For instructions on how to flash AVM NAND devices, see the respective
+  commit which added support in OpenWrt.
+
+.. [#lan_as_wan]
+  All LAN ports on this device are used as WAN.
+
+.. [#missing_radios]
+  This device contains more than two WLAN radios, which is currently
+  unsupported by Gluon. Only the first two radios will work.
+
+.. [#modular_ethernet]
+  These devices follow a modular principle,
+  which means even basic functionality like ethernet is provided by an expansion-board,
+  that may not be bundled with the device itself.
+  Such expansions are recommended for the config mode, but are not strictly necessary,
+  as exposed serial ports may grant sufficient access as well.

docs/user/x86.rst

@@ -9,28 +9,26 @@ Targets
 
 The following targets for x86 images exist:
 
-`x86-generic`
-    Generic x86 support with many different ethernet drivers; should run on
-    most x86 systems.
+`x86-64`
+    Generic x86 64-bit support with many different ethernet drivers; should run on
+    most x86 systems with 64-bit support.
 
     There are three images:
 
-    * `generic` (compressed "raw" image, can written to a disk directly or booted with qemu)
+    * `generic` (compressed "raw" image, can be written to a disk directly or booted with qemu)
     * `virtualbox` (VDI image)
     * `vmware` (VMDK image)
 
-    These images only differ in the image file format, the content is the same. Therefore there is
-    only a single `x86-generic` sysupgrade image instead of three.
+    These images differ in the image file format, the content is the same. Therefore
+    a single `x86-64` sysupgrade image is provided, only.
 
-    Please note that the `x86-generic` image doesn't include VirtIO support, so another virtual NIC
-    like `pcnet32` must be chosen when using VirtualBox.
+`x86-generic`
+    32-bit version of `x86-64` for hardware not supporting 64-bit images.
+    Also comes with `virtualbox` and `vmware` factory installs.
 
-`x86-kvm`
-    The `x86-kvm` image uses VirtIO as its harddisk and network driver.
+`x86-geode`
+    x86 image for Geode CPUs.
 
-`x86-xen_domu`
-    The `x86-xen_domu` target contains the necessary drivers for use in Xen.
+`x86-legacy`
+    x86 image for very old PC hardware like i586.
 
-`x86-64`
-    64bit version of `x86-generic`. Also has VirtIO support, so there's no need for an
-    `x86-64-kvm` target.

modules

-GLUON_FEEDS='openwrt gluon routing luci'
+GLUON_FEEDS='gluon packages routing'
 
-LEDE_REPO=git://git.lede-project.org/source.git
-LEDE_COMMIT=b9a408c2b49ccfa0e906bda00ef77f4002e401fd
+OPENWRT_REPO=https://github.com/openwrt/openwrt.git
+OPENWRT_BRANCH=openwrt-24.10
+OPENWRT_COMMIT=150f181700395e5a26bb11ff7eb7da0b7118f0b0
 
-PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=ee211f94ec292f7ec3d563fcbc147359b6cf8290
+PACKAGES_GLUON_REPO=https://github.com/freifunk-gluon/packages.git
+PACKAGES_GLUON_COMMIT=bae34a0f53b25dbd691c57c8ab2d0b7cfe811517
 
-PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=ef405e224082c26807fe24c02da9b02135fa46d0
+PACKAGES_PACKAGES_REPO=https://github.com/openwrt/packages.git
+PACKAGES_PACKAGES_BRANCH=openwrt-24.10
+PACKAGES_PACKAGES_COMMIT=22b53941581c81e40403b6e0a20fd22e956d242d
 
-PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
-PACKAGES_ROUTING_COMMIT=d848d49d2443448b147c564c2dd8f64433b5fb9c
-
-PACKAGES_LUCI_REPO=git://github.com/openwrt/luci.git
-PACKAGES_LUCI_COMMIT=d7328360632d7fbf5fd4006b4172a9fe9861d838
+PACKAGES_ROUTING_REPO=https://github.com/openwrt/routing.git
+PACKAGES_ROUTING_BRANCH=openwrt-24.10
+PACKAGES_ROUTING_COMMIT=85d040f28c21c116c905aa15a66255dde80336e7

overlay/opkg.mk

-FEEDS_ENABLED := $(FEEDS_DISABLED)
-FEEDS_DISABLED :=

package/features

+-- Feature definition file
+--
+-- See the page `dev/packages` (Developer Documentation / Package development)
+-- in the `docs` directory or on gluon.readthedocs.io for information on the
+-- file format
+
+
+feature('web-wizard', {
+	'gluon-config-mode-hostname',
+	'gluon-config-mode-geo-location',
+	'gluon-config-mode-contact-info',
+	'gluon-config-mode-outdoor',
+})
+
+when(_'web-wizard' and _'autoupdater', {
+	'gluon-config-mode-autoupdater',
+})
+
+when(_'web-wizard' and (
+	_'mesh-vpn-fastd' or
+	_'mesh-vpn-fastd-l2tp' or
+	_'mesh-vpn-wireguard'
+), {
+	'gluon-config-mode-mesh-vpn',
+})
+
+
+feature('web-advanced', {
+	'gluon-web-admin',
+	'gluon-web-network',
+	'gluon-web-wifi-config',
+})
+
+when(_'web-advanced' and _'autoupdater', {
+	'gluon-web-autoupdater',
+})
+
+
+when(_'mesh-batman-adv-15', {
+	'gluon-ebtables-limit-arp',
+	'gluon-radvd',
+})
+
+when(_'status-page' and _'mesh-batman-adv-15', {
+	'gluon-status-page-mesh-batman-adv',
+})
+
+
+when(_'mesh-olsrd', {
+	'gluon-radvd',
+})
+
+
+when(not _'wireless-encryption-wpa3', {
+	'hostapd-mini',
+})

package/gluon-alfred/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-alfred
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include ../gluon.mk
 
-
 define Package/gluon-alfred
-  SECTION:=gluon
-  CATEGORY:=Gluon
   DEPENDS:=+gluon-core +gluon-respondd +gluon-neighbour-info gluon-mesh-batman-adv +micrond +alfred
   TITLE:=Configure alfred
 endef
 
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-alfred/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-$(eval $(call BuildPackage,gluon-alfred))
+$(eval $(call BuildPackageGluon,gluon-alfred))

package/gluon-alfred/files/lib/gluon/reload.d/301-alfred-stop

+#!/bin/sh
+/etc/init.d/alfred stop

package/gluon-alfred/files/lib/gluon/reload.d/799-alfred-start

+#!/bin/sh
+/etc/init.d/alfred start

package/gluon-alfred/files/usr/lib/autoupdater/abort.d/60gluon-alfred

 #!/bin/sh
 
+# shellcheck source=package/gluon-autoupdater/files/lib/gluon/autoupdater/lib.sh
 . /lib/gluon/autoupdater/lib.sh
 
-
 start_enabled alfred

package/gluon-alfred/files/usr/lib/autoupdater/download.d/40gluon-alfred

 #!/bin/sh
 
+# shellcheck source=package/gluon-autoupdater/files/lib/gluon/autoupdater/lib.sh
 . /lib/gluon/autoupdater/lib.sh
 
-
 stop alfred

package/gluon-alfred/luasrc/lib/gluon/upgrade/400-alfred-firewall

+#!/usr/bin/lua
+
+local uci = require('simple-uci').cursor()
+
+uci:section('firewall', 'rule',  'mesh_respondd', {
+	name = 'mesh_respondd',
+	src = 'mesh',
+	src_ip = 'fe80::/64',
+	dest_port = '16962',
+	proto = 'udp',
+	target = 'ACCEPT',
+})
+
+uci:save('firewall')

package/gluon-alfred/luasrc/lib/gluon/upgrade/500-enable-alfred

 #!/usr/bin/lua
 
-local uci = require 'luci.model.uci'
-local c = uci.cursor()
+local uci = require('simple-uci').cursor()
 
-
-c:delete('alfred', 'alfred')
-c:section('alfred', 'alfred', 'alfred',
-	  {
-		  interface = 'local-node',
+uci:delete('alfred', 'alfred')
+uci:section('alfred', 'alfred', 'alfred', {
+	interface = 'br-client',
 	mode = 'slave',
 	batmanif = 'bat0',
-		  start_vis = '1',
-		  run_facters = '0',
-	  }
-)
+	start_vis = true,
+	run_facters = false,
+})
 
-c:save('alfred')
+uci:save('alfred')

package/gluon-authorized-keys/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-authorized-keys
-PKG_VERSION:=2
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include ../gluon.mk
 
-
 define Package/gluon-authorized-keys
-  SECTION:=gluon
-  CATEGORY:=Gluon
   TITLE:=Fill /etc/dropbear/authorized_keys from site.conf
-  DEPENDS:=+gluon-core
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-endef
-
-define Build/Configure
-endef
-
-define Build/Compile
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
-endef
-
-define Package/gluon-authorized-keys/install
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-endef
-
-define Package/gluon-authorized-keys/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
+  DEPENDS:=+gluon-core +gluon-lock-password
 endef
 
-$(eval $(call BuildPackage,gluon-authorized-keys))
+$(eval $(call BuildPackageGluon,gluon-authorized-keys))

package/gluon-authorized-keys/check_site.lua

-need_string_array 'authorized_keys'
+need_string_array(in_site({'authorized_keys'}))

package/gluon-authorized-keys/luasrc/lib/gluon/upgrade/100-authorized-keys

 #!/usr/bin/lua
 
-local site = require 'gluon.site_config'
+local site = require 'gluon.site'
 local file = '/etc/dropbear/authorized_keys'
 
 local keys = {}
 
-function load_keys()
+local function load_keys()
 	for line in io.lines(file) do
 		keys[line] = true
 	end
@@ -14,7 +14,7 @@ end
 pcall(load_keys)
 
 local f = io.open(file, 'a')
-for _, key in ipairs(site.authorized_keys) do
+for _, key in ipairs(site.authorized_keys()) do
 	if not keys[key] then
 		f:write(key .. '\n')
 	end

package/gluon-autoupdater/Config.in

+if PACKAGE_gluon-autoupdater
+
+config GLUON_AUTOUPDATER_BRANCH
+	string "Autoupdater branch"
+	default ""
+
+config GLUON_AUTOUPDATER_ENABLED
+	bool "Enable autoupdater by default"
+
+endif

package/gluon-autoupdater/Makefile

 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gluon-autoupdater
-PKG_VERSION:=4
-
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-
-PKG_CONFIG_DEPENDS := CONFIG_GLUON_BRANCH
-PKG_BUILD_DEPENDS := respondd
 
+PKG_CONFIG_DEPENDS := CONFIG_GLUON_AUTOUPDATER_BRANCH CONFIG_GLUON_AUTOUPDATER_ENABLED
 
 include ../gluon.mk
 
-
 define Package/gluon-autoupdater
-  SECTION:=gluon
-  CATEGORY:=Gluon
   DEPENDS:=+gluon-core +libgluonutil +micrond +autoupdater
   TITLE:=Automatically update firmware
 endef
 
 define Package/gluon-autoupdater/config
-config GLUON_BRANCH
-	string "Gluon autoupdater branch"
-	depends on PACKAGE_gluon-autoupdater
-	default ""
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-	$(call Build/Compile/Default)
-	$(call GluonSrcDiet,./luasrc,$(PKG_BUILD_DIR)/luadest/)
+	source "$(SOURCE)/Config.in"
 endef
 
 define Package/gluon-autoupdater/install
-	$(CP) ./files/* $(1)/
-	$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
-
-	$(INSTALL_DIR) $(1)/lib/gluon/respondd
-	$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/autoupdater.so
+	$(Gluon/Build/Install)
 
-ifneq ($(CONFIG_GLUON_BRANCH),"")
 	$(INSTALL_DIR) $(1)/lib/gluon/autoupdater
-	echo '$(call qstrip,$(CONFIG_GLUON_BRANCH))' > $(1)/lib/gluon/autoupdater/default_branch
+  ifneq ($(CONFIG_GLUON_AUTOUPDATER_BRANCH),"")
+	echo '$(call qstrip,$(CONFIG_GLUON_AUTOUPDATER_BRANCH))' > $(1)/lib/gluon/autoupdater/default_branch
+  endif
+  ifneq ($(CONFIG_GLUON_AUTOUPDATER_ENABLED),)
+	touch $(1)/lib/gluon/autoupdater/default_enabled
   endif
 endef
 
-define Package/gluon-autoupdater/postinst
-#!/bin/sh
-$(call GluonCheckSite,check_site.lua)
-endef
-
-$(eval $(call BuildPackage,gluon-autoupdater))
+$(eval $(call BuildPackageGluon,gluon-autoupdater))

package/gluon-autoupdater/check_site.lua

-need_string 'autoupdater.branch'
+local has_tls = (function()
+	local f = io.open((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/features/tls')
+	if f then
+		f:close()
+		return true
+	end
+	return false
+end)()
 
-local function check_branch(k, _)
-   assert_uci_name(k)
+local branches = table_keys(need_table({'autoupdater', 'branches'}, function(branch)
+	need_alphanumeric_key(branch)
 
-   local prefix = string.format('autoupdater.branches[%q].', k)
+	need_string(in_site(extend(branch, {'name'})))
+	need_array(extend(branch, {'mirrors'}), function(mirror)
+		alternatives(function()
+			need_string_match(mirror, 'http://')
+		end, function()
+			need_string_match(mirror, 'https://')
+			need(mirror, function() return has_tls end, nil,
+				"use HTTPS only if the 'tls' feature is enabled")
+		end, function()
+			need_string_match(mirror, '^//')
+		end)
+	end)
 
-   need_string(prefix .. 'name')
-   need_string_array(prefix .. 'mirrors')
-   need_number(prefix .. 'good_signatures')
-   need_string_array(prefix .. 'pubkeys')
-end
+	local pubkeys = need_string_array_match(in_site(extend(branch, {'pubkeys'})), '^%x+$')
+	need_number(in_site(extend(branch, {'good_signatures'})))
+	need(in_site(extend(branch, {'good_signatures'})), function(good_signatures)
+		return good_signatures <= #pubkeys
+	end, nil, string.format('be less than or equal to the number of public keys (%d)', #pubkeys))
+
+	obsolete(extend(branch, {'probability'}), 'Use GLUON_PRIORITY in site.mk instead.')
+end))
 
-need_table('autoupdater.branches', check_branch)
+need_one_of(in_site({'autoupdater', 'branch'}), branches, false)
+
+-- Check GLUON_AUTOUPDATER_BRANCH
+local default_branch
+local f = io.open((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/autoupdater/default_branch')
+if f then
+	default_branch = f:read('*line')
+	f:close()
+end
+need_one_of(value('GLUON_AUTOUPDATER_BRANCH', default_branch), branches, false)

package/gluon-autoupdater/files/usr/lib/autoupdater/abort.d/90gluon-autoupdater

 #!/bin/sh
 
+# shellcheck source=package/gluon-autoupdater/files/lib/gluon/autoupdater/lib.sh
 . /lib/gluon/autoupdater/lib.sh
 
 
 start_enabled cron
-start_enabled haveged
+start_enabled urngd
 start_enabled micrond
 start_enabled sysntpd