diff --git a/Makefile b/Makefile
index 109e10ea..f85b8d8c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GLUON_BUILD_DIR := gluon-build
-GLUON_GIT_URL := https://github.com/freifunk-gluon/gluon.git
-GLUON_GIT_REF := dc841ea4a37b4e74777e07617042bc92aad2483b # master at 2023-12-13
+GLUON_GIT_URL := https://github.com/blocktrron/gluon.git
+GLUON_GIT_REF := 3bf54a712ccd68eaf242baf02466f0ac5050f255
 
 PATCH_DIR := ./patches
 SECRET_KEY_FILE ?= ${HOME}/.gluon-secret-key
diff --git a/contrib/genpkglist.py b/contrib/genpkglist.py
deleted file mode 100755
index dcbb4a5a..00000000
--- a/contrib/genpkglist.py
+++ /dev/null
@@ -1,299 +0,0 @@
-#!/usr/bin/env python3
-import os
-from collections import defaultdict
-
-from jinja2 import Template
-
-# path to your gluon checkout, will be used to find targets and devices
-GLUON_DIR = './gluon-build/'
-
-
-class PackageList:
-    def __init__(self, name: str, pkgs: list):
-        self.name = name
-        self.pkgs = pkgs
-
-    def __repr__(self):
-        return self.name
-
-    def __lt__(self, other):
-        return self.name < other.name
-
-    def render(self):
-        return Template("""
-INCLUDE_{{ name }} := \\
-{%- for pkg in pkgs %}
-    {{ pkg }}{% if not loop.last %} \\{% endif %}
-{%- endfor %}
-
-EXCLUDE_{{ name }} := \\
-{%- for pkg in pkgs %}
-    -{{ pkg }}{% if not loop.last %} \\{% endif %}
-{%- endfor %}""").render(
-            name=self.name,
-            pkgs=self.pkgs
-        )
-
-
-class Target:
-    def __init__(self, name):
-        self.name = name
-        self.devices = set()
-        self.pkglists = set()
-        self.excludes = defaultdict(set)
-        self.includes = defaultdict(set)
-
-    def add_device(self, device: str):
-        self.devices.add(device)
-
-    def add_pkglist(self, pkglist: PackageList):
-        self.pkglists.add(pkglist)
-        return self
-
-    def include(self, devices: [str], pkglists: [PackageList]=None):
-        for device in devices:
-            assert(device in self.devices), "Device %s not in target %s" % (device, self.name)
-            if not pkglists:
-                self.includes[device] = self.pkglists
-            else:
-                self.includes[device] = self.includes[device].union(pkglists)
-
-        return self
-
-    def exclude(self, devices: [str], pkglists: [PackageList]=None):
-        for device in devices:
-            assert(device in self.devices), "Device %s not in target %s" % (device, self.name)
-            if not pkglists:
-                self.excludes[device] = self.pkglists
-            else:
-                self.excludes[device] = self.excludes[device].union(pkglists)
-
-        return self
-
-    def render(self):
-        if not bool(self.includes) and not self.pkglists:
-            return """
-# no pkglists for target %s
-""" % self.name
-
-        return Template("""
-ifeq ($(GLUON_TARGET),{{ target }})
-    GLUON_SITE_PACKAGES += {% for pkglist in pkglists %}$(INCLUDE_{{ pkglist.name }}){% if not loop.last %} {% endif %}{% endfor %}
-{% for device, include in includes.items() %}
-    GLUON_{{ device }}_SITE_PACKAGES += {% for pkglist in include|sort %}$(INCLUDE_{{ pkglist.name }}){% if not loop.last %} {% endif %}{% endfor %}
-{%- endfor %}{% for device, exclude in excludes.items() %}
-    GLUON_{{ device }}_SITE_PACKAGES += {% for pkglist in exclude|sort %}$(EXCLUDE_{{ pkglist.name }}){% if not loop.last %} {% endif %}{% endfor %}
-{%- endfor %}
-endif""").render(
-            target=self.name,
-            pkglists=sorted(self.pkglists),
-            excludes=self.excludes,
-            includes=self.includes
-        )
-
-
-targets = {}
-targetdir = os.path.join(GLUON_DIR, 'targets')
-for targetfile in os.listdir(targetdir):
-    if targetfile in ['generic', 'targets.mk'] or targetfile.endswith('.inc'):
-        continue
-
-    target = Target(targetfile)
-    with open(os.path.join(targetdir, targetfile)) as handle:
-        for line in handle.readlines():
-            if line.startswith('device'):
-                target.add_device(line.split('\'')[1])
-
-    targets[targetfile] = target
-
-
-#
-# package definitions
-#
-
-pkglists = []
-
-PKGS_USB = PackageList('USB', ['usbutils'])
-pkglists.append(PKGS_USB)
-
-PKGS_USB_HID = PackageList('USB_HID', [
-    'kmod-usb-hid',
-    'kmod-hid-generic'
-])
-pkglists.append(PKGS_USB_HID)
-
-PKGS_USB_SERIAL = PackageList('USB_SERIAL', [
-    'kmod-usb-serial',
-    'kmod-usb-serial-ftdi',
-    'kmod-usb-serial-pl2303'
-])
-pkglists.append(PKGS_USB_SERIAL)
-
-PKGS_USB_STORAGE = PackageList('USB_STORAGE', [
-    'block-mount',
-    'blkid',
-    'kmod-fs-ext4',
-    'kmod-fs-ntfs',
-    'kmod-fs-vfat',
-    'kmod-usb-storage',
-    'kmod-usb-storage-extras',  # Card Readers
-    'kmod-usb-storage-uas',     # USB Attached SCSI (UAS/UASP)
-    'kmod-nls-base',
-    'kmod-nls-cp1250',          # NLS Codepage 1250 (Eastern Europe)
-    'kmod-nls-cp437',           # NLS Codepage 437 (United States, Canada)
-    'kmod-nls-cp850',           # NLS Codepage 850 (Europe)
-    'kmod-nls-cp852',           # NLS Codepage 852 (Europe)
-    'kmod-nls-iso8859-1',       # NLS ISO 8859-1 (Latin 1)
-    'kmod-nls-iso8859-13',      # NLS ISO 8859-13 (Latin 7; Baltic)
-    'kmod-nls-iso8859-15',      # NLS ISO 8859-15 (Latin 9)
-    'kmod-nls-iso8859-2',       # NLS ISO 8859-2 (Latin 2)
-    'kmod-nls-utf8'             # NLS UTF-8
-])
-pkglists.append(PKGS_USB_STORAGE)
-
-PKGS_USB_NET = PackageList('USB_NET', [
-    'kmod-mii',
-    'kmod-usb-net',
-    'kmod-usb-net-asix',
-    'kmod-usb-net-asix-ax88179',
-    'kmod-usb-net-cdc-eem',
-    'kmod-usb-net-cdc-ether',
-    'kmod-usb-net-cdc-subset',
-    'kmod-usb-net-dm9601-ether',
-    'kmod-usb-net-hso',
-    'kmod-usb-net-ipheth',
-    'kmod-usb-net-mcs7830',
-    'kmod-usb-net-pegasus',
-    'kmod-usb-net-rndis',
-    'kmod-usb-net-rtl8152',
-    'kmod-usb-net-smsc95xx'
-])
-pkglists.append(PKGS_USB_NET)
-
-PKGS_PCI = PackageList('PCI', ['pciutils'])
-pkglists.append(PKGS_PCI)
-
-PKGS_PCI_NET = PackageList('PCI_NET', [
-    'kmod-bnx2'  # Broadcom NetExtreme BCM5706/5708/5709/5716
-])
-pkglists.append(PKGS_PCI_NET)
-
-PKGS_TLS = PackageList('TLS', [
-    'ca-bundle',
-    'libustream-mbedtls'
-])
-pkglists.append(PKGS_TLS)
-
-#
-# package assignment
-#
-
-targets.get('ath79-generic'). \
-    add_pkglist(PKGS_TLS). \
-    include([ # 7M usable firmware space + USB port
-        'devolo-wifi-pro-1750e',
-        'gl.inet-gl-ar150',
-        'gl.inet-gl-ar300m-lite',
-        'gl.inet-gl-ar750',
-        'joy-it-jt-or750i',
-        'netgear-wndr3700-v2',
-        'tp-link-archer-a7-v5',
-        'tp-link-archer-c5-v1',
-        'tp-link-archer-c7-v2',
-        'tp-link-archer-c7-v5',
-        'tp-link-archer-c59-v1',
-        'tp-link-tl-wr842n-v3',
-        'tp-link-tl-wr1043nd-v4'
-    ], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \
-    exclude([
-        'd-link-dir825b1',
-    ], pkglists=[PKGS_TLS])
-
-for target in ['ath79-nand', 'ipq40xx-generic', 'ipq806x-generic', 'lantiq-xway', 'mpc85xx-p1010', 'mpc85xx-p1020', 'mvebu-cortexa9', 'rockchip-armv8', 'sunxi-cortexa7']:
-    targets.get(target). \
-        add_pkglist(PKGS_USB). \
-        add_pkglist(PKGS_USB_NET). \
-        add_pkglist(PKGS_USB_SERIAL). \
-        add_pkglist(PKGS_USB_STORAGE). \
-        add_pkglist(PKGS_TLS)
-
-targets.get('lantiq-xrx200'). \
-        add_pkglist(PKGS_USB). \
-        add_pkglist(PKGS_USB_NET). \
-        add_pkglist(PKGS_USB_SERIAL). \
-        add_pkglist(PKGS_USB_STORAGE). \
-        add_pkglist(PKGS_TLS). \
-        exclude([ # 7M usable firmware space + USB port
-            'avm-fritz-box-7412',
-            'tp-link-td-w8970',
-            'tp-link-td-w8980'
-        ], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE])
-
-targets.get('mpc85xx-p1020').add_pkglist(PKGS_TLS)
-
-for target in ['bcm27xx-bcm2708', 'bcm27xx-bcm2709', 'bcm27xx-bcm2710', 'bcm27xx-bcm2711']:
-    targets.get(target). \
-        add_pkglist(PKGS_USB). \
-        add_pkglist(PKGS_USB_NET). \
-        add_pkglist(PKGS_USB_SERIAL). \
-        add_pkglist(PKGS_USB_STORAGE). \
-        add_pkglist(PKGS_USB_HID). \
-        add_pkglist(PKGS_TLS)
-
-targets.get('mediatek-mt7622'). \
-    add_pkglist(PKGS_USB). \
-    add_pkglist(PKGS_USB_NET). \
-    add_pkglist(PKGS_USB_SERIAL). \
-    add_pkglist(PKGS_USB_STORAGE). \
-    add_pkglist(PKGS_TLS). \
-    exclude([  # devices without usb ports
-        'ubiquiti-unifi-6-lr-v1'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE])
-
-targets.get('ramips-mt7621'). \
-    add_pkglist(PKGS_USB). \
-    add_pkglist(PKGS_USB_NET). \
-    add_pkglist(PKGS_USB_SERIAL). \
-    add_pkglist(PKGS_USB_STORAGE). \
-    add_pkglist(PKGS_TLS). \
-    exclude([  # devices without usb ports
-        'netgear-ex6150',
-        'ubiquiti-edgerouter-x',
-        'ubiquiti-edgerouter-x-sfp'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE])
-
-targets.get('ramips-mt7620'). \
-	add_pkglist(PKGS_USB). \
-	add_pkglist(PKGS_USB_NET). \
-	add_pkglist(PKGS_USB_SERIAL). \
-	add_pkglist(PKGS_USB_STORAGE). \
-	add_pkglist(PKGS_TLS). \
-	exclude([  # devices without usb ports
-		'netgear-ex3700'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE])
-
-targets.get('ramips-mt76x8'). \
-    add_pkglist(PKGS_TLS). \
-    include([ # 7M usable firmware space + USB port
-        'gl-mt300n-v2',
-        'gl.inet-microuter-n300',
-        'netgear-r6120',
-        'ravpower-rp-wd009'], pkglists=[PKGS_USB, PKGS_USB_NET, PKGS_USB_SERIAL, PKGS_USB_STORAGE]). \
-    exclude([
-    ], pkglists=[PKGS_TLS])
-
-for target in ['x86-64', 'x86-generic', 'x86-geode']:
-    targets.get(target). \
-        add_pkglist(PKGS_USB). \
-        add_pkglist(PKGS_USB_NET). \
-        add_pkglist(PKGS_USB_SERIAL). \
-        add_pkglist(PKGS_USB_STORAGE). \
-        add_pkglist(PKGS_PCI). \
-        add_pkglist(PKGS_PCI_NET). \
-        add_pkglist(PKGS_TLS)
-
-targets.get('x86-legacy').add_pkglist(PKGS_TLS)
-
-if __name__ == '__main__':
-    for pkglist in pkglists:
-        print(pkglist.render())
-
-    for target in sorted(targets.values(), key=lambda x: x.name):
-        print(target.render())
diff --git a/image-customization.lua b/image-customization.lua
new file mode 100644
index 00000000..ee6a6b4c
--- /dev/null
+++ b/image-customization.lua
@@ -0,0 +1,208 @@
+#!/usr/bin/lua
+
+features{
+    'autoupdater',
+    'config-mode-domain-select',
+    'config-mode-geo-location-osm',
+    'config-mode-mesh-vpn',
+    'ebtables-filter-multicast',
+    'ebtables-filter-ra-dhcp',
+    'ebtables-source-filter',
+    'mesh-batman-adv-15',
+    'respondd',
+    'status-page',
+    'web-advanced',
+    'web-private-wifi',
+    'web-wizard',
+}
+
+packages{
+    'ffac-autoupdater-wifi-fallback',
+    'ffac-change-autoupdater',
+    'ffac-ssid-changer',
+    'ffho-ap-timer',
+    'ffho-web-ap-timer',
+    'ffmuc-ipv6-ra-filter',
+    'ffmuc-mesh-vpn-wireguard-vxlan',
+    'iwinfo',
+    'respondd-module-airtime',
+}
+
+if not device_class('tiny') then
+    features{
+        'wireless-encryption-wpa3',
+        'web-cellular'-- TODO: move to devices that actually can work with it
+    }
+end
+
+
+pkgs_usb = {
+    'usbutils'
+}
+
+pkgs_hid = {
+    'kmod-usb-hid',
+    'kmod-hid-generic'
+}
+
+pkgs_usb_serial = {
+    'kmod-usb-serial',
+    'kmod-usb-serial-ftdi',
+    'kmod-usb-serial-pl2303'
+}
+
+pkgs_usb_storage = {
+    'block-mount',
+    'blkid',
+    'kmod-fs-ext4',
+    'kmod-fs-ntfs',
+    'kmod-fs-vfat',
+    'kmod-usb-storage',
+    'kmod-usb-storage-extras',-- Card Readers
+    'kmod-usb-storage-uas',-- USB Attached SCSI (UAS/UASP)
+    'kmod-nls-base',
+    'kmod-nls-cp1250',-- NLS Codepage 1250 (Eastern Europe)
+    'kmod-nls-cp437',-- NLS Codepage 437 (United States, Canada)
+    'kmod-nls-cp850',-- NLS Codepage 850 (Europe)
+    'kmod-nls-cp852',-- NLS Codepage 852 (Europe)
+    'kmod-nls-iso8859-1',-- NLS ISO 8859-1 (Latin 1)
+    'kmod-nls-iso8859-13',-- NLS ISO 8859-13 (Latin 7; Baltic)
+    'kmod-nls-iso8859-15',-- NLS ISO 8859-15 (Latin 9)
+    'kmod-nls-iso8859-2',-- NLS ISO 8859-2 (Latin 2)
+    'kmod-nls-utf8'            -- NLS UTF-8
+}
+
+pkgs_usb_net = {
+    'kmod-mii',
+    'kmod-usb-net',
+    'kmod-usb-net-asix',
+    'kmod-usb-net-asix-ax88179',
+    'kmod-usb-net-cdc-eem',
+    'kmod-usb-net-cdc-ether',
+    'kmod-usb-net-cdc-subset',
+    'kmod-usb-net-dm9601-ether',
+    'kmod-usb-net-hso',
+    'kmod-usb-net-ipheth',
+    'kmod-usb-net-mcs7830',
+    'kmod-usb-net-pegasus',
+    'kmod-usb-net-rndis',
+    'kmod-usb-net-rtl8152',
+    'kmod-usb-net-smsc95xx'
+}
+
+pkgs_pci = {
+    'pciutils',
+    'kmod-bnx2', -- Broadcom NetExtreme BCM5706/5708/5709/5716
+}
+
+pkgs_tls = {
+    'ca-bundle',
+    'libustream-mbedtls',
+    'openssh-sftp-server', -- for OpenSSH 9: https://www.openssh.com/txt/release-9.0
+}
+
+include_tls = not device({
+    'd-link-dir825b1',
+    'tp-link-archer-c58-v1',
+    'tp-link-archer-c25-v1',
+    'tp-link-archer-c2-v3',
+    'tp-link-archer-c6-v2-eu-ru-jp',
+    'tp-link-archer-d50-v1',
+    'tp-link-cpe210-v1',
+    'tp-link-cpe210-v2',
+    'tp-link-cpe210-v3',
+    'tp-link-cpe220-v3',
+    'tp-link-cpe510-v1',
+    'tp-link-cpe510-v2',
+    'tp-link-cpe510-v3',
+    'tp-link-tl-wr902ac-v1',
+    'tp-link-wbs210-v1',
+    'tp-link-wbs210-v2',
+    'tp-link-wbs510-v1',
+    'ubiquiti-nanostation-m-xw',
+    'ubiquiti-nanobeam-m5-xw',
+    'ubiquiti-nanostation-loco-m-xw',
+    'ubiquiti-unifi-ap',
+    'netgear-ex3700',
+    'nexx-wt3020-8m',
+    'tp-link-archer-c2-v1',
+    'tp-link-archer-c20-v1',
+    'tp-link-archer-c20i',
+    'tp-link-archer-c50-v1',
+    'netgear-r6020'
+})
+
+if include_tls then
+    packages(pkgs_tls)
+end
+
+include_usb = true
+
+-- 7M usable firmware space + USB port
+if target('ath79', 'generic') and not device({
+    'devolo-wifi-pro-1750e',
+    'gl.inet-gl-ar150',
+    'gl.inet-gl-ar300m-lite',
+    'gl.inet-gl-ar750',
+    'joy-it-jt-or750i',
+    'netgear-wndr3700-v2',
+    'tp-link-archer-a7-v5',
+    'tp-link-archer-c5-v1',
+    'tp-link-archer-c7-v2',
+    'tp-link-archer-c7-v5',
+    'tp-link-archer-c59-v1',
+    'tp-link-tl-wr842n-v3',
+    'tp-link-tl-wr1043nd-v4',
+    'tp-link-tl-wr1043n-v5'
+}) then
+    include_usb = false
+end
+
+if target('ramips', 'mt76x8') and not device({
+    'gl-mt300n-v2',
+    'gl.inet-microuter-n300',
+    'netgear-r6120',
+    'ravpower-rp-wd009'
+}) then
+    include_usb = false
+end
+
+if device({
+    'avm-fritz-box-7412',
+    'tp-link-td-w8970',
+    'tp-link-td-w8980',
+    'ubiquiti-unifi-6-lr-v1',
+    'netgear-ex6150',
+    'ubiquiti-edgerouter-x',
+    'ubiquiti-edgerouter-x-sfp',
+    'zyxel-nwa55axe'
+}) then
+    include_usb = false
+end
+
+if include_usb then
+    packages(pkgs_usb)
+    packages(pkgs_usb_net)
+    packages(pkgs_usb_serial)
+    packages(pkgs_usb_storage)
+end
+
+-- device has no reset button and requires a special package to go into setup mode
+-- https://github.com/freifunk-gluon/community-packages/tree/master/ffda-network-setup-mode
+if device({
+    'zyxel-nwa55axe'
+}) then
+    packages {'ffda-network-setup-mode'}
+end
+
+if target('x86', '64') then
+    packages {'qemu-ga'}
+end
+
+if target('x86') and not target('x86', 'legacy') then
+    packages(pkgs_pci)
+end
+
+if target('bcm27xx') then
+    packages(pkgs_hid)
+end
diff --git a/site.mk b/site.mk
index ea59d759..712d1c24 100644
--- a/site.mk
+++ b/site.mk
@@ -1,32 +1,6 @@
 GLUON_MULTIDOMAIN=1
 GLUON_DEPRECATED=upgrade
 
