Skip to content

Commit

Permalink
site: migrate package and feature selection to site-selection
Browse files Browse the repository at this point in the history
Migrate to the new image-customization function available in Gluon.

This does not yet include the migration of genpkglist.py and it's
output. This will eventually follow at a later point in time.

Signed-off-by: David Bauer <[email protected]>
  • Loading branch information
blocktrron committed Dec 13, 2023
1 parent 71a6add commit 51cff37
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 282 deletions.
39 changes: 39 additions & 0 deletions image-customization
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
features({
'autoupdater',
'config-mode-domain-select',
'config-mode-geo-location-osm',
'ebtables-filter-multicast',
'ebtables-filter-ra-dhcp',
'ebtables-limit-arp',
'ebtables-source-filter',
'mesh-batman-adv-15',
'mesh-vpn-fastd-l2tp',
'radvd',
'radv-filterd',
'respondd',
'status-page',
'web-advanced',
'web-logging',
'web-private-wifi',
'web-wizard',
})

packages({
'ca-bundle',
'iwinfo',
'libustream-mbedtls',
'respondd-module-airtime',
'ffda-update-stabilizer',
})

if not device_class('tiny') then
packages({
'ffda-gluon-usteer'
})

features({
'mesh-vpn-sqm',
'web-cellular',
'wireless-encryption-wpa3'
})
end
282 changes: 0 additions & 282 deletions site.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,285 +16,3 @@ GLUON_PRIORITY ?= ${DEFAULT_GLUON_PRIORITY}

# Don't build factory firmware for deprecated devices
GLUON_DEPRECATED ?= upgrade

# Featureset, these are either virtual or packages prefixed with "gluon-"
GLUON_FEATURES := \
autoupdater \
config-mode-domain-select \
config-mode-geo-location-osm \
ebtables-filter-multicast \
ebtables-filter-ra-dhcp \
ebtables-limit-arp \
ebtables-source-filter \
mesh-batman-adv-15 \
mesh-vpn-fastd-l2tp \
radvd \
radv-filterd \
respondd \
status-page \
web-advanced \
web-logging \
web-private-wifi \
web-wizard

GLUON_FEATURES_standard := \
mesh-vpn-sqm \
web-cellular \
wireless-encryption-wpa3

# Additional packages to install on every image
GLUON_SITE_PACKAGES := \
ca-bundle \
iwinfo \
libustream-mbedtls \
respondd-module-airtime \
ffda-update-stabilizer

GLUON_SITE_PACKAGES_standard := \
ffda-gluon-usteer

# 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

ifeq ($(GLUON_TARGET),ath79-generic)

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)
endif

# no pkglists for target ath79-mikrotik


# no pkglists for target ath79-nand


ifeq ($(GLUON_TARGET),bcm27xx-bcm2708)
GLUON_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_HID) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

ifeq ($(GLUON_TARGET),bcm27xx-bcm2709)
GLUON_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_HID) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

ifeq ($(GLUON_TARGET),bcm27xx-bcm2710)
GLUON_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_HID) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

ifeq ($(GLUON_TARGET),ipq40xx-generic)
GLUON_SITE_PACKAGES += $(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_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

ifeq ($(GLUON_TARGET),lantiq-xrx200)
GLUON_SITE_PACKAGES += $(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

# no pkglists for target lantiq-xway


ifeq ($(GLUON_TARGET),mediatek-mt7622)
GLUON_SITE_PACKAGES += $(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_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

ifeq ($(GLUON_TARGET),mpc85xx-p1020)
GLUON_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

ifeq ($(GLUON_TARGET),mvebu-cortexa9)
GLUON_SITE_PACKAGES += $(INCLUDE_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

# no pkglists for target ramips-mt7620


ifeq ($(GLUON_TARGET),ramips-mt7621)
GLUON_SITE_PACKAGES += $(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)
GLUON_zyxel-nwa55axe_SITE_PACKAGES += $(EXCLUDE_USB) $(EXCLUDE_USB_NET) $(EXCLUDE_USB_SERIAL) $(EXCLUDE_USB_STORAGE) ffda-network-setup-mode
endif

ifeq ($(GLUON_TARGET),ramips-mt76x8)

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_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

ifeq ($(GLUON_TARGET),sunxi-cortexa7)
GLUON_SITE_PACKAGES += $(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_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_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_USB) $(INCLUDE_USB_NET) $(INCLUDE_USB_SERIAL) $(INCLUDE_USB_STORAGE)

endif

# no pkglists for target x86-legacy

0 comments on commit 51cff37

Please sign in to comment.