targets/targets.mk

-GLUON_WLAN_MESH_11s := $(filter 11s,$(GLUON_WLAN_MESH))
-
-$(eval $(call GluonTarget,ar71xx,generic))
-$(eval $(call GluonTarget,ar71xx,tiny))
-$(eval $(call GluonTarget,ar71xx,nand))
-$(eval $(call GluonTarget,brcm2708,bcm2708))
-$(eval $(call GluonTarget,brcm2708,bcm2709))
-$(eval $(call GluonTarget,mpc85xx,generic))
+$(eval $(call GluonTarget,armsr,armv7))
+$(eval $(call GluonTarget,armsr,armv8))
+$(eval $(call GluonTarget,ath79,generic))
+$(eval $(call GluonTarget,ath79,nand))
+$(eval $(call GluonTarget,ath79,mikrotik))
+$(eval $(call GluonTarget,bcm27xx,bcm2708))
+$(eval $(call GluonTarget,bcm27xx,bcm2709))
+$(eval $(call GluonTarget,ipq40xx,generic))
+$(eval $(call GluonTarget,ipq40xx,mikrotik))
+$(eval $(call GluonTarget,ipq806x,generic))
+$(eval $(call GluonTarget,lantiq,xrx200))
+$(eval $(call GluonTarget,lantiq,xrx200_legacy))
+$(eval $(call GluonTarget,lantiq,xway))
+$(eval $(call GluonTarget,mediatek,filogic))
+$(eval $(call GluonTarget,mediatek,mt7622))
+$(eval $(call GluonTarget,mpc85xx,p1010))
+$(eval $(call GluonTarget,mpc85xx,p1020))
+$(eval $(call GluonTarget,ramips,mt7620))
 $(eval $(call GluonTarget,ramips,mt7621))
+$(eval $(call GluonTarget,ramips,mt76x8))
+$(eval $(call GluonTarget,rockchip,armv8))
 $(eval $(call GluonTarget,sunxi,cortexa7))
 $(eval $(call GluonTarget,x86,generic))
 $(eval $(call GluonTarget,x86,geode))
+$(eval $(call GluonTarget,x86,legacy))
 $(eval $(call GluonTarget,x86,64))
 
-ifneq ($(GLUON_WLAN_MESH_11s)$(BROKEN),)
-$(eval $(call GluonTarget,ipq40xx))
-$(eval $(call GluonTarget,ipq806x))
-$(eval $(call GluonTarget,ramips,mt7620))
-$(eval $(call GluonTarget,ramips,mt76x8))
-$(eval $(call GluonTarget,ramips,rt305x))
-endif
 
