diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index 54e3148..9fd3108 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -35,12 +35,13 @@ jobs: sudo apt update; sudo apt -y --no-install-recommends install pv jq \ ack antlr3 asciidoc autoconf automake autopoint binutils bison build-essential \ - bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib \ - git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev \ - libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz \ - mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pyelftools \ - libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip \ - vim wget xmlto xxd zlib1g-dev + bzip2 ccache clang cmake cpio curl device-tree-compiler ecj fastjar flex gawk gettext gcc-multilib \ + g++-multilib git gnutls-dev gperf haveged help2man intltool lib32gcc-s1 libc6-dev-i386 libelf-dev \ + libglib2.0-dev libgmp3-dev libltdl-dev libmpc-dev libmpfr-dev libncurses5-dev libncursesw5 \ + libncursesw5-dev libpython3-dev libreadline-dev libssl-dev libtool lld llvm lrzsz mkisofs msmtp \ + nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pip python3-ply \ + python3-docutils python3-pyelftools qemu-utils re2c rsync scons squashfs-tools subversion swig \ + texinfo uglifyjs upx-ucl unzip vim wget xmlto xxd zlib1g-dev ' & sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk /opt/hostedtoolcache diff --git a/r6s.config.seed b/r6s.config.seed new file mode 100644 index 0000000..bdb0304 --- /dev/null +++ b/r6s.config.seed @@ -0,0 +1,41 @@ +CONFIG_TARGET_rockchip=y +CONFIG_TARGET_rockchip_armv8=y +CONFIG_TARGET_rockchip_armv8_DEVICE_friendlyarm_nanopi-r6s=y + +CONFIG_TARGET_OPTIMIZATION="-O3 -pipe" +CONFIG_TARGET_ROOTFS_PARTSIZE=640 + + +CONFIG_PACKAGE_luci-app-adbyby-plus=y +CONFIG_PACKAGE_luci-app-ddnsto=y +CONFIG_PACKAGE_luci-app-dockerman=y +CONFIG_DOCKER_OPTIONAL_FEATURES=y +CONFIG_PACKAGE_luci-app-godproxy=y +CONFIG_PACKAGE_luci-app-netdata=y +CONFIG_PACKAGE_luci-app-openclash=y +CONFIG_PACKAGE_luci-app-cpufreq=y +CONFIG_PACKAGE_luci-app-passwall=y +CONFIG_PACKAGE_luci-app-qbittorrent=y +CONFIG_PACKAGE_luci-app-statistics=y +CONFIG_PACKAGE_luci-app-transmission=y +CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-theme-openwrt=y +CONFIG_PACKAGE_luci-theme-openwrt-2020=y +CONFIG_PACKAGE_collectd-mod-ping=y +CONFIG_PACKAGE_collectd-mod-thermal=y + + +CONFIG_PACKAGE_kmod-gpu-lima=y +CONFIG_PACKAGE_kmod-ath9k-htc=y +CONFIG_PACKAGE_kmod-mt76x0u=y +CONFIG_PACKAGE_kmod-mt76x2u=y +CONFIG_PACKAGE_kmod-r8125=y +CONFIG_PACKAGE_kmod-rtw88=y +CONFIG_PACKAGE_rtl8821ce-firmware=y + +CONFIG_PACKAGE_iw=y +CONFIG_PACKAGE_iwinfo=y +CONFIG_PACKAGE_wpad-basic-wolfssl=y +CONFIG_DRIVER_11AC_SUPPORT=y +CONFIG_DRIVER_11N_SUPPORT=y +CONFIG_DRIVER_11W_SUPPORT=y diff --git a/scripts/patches.sh b/scripts/patches.sh index 9ee5757..73b4215 100644 --- a/scripts/patches.sh +++ b/scripts/patches.sh @@ -93,10 +93,24 @@ case $DEVICE in ;; esac +# add r6s support to Lean's repo +if [[ $DEVICE == 'r6s' ]]; then + pip3 install pylibfdt + cd ~ && rm -rf immortalwrt/ && git clone -b master --depth=1 https://github.com/immortalwrt/immortalwrt && cd immortalwrt + rsync -a --delete target/linux/rockchip/. ~/lede/target/linux/rockchip/. && rsync -a --delete target/linux/generic/. ~/lede/target/linux/generic/. && rsync -a --delete package/boot/. ~/lede/package/boot/. + cd ~/lede + wget https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-6.1/952-add-net-conntrack-events-support-multiple-registrant.patch + wget https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/hack-6.1/953-net-patch-linux-kernel-to-support-shortcut-fe.patch + mv *.patch target/linux/generic/hack-6.1/ + wget https://github.com/coolsnowwolf/lede/raw/master/target/linux/generic/pending-6.1/613-netfilter_optional_tcp_window_check.patch + mv *.patch target/linux/generic/pending-6.1/ + git diff +fi + # add r1s support to Lean's repo if [[ $DEVICE == 'r1s' ]]; then cd ~ && rm -rf immortalwrt/ && git clone -b openwrt-18.06-k5.4 --depth=1 https://github.com/immortalwrt/immortalwrt && cd immortalwrt - cp -a target/linux/sunxi/. ~/lede/target/linux/sunxi/. && cp -a package/boot/. ~/lede/package/boot/. + rsync -a --delete target/linux/sunxi/. ~/lede/target/linux/sunxi/. && rsync -a --delete package/boot/. ~/lede/package/boot/. cd ~/lede sed -i 's/kmod-rtl8189es//;s/wpad-basic-openssl/wpad-basic-wolfssl/' target/linux/sunxi/image/cortexa53.mk merge_package https://github.com/immortalwrt/immortalwrt/branches/openwrt-18.06-k5.4/package/emortal/autocore