-GLUON_FEATURES := \
-	autoupdater \
-	config-mode-domain-select \
-	config-mode-geo-location-osm \
-	config-mode-mesh-vpn \
-	ebtables-filter-multicast \
-	ebtables-filter-ra-dhcp \
-	ebtables-source-filter \
-	mesh-batman-adv-15 \
-	respondd \
-	status-page \
-	web-advanced \
-	web-private-wifi \
-	web-wizard
-
-GLUON_SITE_PACKAGES := \
-	ffac-autoupdater-wifi-fallback \
-	ffac-change-autoupdater \
-	ffac-ssid-changer \
-	ffho-ap-timer \
-	ffho-web-ap-timer \
-	ffmuc-ipv6-ra-filter \
-	ffmuc-mesh-vpn-wireguard-vxlan \
-	iwinfo \
-	respondd-module-airtime
-
 DEFAULT_GLUON_RELEASE := v2021.6.0~exp$(shell date '+%Y%m%d%H')
 
 # Allow overriding the release number from the command line
@@ -38,276 +12,3 @@ GLUON_REGION ?= eu
 
 # Languages to include
 GLUON_LANGS ?= en de
-
-# Additional package list generated by contrib/genpkglist.py
-
-INCLUDE_USB := \
-    usbutils
-
-EXCLUDE_USB := \
-    -usbutils
-
-INCLUDE_USB_HID := \
-    kmod-usb-hid \
-    kmod-hid-generic
-
-EXCLUDE_USB_HID := \
-    -kmod-usb-hid \
-    -kmod-hid-generic
-
-INCLUDE_USB_SERIAL := \
-    kmod-usb-serial \
-    kmod-usb-serial-ftdi \
-    kmod-usb-serial-pl2303
-
-EXCLUDE_USB_SERIAL := \
-    -kmod-usb-serial \
-    -kmod-usb-serial-ftdi \
-    -kmod-usb-serial-pl2303
-
-INCLUDE_USB_STORAGE := \
-    block-mount \
-    blkid \
-    kmod-fs-ext4 \
-    kmod-fs-ntfs \
-    kmod-fs-vfat \
-    kmod-usb-storage \
-    kmod-usb-storage-extras \
-    kmod-usb-storage-uas \
-    kmod-nls-base \
-    kmod-nls-cp1250 \
-    kmod-nls-cp437 \
-    kmod-nls-cp850 \
-    kmod-nls-cp852 \
-    kmod-nls-iso8859-1 \
-    kmod-nls-iso8859-13 \
-    kmod-nls-iso8859-15 \
-    kmod-nls-iso8859-2 \
-    kmod-nls-utf8
-
-EXCLUDE_USB_STORAGE := \
-    -block-mount \
-    -blkid \
-    -kmod-fs-ext4 \
-    -kmod-fs-ntfs \
-    -kmod-fs-vfat \
-    -kmod-usb-storage \
-    -kmod-usb-storage-extras \
-    -kmod-usb-storage-uas \
-    -kmod-nls-base \
-    -kmod-nls-cp1250 \
-    -kmod-nls-cp437 \
-    -kmod-nls-cp850 \
-    -kmod-nls-cp852 \
-    -kmod-nls-iso8859-1 \
-    -kmod-nls-iso8859-13 \
-    -kmod-nls-iso8859-15 \
-    -kmod-nls-iso8859-2 \
-    -kmod-nls-utf8
-
-INCLUDE_USB_NET := \
-    kmod-mii \
-    kmod-usb-net \
-    kmod-usb-net-asix \
-    kmod-usb-net-asix-ax88179 \
-    kmod-usb-net-cdc-eem \
-    kmod-usb-net-cdc-ether \
-    kmod-usb-net-cdc-subset \
-    kmod-usb-net-dm9601-ether \
-    kmod-usb-net-hso \
-    kmod-usb-net-ipheth \
-    kmod-usb-net-mcs7830 \
-    kmod-usb-net-pegasus \
-    kmod-usb-net-rndis \
-    kmod-usb-net-rtl8152 \
-    kmod-usb-net-smsc95xx
-
-EXCLUDE_USB_NET := \
-    -kmod-mii \
-    -kmod-usb-net \
-    -kmod-usb-net-asix \
-    -kmod-usb-net-asix-ax88179 \
-    -kmod-usb-net-cdc-eem \
-    -kmod-usb-net-cdc-ether \
-    -kmod-usb-net-cdc-subset \
-    -kmod-usb-net-dm9601-ether \
-    -kmod-usb-net-hso \
-    -kmod-usb-net-ipheth \
-    -kmod-usb-net-mcs7830 \
-    -kmod-usb-net-pegasus \
-    -kmod-usb-net-rndis \
-    -kmod-usb-net-rtl8152 \
-    -kmod-usb-net-smsc95xx
-
-INCLUDE_PCI := \
-    pciutils
-
-EXCLUDE_PCI := \
-    -pciutils
-
-INCLUDE_PCI_NET := \
-    kmod-bnx2
-
-EXCLUDE_PCI_NET := \
-    -kmod-bnx2
-
-INCLUDE_TLS := \
-    ca-bundle \
-    libustream-mbedtls
-
-EXCLUDE_TLS := \
-    -ca-bundle \
-    -libustream-mbedtls
-
-ifeq ($(GLUON_TARGET),ath79-generic)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS)
-
-    GLUON_devolo-wifi-pro-1750e_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_gl.inet-gl-ar150_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_gl.inet-gl-ar300m-lite_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_gl.inet-gl-ar750_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_joy-it-jt-or750i_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_netgear-wndr3700-v2_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_tp-link-archer-a7-v5_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_tp-link-archer-c5-v1_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_tp-link-archer-c7-v2_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_tp-link-archer-c7-v5_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_tp-link-archer-c59-v1_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_tp-link-tl-wr842n-v3_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_tp-link-tl-wr1043nd-v4_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_d-link-dir825b1_SITE_PACKAGES += $(EXCLUDE_TLS)
-endif
-
-# no pkglists for target ath79-mikrotik
-
-
-ifeq ($(GLUON_TARGET),ath79-nand)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),bcm27xx-bcm2708)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_HID) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),bcm27xx-bcm2709)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_HID) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),bcm27xx-bcm2710)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_HID) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),bcm27xx-bcm2711)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_HID) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),ipq40xx-generic)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-# no pkglists for target ipq40xx-mikrotik
-
-
-ifeq ($(GLUON_TARGET),ipq806x-generic)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),lantiq-xrx200)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-    GLUON_avm-fritz-box-7412_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
-    GLUON_tp-link-td-w8970_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
-    GLUON_tp-link-td-w8980_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
-endif
-
-ifeq ($(GLUON_TARGET),lantiq-xway)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-# no pkglists for target mediatek-filogic
-
-
-ifeq ($(GLUON_TARGET),mediatek-mt7622)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-    GLUON_ubiquiti-unifi-6-lr-v1_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
-endif
-
-ifeq ($(GLUON_TARGET),mpc85xx-p1010)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),mpc85xx-p1020)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),mvebu-cortexa9)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),ramips-mt7620)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-    GLUON_netgear-ex3700_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
-endif
-
-ifeq ($(GLUON_TARGET),ramips-mt7621)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-    GLUON_netgear-ex6150_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
-    GLUON_ubiquiti-edgerouter-x_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
-    GLUON_ubiquiti-edgerouter-x-sfp_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE)
-endif
-
-ifeq ($(GLUON_TARGET),ramips-mt76x8)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS)
-
-    GLUON_gl-mt300n-v2_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_gl.inet-microuter-n300_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_netgear-r6120_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-    GLUON_ravpower-rp-wd009_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-endif
-
-# no pkglists for target realtek-rtl838x
-
-
-ifeq ($(GLUON_TARGET),rockchip-armv8)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),sunxi-cortexa7)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),x86-64)
-    GLUON_SITE_PACKAGES += $(INCLUDE_PCI) $(INCLUDE_PCI_NET) $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),x86-generic)
-    GLUON_SITE_PACKAGES += $(INCLUDE_PCI) $(INCLUDE_PCI_NET) $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),x86-geode)
-    GLUON_SITE_PACKAGES += $(INCLUDE_PCI) $(INCLUDE_PCI_NET) $(INCLUDE_TLS) $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)
-
-endif
-
-ifeq ($(GLUON_TARGET),x86-legacy)
-    GLUON_SITE_PACKAGES += $(INCLUDE_TLS)
-
-endif