-ifneq ($(BROKEN),)
-$(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
-$(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
-$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No AP+IBSS or 11s support
+ifeq ($(BROKEN),1)
+$(eval $(call GluonTarget,bcm27xx,bcm2710)) # BROKEN: Untested
+$(eval $(call GluonTarget,bcm27xx,bcm2711)) # BROKEN: No 11s support, no reset button, sys LED issues
+$(eval $(call GluonTarget,kirkwood,generic)) # BROKEN: No devices with 11s support
+$(eval $(call GluonTarget,mvebu,cortexa9)) # BROKEN: No 11s support
 endif

targets/x86-64

-. targets/x86.inc
+include 'x86.inc'
 
-factory_image x86-64 combined-ext4 .img.gz
-factory_image x86-64 combined-ext4 .vdi
-factory_image x86-64 combined-ext4 .vmdk
-sysupgrade_image x86-64 combined-ext4 .img.gz
+packages {
+	'kmod-gpio-nct5104d',
+	'kmod-leds-gpio',
+	'kmod-pcengines-apuv2',
+}
+
+device('x86-64', 'generic', {
+	extra_images = {
+		{'-kernel', '-kernel', '.bin'},
+		{'-squashfs-rootfs', '-rootfs', '.img.gz'},
+	},
+})

targets/x86-generic

-. targets/x86.inc
+include 'x86.inc'
 
-factory_image x86-generic combined-ext4 .img.gz
-factory_image x86-generic combined-ext4 .vdi
-factory_image x86-generic combined-ext4 .vmdk
-sysupgrade_image x86-generic combined-ext4 .img.gz
-manifest_alias x86-kvm
-manifest_alias x86-xen_domu
+packages {
+	'kmod-gpio-nct5104d',
+	'kmod-leds-gpio',
+	'kmod-pcengines-apuv2',
+}
+
+device('x86-generic', 'generic', {
+	extra_images = {
+		{'-kernel', '-kernel', '.bin'},
+		{'-squashfs-rootfs', '-rootfs', '.img.gz'},
+	},
+})

targets/x86-geode

-packages 'kmod-3c59x' 'kmod-8139cp' 'kmod-8139too' 'kmod-e100' 'kmod-e1000' 'kmod-forcedeth' 'kmod-igb' 'kmod-natsemi' 'kmod-ne2k-pci'
-packages 'kmod-pcnet32' 'kmod-r8169' 'kmod-sis900' 'kmod-sky2' 'kmod-tg3' 'kmod-tulip' 'kmod-via-rhine' 'kmod-via-velocity'
+packages {
+	'kmod-3c59x',
+	'kmod-8139cp',
+	'kmod-8139too',
+	'kmod-e100',
+	'kmod-e1000',
+	'kmod-forcedeth',
+	'kmod-igb',
+	'kmod-natsemi',
+	'kmod-ne2k-pci',
+	'kmod-pcnet32',
+	'kmod-r8169',
+	'kmod-sis900',
+	'kmod-sky2',
+	'kmod-tg3',
+	'kmod-tulip',
+	'kmod-via-rhine',
+	'kmod-via-velocity',
+}
 
-factory_image x86-geode combined-ext4 .img.gz
-sysupgrade_image x86-geode combined-ext4 .img.gz
+device('x86-geode', 'generic', {
+	factory = '-squashfs-combined',
+	factory_ext = '.img.gz',
+	sysupgrade = '-squashfs-combined',
+	sysupgrade_ext = '.img.gz',
+})

targets/x86-legacy

+include 'x86.inc'
+
+device('x86-legacy', 'generic')

targets/x86.inc

-config 'CONFIG_VDI_IMAGES=y'
-config 'CONFIG_VMDK_IMAGES=y'
+config('VDI_IMAGES', true)
+config('VMDK_IMAGES', true)
 
-ATH10K_PACKAGES='kmod-ath10k-ct ath10k-firmware-qca9887 ath10k-firmware-qca988x'
-if [ "$GLUON_WLAN_MESH" = 'ibss' ]; then
-	ATH10K_PACKAGES='kmod-ath10k-ct ath10k-firmware-qca9887-ct ath10k-firmware-qca988x-ct'
-fi
+packages {
+	'kmod-3c59x',
+	'kmod-8139cp',
+	'kmod-8139too',
+	'kmod-e100',
+	'kmod-e1000',
+	'kmod-e1000e',
+	'kmod-forcedeth',
+	'kmod-igb',
+	'kmod-natsemi',
+	'kmod-ne2k-pci',
+	'kmod-pcnet32',
+	'kmod-r8169',
+	'kmod-sis900',
+	'kmod-sky2',
+	'kmod-tg3',
+	'kmod-tulip',
+	'kmod-via-rhine',
+	'kmod-via-velocity',
+	'kmod-ath9k',
+	'kmod-gpio-button-hotplug',
+	'kmod-hwmon-core',
+	'kmod-sp5100-tco',
+	'kmod-usb-core',
+	'kmod-usb-ohci',
+	'kmod-usb2',
+	'kmod-usb3',
+	'kmod-usb-serial',
+	'kmod-ath10k',
+	'ath10k-firmware-qca9887',
+	'ath10k-firmware-qca9888',
+	'ath10k-firmware-qca988x',
+	'ath10k-firmware-qca9984',
+	'kmod-mt76x0e',
+	'kmod-mt76x2',
+	'kmod-mt7603',
+	'kmod-mt7615-firmware',
+	'kmod-mt7915-firmware',
+	'kmod-mt7921-firmware',
+}
 
-packages 'kmod-3c59x' 'kmod-8139cp' 'kmod-8139too' 'kmod-e100' 'kmod-e1000' 'kmod-e1000e' 'kmod-forcedeth' 'kmod-igb' 'kmod-natsemi' 'kmod-ne2k-pci'
-packages 'kmod-pcnet32' 'kmod-r8169' 'kmod-sis900' 'kmod-sky2' 'kmod-tg3' 'kmod-tulip' 'kmod-via-rhine' 'kmod-via-velocity'
-packages 'kmod-ath9k'
-packages $ATH10K_PACKAGES
-packages 'kmod-gpio-button-hotplug' 'kmod-gpio-nct5104d' 'kmod-hwmon-core' 'kmod-leds-gpio' 'kmod-leds-apu2' 'kmod-sp5100_tco'
-packages 'kmod-usb-core' 'kmod-usb-ohci' 'kmod-usb2' 'kmod-usb3' 'kmod-usb-serial'
+-- We do not use the ext4 images, so we do not want to build them.
+config('TARGET_ROOTFS_EXT4FS', false)
+
+defaults {
+	factory = '-squashfs-combined-efi',
+	factory_ext = {'.img.gz', '.vmdk', '.vdi'},
+	sysupgrade = '-squashfs-combined-efi',
+	sysupgrade_ext = '.img.gz',
+}

tests/test_batctl_tpmeter.py

+#!/usr/bin/env python3
+import sys
+from pynet import *
+import asyncio
+import time
+
+a = Node()
+b = Node()
+
+connect(a, b)
+
+start()
+
+b.wait_until_succeeds("ping -c 5 node1")
+
+addr = a.succeed('cat /sys/class/net/primary0/address')
+result = b.succeed(f'batctl tp {addr}')
+
+print(result)
+
+finish()
+

tests/test_gluon-reconfigure.py

+#!/usr/bin/env python3
+import sys
+from pynet import *
+
+a = Node()
+
+start()
+
+a.dbg(a.succeed("gluon-reconfigure"))
+
+finish()

tests/test_respondd.py

+#!/usr/bin/env python3
+import sys
+from pynet import *
+import asyncio
+import time
+import json
+
+a = Node()
+b = Node()
+
+connect(a, b)
+
+start()
+
+b.wait_until_succeeds("ping -c 5 node1")
+
+
+def query_neighbor_info(request):
+    response = b.wait_until_succeeds(
+        f"gluon-neighbour-info -d ff02::2:1001 -p 1001 -r {request} -i vx_eth2_mesh -c 2"
+    )
+
+    # build json array line by line
+    ret = [json.loads(l) for l in response.split("\n")]
+
+    b.dbg(f"{request.lower()}:\n{json.dumps(ret, indent=4)}")
+    return ret
+
+
+neighbours = query_neighbor_info("neighbours")
+
+vx_eth2_mesh_addr_a = a.succeed("cat /sys/class/net/vx_eth2_mesh/address")
+vx_eth2_mesh_addr_b = b.succeed("cat /sys/class/net/vx_eth2_mesh/address")
+
+res0 = neighbours[0]["batadv"]
+res1 = neighbours[1]["batadv"]
+if vx_eth2_mesh_addr_a in res0:
+    res = res0
+else:
+    res = res1
+
+batadv_neighbours = res[vx_eth2_mesh_addr_a]["neighbours"]
+
+if vx_eth2_mesh_addr_b in batadv_neighbours:
+    print("Node 1 was successfully found in neighbours of node 2.")
+else:
+    print("ERROR: Node 1 was not found in neighbours of node 2.")
+    exit(1)
+
+finish()