automatic commit at releng box

misc/image/ca.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 cd ../../src
 for a in amd64 i686 arm64 arm32hf mips64 ppc32 ppc64el risc64 s390x loong sparc sh4 ; do
-  java -Xmx256m -jar rtr.jar test image ../misc/image/plat.$a ../misc/image/image.jvm
+  java -Xmx256m -jar rtr.jar test image ../misc/image/platform.$a ../misc/image/image.jvm
   done

misc/image/cc.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
 cd ../../src
 for a in i686 amd64 arm32hf arm32el mips64 alpha ppc32 ppc64el ppc64eb risc64 s390x sparc loong sh4 m68k hppa arm64 ; do
-  java -Xmx256m -jar rtr.jar test image ../misc/image/plat.$a ../misc/image/image.cmp
+  java -Xmx256m -jar rtr.jar test image ../misc/image/platform.$a ../misc/image/image.cmp
   done

misc/image/cj.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 cd ../../src
-java -Xmx256m -jar rtr.jar test image ../misc/image/plat.amd64 ../misc/image/image.jvm
+java -Xmx256m -jar rtr.jar test image ../misc/image/platform.amd64 ../misc/image/image.jvm

misc/image/cn.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 cd ../../src
-java -Xmx256m -jar rtr.jar test image ../misc/image/plat.amd64 ../misc/image/image.nat
+java -Xmx256m -jar rtr.jar test image ../misc/image/platform.amd64 ../misc/image/image.nat

misc/image/native.clang

@@ -0,0 +1 @@
+exec cd %tmp%/misc/native/ ; ./c.sh sr ../../ um %ctrg% ab %cabi% cc "clang -target %ctrg%-linux-%cabi%" bc "clang -target bpf -m%carc%" cs llvm-strip bs llvm-strip

misc/image/native.cross

