Skip to content

Commit 5a6b6e8

Browse files
committed
add qosify
1 parent a5d1d5d commit 5a6b6e8

6 files changed

Lines changed: 51 additions & 13 deletions

File tree

.github/actions/setup-devenv/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ runs:
2323
sudo -E apt-get update -y
2424
sudo -E apt-get install -y build-essential ccache ecj fastjar file g++ gawk gettext git java-propose-classpath libelf-dev libncurses5-dev libncursesw5-dev libssl-dev python3 unzip wget python3-distutils python3-setuptools python3-dev rsync subversion swig time xsltproc zlib1g-dev
2525
#sudo -E apt-get install -y rsync asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core p7zip p7zip-full msmtp libssl-dev texinfo libreadline-dev libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint ccache curl wget vim nano python3 python3-pip python3-ply haveged lrzsz device-tree-compiler scons
26+
sudo -E apt-get install clang llvm
2627
sudo -E apt-get clean -y
2728
git config --global user.name 'GitHub Actions' && git config --global user.email 'noreply@github.com'
2829
df -h

.github/workflows/NanoPi-Build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ on:
4343
default: true
4444
jobs:
4545
init:
46-
runs-on: ubuntu-20.04
46+
runs-on: ubuntu-22.04
4747
if: github.event.repository.owner.id == github.event.sender.id
4848

4949
# Map a step output to a job output
@@ -71,7 +71,7 @@ jobs:
7171
strategy:
7272
matrix: ${{ fromJson(needs.init.outputs.matrix) }}
7373

74-
runs-on: ubuntu-20.04
74+
runs-on: ubuntu-22.04
7575
if: github.event.repository.owner.id == github.event.sender.id
7676

7777
steps:

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Automated builds of OpenWrt for FriendlyARM NanoPi R2S & R4S boards
88

99
## OpenWrt branch 21.02 (stable)
1010

11-
### Downloads [Releases 21.02](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=21.02&expanded=true)
11+
### Downloads [Releases 21.02](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=OpenWrtAO-21.02&expanded=true)
1212

1313
### Configuration
1414
- OpenWRT 21.02 Vanilla / Kernel 5.4
@@ -24,7 +24,7 @@ Automated builds of OpenWrt for FriendlyARM NanoPi R2S & R4S boards
2424

2525
## OpenWrt branch 22.03 (WIP)
2626

27-
### Downloads [Releases 22.03](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=m22.03&expanded=true)
27+
### Downloads [Releases 22.03](https://github.com/anaelorlinski/OpenWrt-NanoPi-R2S-R4S-Builds/releases?q=OpenWrtAO-22.03&expanded=true)
2828

2929
### Configuration
3030
- OpenWRT master Vanilla / Kernel 5.10
@@ -38,6 +38,8 @@ Automated builds of OpenWrt for FriendlyARM NanoPi R2S & R4S boards
3838

3939

4040
## Changelog
41+
#### 2022-08-30
42+
- (22.03) Add qosify
4143
#### 2022-08-25
4244
- (22.03) Update U-Boot to 2022.07 (only tested on R4S 4GB)
4345
- (22.03) Backport Packages from master

openwrt-22.03/release-info.md

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
- pbr latest version from https://github.com/stangri/source.openwrt.melmac.net
1919

2020
### Changelog
21-
[2022.08.19] Rework patches
22-
[2022.08.17] Update 22.03 seeds to match 21.02
23-
[2022.08.17] Add watchcat
21+
- [2022-08-30] Add qosify
22+
- [2022-08-25] Update U-Boot to 2022.07 (only tested on R4S 4GB)
23+
- [2022-08-25] Backport Packages from master
24+
- [2022-08-25] Update r8168 driver
25+
- [2022.08.19] Rework patches
26+
- [2022.08.17] Update 22.03 seeds to match 21.02
27+
- [2022.08.17] Add watchcat

