targets/sunxi-cortexa7

@@ -6,12 +6,12 @@ defaults {
 }
 
 
-device('lemaker-banana-pi', 'sun7i-a20-bananapi')
+device('lemaker-banana-pi', 'lemaker_bananapi')
 
-device('lemaker-banana-pro', 'sun7i-a20-bananapro', {
+device('lemaker-banana-pro', 'lemaker_bananapro', {
 	broken = true, -- WiFi chip not supported
 })
 
-device('lamobo-r1', 'sun7i-a20-lamobo-r1', {
+device('lamobo-r1', 'lamobo_lamobo-r1', {
 	broken = true, -- AP+11s not working
 })

targets/targets.mk

-$(eval $(call GluonTarget,ar71xx,generic))
-ifneq ($(GLUON_DEPRECATED),0)
-$(eval $(call GluonTarget,ar71xx,tiny))
-endif
-$(eval $(call GluonTarget,ar71xx,nand))
+$(eval $(call GluonTarget,armsr,armv7))
+$(eval $(call GluonTarget,armsr,armv8))
 $(eval $(call GluonTarget,ath79,generic))
-$(eval $(call GluonTarget,brcm2708,bcm2708))
-$(eval $(call GluonTarget,brcm2708,bcm2709))
+$(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,mpc85xx,generic))
+$(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,ramips,rt305x))
+$(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 ($(BROKEN),)
-$(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
-$(eval $(call GluonTarget,brcm2708,bcm2710)) # BROKEN: Untested
+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

 include 'x86.inc'
 
-factory_image('x86-64', 'combined-squashfs', '.img.gz')
-factory_image('x86-64', 'combined-squashfs', '.vdi')
-factory_image('x86-64', 'combined-squashfs', '.vmdk')
-sysupgrade_image('x86-64', 'combined-squashfs', '.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

 include 'x86.inc'
 
-factory_image('x86-generic', 'combined-squashfs', '.img.gz')
-factory_image('x86-generic', 'combined-squashfs', '.vdi')
-factory_image('x86-generic', 'combined-squashfs', '.vmdk')
-sysupgrade_image('x86-generic', 'combined-squashfs', '.img.gz', {
-	manifest_aliases = {
-		'x86-kvm',
-		'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

@@ -18,5 +18,9 @@ packages {
 	'kmod-via-velocity',
 }
 
-factory_image('x86-geode', 'combined-squashfs', '.img.gz')
-sysupgrade_image('x86-geode', 'combined-squashfs', '.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)
 
 packages {
 	'kmod-3c59x',
@@ -22,11 +22,8 @@ packages {
 	'kmod-via-velocity',
 	'kmod-ath9k',
 	'kmod-gpio-button-hotplug',
-	'kmod-gpio-nct5104d',
 	'kmod-hwmon-core',
-	'kmod-leds-gpio',
-	'kmod-leds-apu2',
-	'kmod-sp5100_tco',
+	'kmod-sp5100-tco',
 	'kmod-usb-core',
 	'kmod-usb-ohci',
 	'kmod-usb2',
@@ -34,5 +31,23 @@ packages {
 	'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',
+}
+
+-- 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()