@@ -0,0 +1,36 @@
+include ../misc/image/image.bas
+
+exec mkdir %tmp%/binImg
+
+catalog-read exp xz %mirr% experimental main
+catalog-read sid xz %mirr% sid main
+catalog-sum
+
+select-one libc6-dev                      #library
+select-one gcc                            #compiler
+select-one gcc-multilib                   #compiler
+select-dis librte-.*                      #dataplane
+select-one dpdk-dev                       #dataplane
+select-one libpcap-dev                    #dataplane
+select-one libssl-dev                     #dataplane
+select-one libbpf-dev                     #dataplane
+select-one libxdp-dev                     #dataplane
+select-one liburing-dev                   #dataplane
+select-one libmnl-dev                     #dataplane
+
+select-lst
+select-sum
+package-down
+package-inst
+
+catalog-save cmp
+
+exec cp -r ../misc %tmp%/
+
+include ../misc/image/native.%comp%
+
+exec cd %tmp%/misc/native/ ; ./p.sh
+
+exec mv %tmp%/binImg/*.tgz ../binImg/rtr-%unam%.tgz
+
+exec /usr/bin/qemu-%qemu%-static -L %tmp%/ %tmp%/binTmp/p4bench.bin

misc/image/native.gcc

@@ -0,0 +1 @@
+exec cd %tmp%/misc/native/ ; ./c.sh sr ../../ um %ctrg% ab %cabi% cc %ctrg%-linux-%cabi%-gcc bc "bpf-gcc -m%carc%" cs %ctrg%-linux-%cabi%-strip bs bpf-strip

misc/image/image.cmp → misc/image/native.qemu

@@ -15,6 +15,7 @@ select-one llvm                           #compiler
 select-one gcc                            #compiler
 select-one busybox                        #busybox
 select-one tar                            #archiver
+select-dis librte-.*                      #dataplane
 select-one dpdk-dev                       #dataplane
 select-one libpcap-dev                    #dataplane
 select-one libssl-dev                     #dataplane
@@ -35,6 +36,6 @@ exec for a in `busybox --list`; do ln -s /usr/bin/busybox %tmp%/bin/$a; done
 exec cp -r ../misc %tmp%/
 exec cp /usr/bin/qemu-%qemu%-static %tmp%/qemu-static
 
-exec unshare -r -R %tmp% /qemu-static /bin/sh /misc/image/image.crs
+exec unshare -r -R %tmp% /qemu-static /bin/sh /misc/image/native.qemush
 
 exec mv %tmp%/binImg/*.tgz ../binImg/rtr-%unam%.tgz

misc/image/plat.alpha → misc/image/platform.alpha

@@ -1,6 +1,8 @@
 arch alpha
 unam alpha
 qemu alpha
+ctrg alpha
+comp gcc
 kern alpha-generic
 grub alpha-bin
 boot alpha-ieee1275

misc/image/plat.amd64 → misc/image/platform.amd64

@@ -1,6 +1,7 @@
 arch amd64
 unam x86_64
 qemu x86_64
+ctrg x86_64
 kern cloud-amd64
 grub efi-amd64-bin
 boot x86_64-efi

misc/image/plat.arm32el → misc/image/platform.arm32el

@@ -1,6 +1,8 @@
 arch armel
 unam armv5tel
 qemu armel
+ctrg arm
+cabi gnueabi
 kern rpi
 grub efi-arm-bin
 boot arm-efi

misc/image/plat.arm32hf → misc/image/platform.arm32hf

@@ -1,6 +1,8 @@
 arch armhf
 unam armv7l
 qemu armhf
+ctrg arm
+cabi gnueabihf
 kern armmp
 grub efi-arm-bin
 boot arm-efi

misc/image/plat.arm64 → misc/image/platform.arm64

@@ -1,6 +1,7 @@
 arch arm64
 unam aarch64
 qemu aarch64
+ctrg aarch64
 kern cloud-arm64
 grub efi-arm64-bin
 boot arm64-efi

misc/image/plat.hppa → misc/image/platform.hppa

@@ -1,6 +1,9 @@
 arch hppa
 unam parisc
 qemu hppa
+ctrg hppa
+comp gcc
+carc big-endian
 kern parisc64
 grub ieee1275-bin
 boot hppa-ieee1275

misc/image/plat.i686 → misc/image/platform.i686

@@ -1,6 +1,7 @@
 arch i386
 unam i686
 qemu i386
+ctrg i386
 kern 686-pae
 grub efi-ia32-bin
 boot i386-efi

misc/image/plat.loong → misc/image/platform.loong

@@ -1,6 +1,7 @@
 arch loong64
 unam loongarch64
 qemu loong64
+ctrg loongarch64
 kern loong64
 grub efi-loong64-bin
 boot loongarch64-efi

misc/image/plat.m68k → misc/image/platform.m68k

@@ -1,6 +1,9 @@
 arch m68k
 unam m68k
 qemu m68k
+ctrg m68k
+comp gcc
+carc big-endian
 kern m68k
 grub ieee1275-bin
 boot m68k-ieee1275

misc/image/plat.mips64 → misc/image/platform.mips64

@@ -1,6 +1,8 @@
 arch mips64el
 unam mips64
 qemu mips64el
+ctrg mips64el
+cabi gnuabi64
 kern mips64r2el
 grub ieee1275-bin
 boot mips-arc

misc/image/plat.ppc32 → misc/image/platform.ppc32

@@ -1,6 +1,8 @@
 arch powerpc
 unam ppc
 qemu ppc
+ctrg powerpc
+carc big-endian
 kern powerpc
 grub ieee1275-bin
 boot powerpc-ieee1275

misc/image/plat.ppc64eb → misc/image/platform.ppc64eb

@@ -1,6 +1,8 @@
 arch ppc64
 unam ppc64
 qemu ppc64
+ctrg powerpc64
+carc big-endian
 kern powerpc64
 grub ieee1275-bin
 boot powerpc-ieee1275

misc/image/plat.ppc64el → misc/image/platform.ppc64el

@@ -1,6 +1,7 @@
 arch ppc64el
 unam ppc64le
 qemu ppc64el
+ctrg powerpc64le
 kern powerpc64le
 grub ieee1275-bin
 boot powerpc-ieee1275

misc/image/plat.risc64 → misc/image/platform.risc64

@@ -1,6 +1,7 @@
 arch riscv64
 unam riscv64
 qemu riscv64
+ctrg riscv64
 kern riscv64
 grub efi-riscv64-bin
 boot riscv64-efi

misc/image/plat.s390x → misc/image/platform.s390x

@@ -1,6 +1,8 @@
 arch s390x
 unam s390x
 qemu s390x
+ctrg s390x
+carc big-endian
 kern s390x
 grub ieee1275-bin
 boot s390x-efi

misc/image/plat.sh4 → misc/image/platform.sh4

@@ -1,6 +1,8 @@
 arch sh4
 unam sh4
 qemu sh4
+ctrg sh4
+comp gcc
 kern sh7785lcr
 grub ieee1275-bin
 boot sh4-ieee1275

misc/image/plat.sparc → misc/image/platform.sparc

@@ -1,6 +1,8 @@
 arch sparc64
 unam sparc64
 qemu sparc64
+ctrg sparc64
+carc big-endian
 kern sparc64
 grub ieee1275-bin
 boot sparc64-ieee1275-cdcore

misc/native/c.sh

@@ -27,8 +27,11 @@ else
   BS="bpf-strip"
 fi
 
-while [[ $# -gt 0 ]]; do
+while [ $# -gt 0 ]; do
   case $1 in
+    md)
+      MD=$2
+      ;;
     um)
       UM=$2
       ;;
@@ -63,7 +66,7 @@ echo arch=$UM, abi=$AB, sys=$SR, cc=$CC, cs=$CS, bc=$BC, bs=$BS, mode=$MD, flag=
 compileBpf()
 {
 echo compiling $1.
-$BC --sysroot $SR -Wall $MD -c -g -I /usr/include/ -I /usr/include/$UM-linux-$AB/ -o$TR/$1.bin $1.c
+$BC --sysroot $SR -Wall $MD -c -g -I =/usr/include/ -I =/usr/include/$UM-linux-$AB/ -o$TR/$1.bin $1.c
 $BS -d $TR/$1.bin || true
 touch -c -d "2010-01-01 00:00:00" $TR/$1.bin || true
 }
@@ -112,7 +115,7 @@ for fn in p4emu_full p4emu_tiny p4emu_huge p4emu_dbg p4emu_nocr p4emu_none p4emu
 done
 
 for fn in p4emu_dpdk; do
-  compileLib $fn "-I /usr/include/dpdk/ -I /usr/include/$UM-linux-$AB/dpdk" $MF
+  compileLib $fn "-I =/usr/include/dpdk/ -I =/usr/include/$UM-linux-$AB/dpdk" $MF
 done
 
 linkTwoLibs "p4emu" "p4emu_pcap" "p4emu_full" "-lpthread -lpcap -lcrypto"

src/rtr.csv

@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v25.1.31-cur, done by sprscc13@mrn0b0dy.
--;-;-;2025-01-31 08:54:13, took 00:16:12, with 50 workers, on 3634 cases, 0 failed, 0 traces, 1 retries
+-;-;-;2025-01-31 09:35:04, took 00:14:43, with 50 workers, on 3634 cases, 0 failed, 0 traces, 4 retries
 -;-;-;./rtr.bin
 http://sources.freertr.org/cfg/basic01.tst;basic01.tst;success;dummy test
 http://sources.freertr.org/cfg/basic02.tst;basic02.tst;success;interface with slot

src/rtr.html

@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v25.1.31-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-31 08:54:13, took 00:16:12, with 50 workers, on 3634 cases, 0 failed, 0 traces, 1 retries<br/>
+tested: 2025-01-31 09:35:04, took 00:14:43, with 50 workers, on 3634 cases, 0 failed, 0 traces, 4 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>

src/rtr8.csv

@@ -1,6 +1,6 @@
 url;file;result;test
 -;-;-;freeRouter v25.1.31-cur, done by sprscc13@mrn0b0dy.
--;-;-;2025-01-31 09:05:03, took 00:10:20, with 50 workers, on 700 cases, 0 failed, 0 traces, 0 retries
+-;-;-;2025-01-31 09:49:19, took 00:13:46, with 50 workers, on 700 cases, 0 failed, 0 traces, 1 retries
 -;-;-;./rtr.bin
 http://sources.freertr.org/cfg/p4lang-acl001.tst;p4lang-acl001.tst;success;p4lang: copp
 http://sources.freertr.org/cfg/p4lang-acl002.tst;p4lang-acl002.tst;success;p4lang: ingress access list

src/rtr8.html

@@ -10,7 +10,7 @@
 </style>
 <title>tester</title></head><body>
 release: freeRouter v25.1.31-cur, done by sprscc13@mrn0b0dy.<br/>
-tested: 2025-01-31 09:05:03, took 00:10:20, with 50 workers, on 700 cases, 0 failed, 0 traces, 0 retries<br/>
+tested: 2025-01-31 09:49:19, took 00:13:46, with 50 workers, on 700 cases, 0 failed, 0 traces, 1 retries<br/>
 jvm: ./rtr.bin<br/>
 <br/>
 <table><thead><tr><td><b>file</b></td><td><b>result</b></td><td><b>test</b></td></tr></thead><tbody>

src/tp6.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
-java -Xmx256m -jar rtr.jar test image ../misc/image/plat.s390x ../misc/image/image.tst
+java -Xmx256m -jar rtr.jar test image ../misc/image/platform.s390x ../misc/image/image.tst
 java -Xmx512m -jar rtr.jar test tester p4lang- binary other p4lang6.ini slot 1 parallel 30 retry 4 $@
 ./te.sh