openwrt-22.03/seed/ao-R4S-full.seed

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y
44
CONFIG_DEVEL=y
55
CONFIG_TOOLCHAINOPTS=y
66
CONFIG_BIND_ENABLE_DOH=y
7+
CONFIG_BPF_TOOLCHAIN_HOST=y
8+
CONFIG_BPF_TOOLCHAIN_HOST_PATH=""
9+
# CONFIG_BPF_TOOLCHAIN_NONE is not set
710
CONFIG_COREMARK_ENABLE_MULTITHREADING=y
811
CONFIG_COREMARK_NUMBER_OF_THREADS=16
912
CONFIG_COREMARK_OPTIMIZE_O3=y
@@ -14,6 +17,7 @@ CONFIG_DOCKER_OPTIONAL_FEATURES=y
1417
CONFIG_DOCKER_STO_BTRFS=y
1518
CONFIG_DOCKER_STO_EXT4=y
1619
CONFIG_EXPERIMENTAL=y
20+
CONFIG_HAS_BPF_TOOLCHAIN=y
1721
CONFIG_IFSTAT_SNMP=y
1822
CONFIG_IPERF_ENABLE_MULTICAST=y
1923
CONFIG_KERNEL_ARM_PMU=y
@@ -48,6 +52,7 @@ CONFIG_LIBCURL_NO_SMB="!"
4852
CONFIG_LIBCURL_OPENSSL=y
4953
CONFIG_LIBCURL_PROXY=y
5054
CONFIG_LUCI_LANG_en=y
55+
CONFIG_LXC_SECCOMP=y
5156
CONFIG_OPENSSL_ENGINE=y
5257
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
5358
CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
@@ -275,6 +280,7 @@ CONFIG_PACKAGE_kmod-nls-iso8859-1=y
275280
CONFIG_PACKAGE_kmod-nls-utf8=y
276281
CONFIG_PACKAGE_kmod-phy-realtek=y
277282
CONFIG_PACKAGE_kmod-random-core=y
283+
CONFIG_PACKAGE_kmod-sched-bpf=y
278284
CONFIG_PACKAGE_kmod-sched-cake=y
279285
CONFIG_PACKAGE_kmod-sched-connmark=y
280286
CONFIG_PACKAGE_kmod-sched-core=y
@@ -339,7 +345,6 @@ CONFIG_PACKAGE_liblua5.3=y
339345
CONFIG_PACKAGE_liblucihttp=y
340346
CONFIG_PACKAGE_liblucihttp-lua=y
341347
CONFIG_PACKAGE_liblzo=y
342-
CONFIG_PACKAGE_libmbedtls=y
343348
CONFIG_PACKAGE_libmount=y
344349
CONFIG_PACKAGE_libncurses=y
345350
CONFIG_PACKAGE_libnetfilter-conntrack=y
@@ -376,8 +381,11 @@ CONFIG_PACKAGE_libunbound=y
376381
CONFIG_PACKAGE_libunbound_ipset=y
377382
CONFIG_PACKAGE_libunbound_libevent=y
378383
CONFIG_PACKAGE_libunbound_libpthread=y
384+
CONFIG_PACKAGE_libustream-openssl=y
385+
# CONFIG_PACKAGE_libustream-wolfssl is not set
379386
CONFIG_PACKAGE_libuv=y
380387
CONFIG_PACKAGE_libwebsockets-full=y
388+
# CONFIG_PACKAGE_libwolfssl is not set
381389
CONFIG_PACKAGE_libxtables=y
382390
CONFIG_PACKAGE_lm-sensors=y
383391
CONFIG_PACKAGE_losetup=y
@@ -432,6 +440,7 @@ CONFIG_PACKAGE_luci-proto-ppp=y
432440
CONFIG_PACKAGE_luci-proto-wireguard=y
433441
CONFIG_PACKAGE_luci-theme-bootstrap=y
434442
CONFIG_PACKAGE_luci-theme-openwrt-2020=y
443+
CONFIG_PACKAGE_lxc=y
435444
CONFIG_PACKAGE_mount-utils=y
436445
CONFIG_PACKAGE_mt7601u-firmware=y
437446
CONFIG_PACKAGE_nano=y
@@ -447,6 +456,7 @@ CONFIG_PACKAGE_openvpn-openssl=y
447456
CONFIG_PACKAGE_pbr-nftables=y
448457
CONFIG_PACKAGE_picocom=y
449458
CONFIG_PACKAGE_qos-scripts=y
459+
CONFIG_PACKAGE_qosify=y
450460
CONFIG_PACKAGE_r8152-firmware=y
451461
CONFIG_PACKAGE_r8169-firmware=y
452462
CONFIG_PACKAGE_resolveip=y
@@ -464,8 +474,8 @@ CONFIG_PACKAGE_speedtest-netperf=y
464474
CONFIG_PACKAGE_sqm-scripts=y
465475
CONFIG_PACKAGE_sqm-scripts-extra=y
466476
CONFIG_PACKAGE_sysfsutils=y
477+
CONFIG_PACKAGE_tc-full=y
467478
CONFIG_PACKAGE_tc-mod-iptables=y
468-
CONFIG_PACKAGE_tc-tiny=y
469479
CONFIG_PACKAGE_tcpdump=y
470480
CONFIG_PACKAGE_terminfo=y
471481
CONFIG_PACKAGE_tini=y
@@ -494,4 +504,5 @@ CONFIG_TARGET_KERNEL_PARTSIZE=40
494504
CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -mcpu=cortex-a72.cortex-a53+crypto+crc"
495505
CONFIG_TARGET_OPTIONS=y
496506
CONFIG_TARGET_ROOTFS_PARTSIZE=1024
507+
CONFIG_USE_LLVM_HOST=y
497508
# CONFIG_PACKAGE_dnsmasq_full_ipset is not set

