BACKPORT-CONFLICT

site.mk

@@ -1,10 +1,40 @@
 GLUON_MULTIDOMAIN=1
 GLUON_DEPRECATED=upgrade
 
+<<<<<<< HEAD
 DEFAULT_GLUON_RELEASE := v2021.6.0~exp$(shell date '+%Y%m%d%H')
 
 # Allow overriding the release number from the command line
 GLUON_RELEASE ?= $(DEFAULT_GLUON_RELEASE)
+=======
+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 := \
+	ff-ap-timer \
+	ff-web-ap-timer \
+	ffac-autoupdater-wifi-fallback \
+	ffac-change-autoupdater \
+	ffac-ssid-changer \
+	ffbs-collect-debug-info \
+	ffmuc-custom-banner \
+	ffmuc-ipv6-ra-filter \
+	ffmuc-mesh-vpn-wireguard-vxlan \
+	iwinfo \
+	respondd-module-airtime
+>>>>>>> a55d9d3 (site: remove *GLUON_RELEASE (#505))
 
 GLUON_PRIORITY ?= 0