openwrt-22.03/seed/ao-R4S-mini.seed

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,37 @@ CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r4s=y
44
CONFIG_DEVEL=y
55
CONFIG_TOOLCHAINOPTS=y
66
CONFIG_BIND_ENABLE_DOH=y
7+
CONFIG_BPF_TOOLCHAIN_HOST=y
8+
CONFIG_BPF_TOOLCHAIN_HOST_PATH=""
9+
# CONFIG_BPF_TOOLCHAIN_NONE is not set
710
CONFIG_COREMARK_ENABLE_MULTITHREADING=y
811
CONFIG_COREMARK_NUMBER_OF_THREADS=16
912
CONFIG_COREMARK_OPTIMIZE_O3=y
1013
CONFIG_EXPERIMENTAL=y
14+
CONFIG_HAS_BPF_TOOLCHAIN=y
1115
CONFIG_IFSTAT_SNMP=y
1216
CONFIG_IPERF_ENABLE_MULTICAST=y
1317
CONFIG_KERNEL_ARM_PMU=y
18+
CONFIG_KERNEL_BLK_DEV_THROTTLING_LOW=y
1419
CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y
1520
CONFIG_KERNEL_BUILD_DOMAIN="openwrt"
1621
CONFIG_KERNEL_BUILD_USER="ao"
17-
# CONFIG_KERNEL_CGROUPS is not set
22+
CONFIG_KERNEL_CFQ_GROUP_IOSCHED=y
23+
CONFIG_KERNEL_CGROUP_DEVICE=y
24+
CONFIG_KERNEL_CGROUP_FREEZER=y
25+
CONFIG_KERNEL_CGROUP_HUGETLB=y
26+
CONFIG_KERNEL_CGROUP_NET_PRIO=y
27+
CONFIG_KERNEL_CGROUP_PERF=y
28+
CONFIG_KERNEL_DEBUG_BLK_CGROUP=y
1829
CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y
1930
CONFIG_KERNEL_EXT4_FS_SECURITY=y
2031
CONFIG_KERNEL_FS_POSIX_ACL=y
2132
CONFIG_KERNEL_HUGETLBFS=y
2233
CONFIG_KERNEL_HUGETLB_PAGE=y
23-
# CONFIG_KERNEL_NAMESPACES is not set
34+
CONFIG_KERNEL_MEMCG_SWAP_ENABLED=y
35+
CONFIG_KERNEL_NET_CLS_CGROUP=y
2436
CONFIG_KERNEL_PERF_EVENTS=y
37+
CONFIG_KERNEL_PROC_PID_CPUSET=y
2538
CONFIG_KERNEL_TRANSPARENT_HUGEPAGE=y
2639
CONFIG_KERNEL_TRANSPARENT_HUGEPAGE_ALWAYS=y
2740
CONFIG_LIBCURL_COOKIES=y
@@ -33,6 +46,7 @@ CONFIG_LIBCURL_NO_SMB="!"
3346
CONFIG_LIBCURL_OPENSSL=y
3447
CONFIG_LIBCURL_PROXY=y
3548
CONFIG_LUCI_LANG_en=y
49+
CONFIG_LXC_SECCOMP=y
3650
CONFIG_OPENSSL_ENGINE=y
3751
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
3852
CONFIG_OPENSSL_PREFER_CHACHA_OVER_GCM=y
@@ -206,7 +220,6 @@ CONFIG_PACKAGE_kmod-iptunnel=y
206220
CONFIG_PACKAGE_kmod-iptunnel6=y
207221
CONFIG_PACKAGE_kmod-keys-encrypted=y
208222
CONFIG_PACKAGE_kmod-keys-trusted=y
209-
# CONFIG_PACKAGE_kmod-lib-crc-ccitt is not set
210223
CONFIG_PACKAGE_kmod-lib-crc16=y
211224
CONFIG_PACKAGE_kmod-lib-zlib-deflate=y
212225
CONFIG_PACKAGE_kmod-lib-zlib-inflate=y
@@ -232,6 +245,7 @@ CONFIG_PACKAGE_kmod-nls-utf8=y
232245
CONFIG_PACKAGE_kmod-phy-realtek=y
233246
# CONFIG_PACKAGE_kmod-ppp is not set
234247
CONFIG_PACKAGE_kmod-random-core=y
248+
CONFIG_PACKAGE_kmod-sched-bpf=y
235249
CONFIG_PACKAGE_kmod-sched-cake=y
236250
CONFIG_PACKAGE_kmod-sched-connmark=y
237251
CONFIG_PACKAGE_kmod-sched-core=y
@@ -315,7 +329,10 @@ CONFIG_PACKAGE_libsoxr=y
315329
CONFIG_PACKAGE_libstdcpp=y
316330
CONFIG_PACKAGE_libsysfs=y
317331
CONFIG_PACKAGE_libubus-lua=y
332+
CONFIG_PACKAGE_libustream-openssl=y
333+
# CONFIG_PACKAGE_libustream-wolfssl is not set
318334
CONFIG_PACKAGE_libuv=y
335+
# CONFIG_PACKAGE_libwolfssl is not set
319336
CONFIG_PACKAGE_libxtables=y
320337
CONFIG_PACKAGE_losetup=y
321338
CONFIG_PACKAGE_lua=y
@@ -333,6 +350,7 @@ CONFIG_PACKAGE_pbr-nftables=y
333350
CONFIG_PACKAGE_picocom=y
334351
# CONFIG_PACKAGE_ppp is not set
335352
CONFIG_PACKAGE_qos-scripts=y
353+
CONFIG_PACKAGE_qosify=y
336354
CONFIG_PACKAGE_r8152-firmware=y
337355
CONFIG_PACKAGE_r8169-firmware=y
338356
CONFIG_PACKAGE_resolveip=y
@@ -349,8 +367,8 @@ CONFIG_PACKAGE_speedtest-netperf=y
349367
CONFIG_PACKAGE_sqm-scripts=y
350368
CONFIG_PACKAGE_sqm-scripts-extra=y
351369
CONFIG_PACKAGE_sysfsutils=y
370+
CONFIG_PACKAGE_tc-full=y
352371
CONFIG_PACKAGE_tc-mod-iptables=y
353-
CONFIG_PACKAGE_tc-tiny=y
354372
CONFIG_PACKAGE_tcpdump=y
355373
CONFIG_PACKAGE_terminfo=y
356374
CONFIG_PACKAGE_tinyproxy=y
@@ -370,4 +388,6 @@ CONFIG_TARGET_KERNEL_PARTSIZE=20
370388
CONFIG_TARGET_OPTIMIZATION="-O3 -pipe -mcpu=cortex-a72.cortex-a53+crypto+crc"
371389
CONFIG_TARGET_OPTIONS=y
372390
CONFIG_TARGET_ROOTFS_PARTSIZE=1024
391+
CONFIG_USE_LLVM_HOST=y
373392
# CONFIG_PACKAGE_dnsmasq_full_ipset is not set
393+
CONFIG_PACKAGE_kmod-lib-crc-ccitt=y

0 commit comments

Comments
 (0)