diff --git a/.github/workflows/r2s_lean_minimal.yml b/.github/workflows/r2s_lean_minimal.yml index 5909831..2542e30 100644 --- a/.github/workflows/r2s_lean_minimal.yml +++ b/.github/workflows/r2s_lean_minimal.yml @@ -12,8 +12,8 @@ jobs: build: - runs-on: ubuntu-latest - if: github.repository == 'klever1988/nanopi-openwrt' + runs-on: ubuntu-18.04 + if: github.repository == 'CMCCAdmin/nanopi-openwrt' steps: @@ -53,11 +53,10 @@ jobs: . ../../3_prepare_packages.sh . ../../add_openclash.sh . ../../add_passwall.sh - git apply ../../enable_autocore.diff sed -i 's/@LINUX_5_4//' package/lean/luci-app-flowoffload/Makefile . ../../5_mods.sh mv ../../scripts/check_wan4.sh package/base-files/files/usr/bin && sed -i '/exit/i\/bin/sh /usr/bin/check_wan4.sh &' package/base-files/files/etc/rc.local - mv ../../scripts/autoupdate.sh package/base-files/files/root/au.sh && chmod +x package/base-files/files/root/au.sh + - name: Build FriendlyWrt run: . 4_build_image.sh friendlywrt-rk3328 nanopi_r2s.mk @@ -66,7 +65,7 @@ jobs: id: assemble_artifact run: | . x_assemble_artifact.sh - release_tag="R2S-Minimal-$(date +%Y-%m-%d)" + release_tag="R2S-Minimal1-$(date +%Y-%m-%d)" echo "##[set-output name=release_tag;]$release_tag" - name: Create Release id: create_release diff --git a/1_initialization_environment.sh b/1_initialization_environment.sh index 2357f38..d3e9cad 100644 --- a/1_initialization_environment.sh +++ b/1_initialization_environment.sh @@ -5,6 +5,6 @@ git config --global user.email "action@github.com" && git config --global user.n sudo rm -rf /etc/apt/sources.list.d sudo apt-get update sudo apt-get -y --no-install-recommends install build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch python3 unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs gcc-multilib g++-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler -curl https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | sed '/#/d' | sed 's/\\//g' | sed 's/exit 0//g' | sed 's/sudo apt -y install//g' | sed 's/sudo apt-get -y install//g' | sed 's/:i386//g' | xargs sudo apt-get -y --no-install-recommends install +curl https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/852acb5b6511d31a450fd0a8829a0f795b3f21fd/install.sh | sed '/#/d' | sed 's/\\//g' | sed 's/exit 0//g' | sed 's/sudo apt -y install//g' | sed 's/sudo apt-get -y install//g' | sed 's/:i386//g' | xargs sudo apt-get -y --no-install-recommends install docker rmi `docker images -q` sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk /usr/local/share/boost /opt/ghc diff --git a/JUNK/r2s.config.seed b/JUNK/r2s.config.seed index 98a3e20..74abe09 100644 --- a/JUNK/r2s.config.seed +++ b/JUNK/r2s.config.seed @@ -479,4 +479,31 @@ CONFIG_VERSION_REPO="http://downloads.openwrt.org/releases/18.06.1" CONFIG_VERSION_SUPPORT_URL="" CONFIG_WPA_MSG_MIN_PRIORITY=3 +# CONFIG_PACKAGE_mt76-test is not set +# CONFIG_PACKAGE_mt7601u-firmware is not set +# CONFIG_PACKAGE_mt7622bt-firmware is not set +CONFIG_PACKAGE_kmod-mt76=y +CONFIG_PACKAGE_kmod-mt76-core=y +CONFIG_PACKAGE_kmod-mt76-usb=y +# CONFIG_PACKAGE_kmod-mt7601u is not set +CONFIG_PACKAGE_kmod-mt7603=y +CONFIG_PACKAGE_kmod-mt7615-common=y +# CONFIG_PACKAGE_kmod-mt7615-firmware is not set +# CONFIG_PACKAGE_kmod-mt7615e is not set +# CONFIG_PACKAGE_kmod-mt7663-firmware-ap is not set +# CONFIG_PACKAGE_kmod-mt7663-firmware-sta is not set +CONFIG_PACKAGE_kmod-mt7663-usb-sdio=y +# CONFIG_PACKAGE_kmod-mt7663s is not set +CONFIG_PACKAGE_kmod-mt7663u=y +CONFIG_PACKAGE_kmod-mt76x0-common=y +CONFIG_PACKAGE_kmod-mt76x02-common=y +CONFIG_PACKAGE_kmod-mt76x02-usb=y +# CONFIG_PACKAGE_kmod-mt76x0e is not set +CONFIG_PACKAGE_kmod-mt76x0u=y +CONFIG_PACKAGE_kmod-mt76x2=y +CONFIG_PACKAGE_kmod-mt76x2-common=y +CONFIG_PACKAGE_kmod-mt76x2u=y +# CONFIG_PACKAGE_kmod-mt7915e is not set + + CONFIG_PACKAGE_dns2socks=n diff --git a/base_rk3328.seed b/base_rk3328.seed index 8597bd8..3a008bc 100644 --- a/base_rk3328.seed +++ b/base_rk3328.seed @@ -48,5 +48,132 @@ CONFIG_PACKAGE_zstd=y CONFIG_PACKAGE_coremark=y CONFIG_PACKAGE_i2c-tools=y -CONFIG_TARGET_KERNEL_PARTSIZE=32 -CONFIG_TARGET_ROOTFS_PARTSIZE=320 +CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y +CONFIG_PACKAGE_libqmi=y +CONFIG_PACKAGE_luci-proto-qmi=y +CONFIG_PACKAGE_uqmi=y +CONFIG_PACKAGE_qmi-utils=y + +CONFIG_PACKAGE_kmod-usb-gadget-cdc-composite=y +CONFIG_PACKAGE_kmod-usb-net-cdc-eem=y +CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y +CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y +CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y +CONFIG_PACKAGE_kmod-usb-net-cdc-subset=y +CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=y + + +CONFIG_PACKAGE_kmod-usb-serial-option=y +CONFIG_PACKAGE_boost-program_options=y + +CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y +CONFIG_PACKAGE_libmbim=y +CONFIG_PACKAGE_umbim=y +CONFIG_PACKAGE_mbim-utils=y +CONFIG_PACKAGE_comgt=y +CONFIG_PACKAGE_comgt-directip=y +CONFIG_PACKAGE_comgt-ncm=y +CONFIG_PACKAGE_luci-proto-3g=y +CONFIG_DEFAULT_lm-sensors=y +CONFIG_PACKAGE_libsensors=y +CONFIG_PACKAGE_lm-sensors=y +CONFIG_PACKAGE_lm-sensors-detect=y +CONFIG_PACKAGE_lscpu=y +CONFIG_PACKAGE_kmod-usb-ohci-pci=y +CONFIG_PACKAGE_kmod-usb2-pci=y +CONFIG_PACKAGE_libpci=y +CONFIG_PACKAGE_pciutils=y + +CONFIG_DEFAULT_kmod-usb-net=y +CONFIG_DEFAULT_kmod-usb-net-rtl8152=y +CONFIG_PACKAGE_kmod-usb-acm=y +CONFIG_PACKAGE_kmod-usb-core=y +CONFIG_PACKAGE_kmod-usb-dwc2=y +CONFIG_PACKAGE_kmod-usb-dwc3=y +CONFIG_PACKAGE_kmod-usb-ehci=y +CONFIG_PACKAGE_kmod-usb-gadget=y +CONFIG_PACKAGE_kmod-usb-gadget-cdc-composite=y +CONFIG_PACKAGE_kmod-usb-gadget-ehci-debug=y +CONFIG_PACKAGE_kmod-usb-gadget-eth=y +CONFIG_PACKAGE_kmod-usb-gadget-hid=y +CONFIG_PACKAGE_kmod-usb-gadget-mass-storage=y +CONFIG_PACKAGE_kmod-usb-gadget-serial=y +CONFIG_PACKAGE_kmod-usb-hid=y +CONFIG_PACKAGE_kmod-usb-ledtrig-usbport=y +CONFIG_PACKAGE_kmod-usb-lib-composite=y +CONFIG_PACKAGE_kmod-usb-net=y +CONFIG_PACKAGE_kmod-usb-net-asix=y +CONFIG_PACKAGE_kmod-usb-net-asix-ax88179=y +CONFIG_PACKAGE_kmod-usb-net-cdc-eem=y +CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y +CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y +CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y +CONFIG_PACKAGE_kmod-usb-net-cdc-subset=y +CONFIG_PACKAGE_kmod-usb-net-hso=y +CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=y +CONFIG_PACKAGE_kmod-usb-net-ipheth=y +CONFIG_PACKAGE_kmod-usb-net-pl=y +CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y +CONFIG_PACKAGE_kmod-usb-net-rndis=y +CONFIG_PACKAGE_kmod-usb-net-rtl8150=y +CONFIG_PACKAGE_kmod-usb-net-rtl8152=y +CONFIG_PACKAGE_kmod-usb-net-sierrawireless=y +CONFIG_PACKAGE_kmod-usb-ohci=y +CONFIG_PACKAGE_kmod-usb-ohci-pci=y +CONFIG_PACKAGE_kmod-usb-serial=y +CONFIG_PACKAGE_kmod-usb-serial-ch341=y +CONFIG_PACKAGE_kmod-usb-serial-cp210x=y +CONFIG_PACKAGE_kmod-usb-serial-option=y +CONFIG_PACKAGE_kmod-usb-serial-oti6858=y +CONFIG_PACKAGE_kmod-usb-serial-pl2303=y +CONFIG_PACKAGE_kmod-usb-serial-qualcomm=y +CONFIG_PACKAGE_kmod-usb-serial-sierrawireless=y +CONFIG_PACKAGE_kmod-usb-serial-simple=y +CONFIG_PACKAGE_kmod-usb-serial-ti-usb=y +CONFIG_PACKAGE_kmod-usb-serial-wwan=y +CONFIG_PACKAGE_kmod-usb-storage=y +CONFIG_PACKAGE_kmod-usb-storage-extras=y +CONFIG_PACKAGE_kmod-usb-storage-uas=y +CONFIG_PACKAGE_kmod-usb-uhci=y +CONFIG_PACKAGE_kmod-usb-wdm=y +CONFIG_PACKAGE_kmod-usb-yealink=y +CONFIG_PACKAGE_kmod-usb2=y +CONFIG_PACKAGE_kmod-usb2-pci=y +CONFIG_PACKAGE_kmod-usb3=y +CONFIG_PACKAGE_kmod-mt76-usb=y +CONFIG_PACKAGE_kmod-mt7663-usb-sdio=y +CONFIG_PACKAGE_kmod-mt76x02-usb=y +CONFIG_PACKAGE_libusb-1.0=y +CONFIG_PACKAGE_usb-modeswitch=y +CONFIG_PACKAGE_usbreset=y +CONFIG_PACKAGE_usbutils=y + +# CONFIG_PACKAGE_mt76-test is not set +# CONFIG_PACKAGE_mt7601u-firmware is not set +# CONFIG_PACKAGE_mt7622bt-firmware is not set +CONFIG_PACKAGE_kmod-mt76=y +CONFIG_PACKAGE_kmod-mt76-core=y +CONFIG_PACKAGE_kmod-mt76-usb=y +# CONFIG_PACKAGE_kmod-mt7601u is not set +CONFIG_PACKAGE_kmod-mt7603=y +CONFIG_PACKAGE_kmod-mt7615-common=y +# CONFIG_PACKAGE_kmod-mt7615-firmware is not set +# CONFIG_PACKAGE_kmod-mt7615e is not set +# CONFIG_PACKAGE_kmod-mt7663-firmware-ap is not set +# CONFIG_PACKAGE_kmod-mt7663-firmware-sta is not set +CONFIG_PACKAGE_kmod-mt7663-usb-sdio=y +# CONFIG_PACKAGE_kmod-mt7663s is not set +CONFIG_PACKAGE_kmod-mt7663u=y +CONFIG_PACKAGE_kmod-mt76x0-common=y +CONFIG_PACKAGE_kmod-mt76x02-common=y +CONFIG_PACKAGE_kmod-mt76x02-usb=y +# CONFIG_PACKAGE_kmod-mt76x0e is not set +CONFIG_PACKAGE_kmod-mt76x0u=y +CONFIG_PACKAGE_kmod-mt76x2=y +CONFIG_PACKAGE_kmod-mt76x2-common=y +CONFIG_PACKAGE_kmod-mt76x2u=y +# CONFIG_PACKAGE_kmod-mt7915e is not set + + +CONFIG_TARGET_KERNEL_PARTSIZE=256 +CONFIG_TARGET_ROOTFS_PARTSIZE=768 diff --git a/minimal_config.seed b/minimal_config.seed index 0a70776..a467590 100644 --- a/minimal_config.seed +++ b/minimal_config.seed @@ -70,3 +70,29 @@ CONFIG_PACKAGE_luci-app-passwall_INCLUDE_ChinaDNS_NG=y # CONFIG_V2RAY_COMPRESS_UPX is not set CONFIG_DROPBEAR_ECC=y CONFIG_DROPBEAR_ECC_FULL=y + +# CONFIG_PACKAGE_mt76-test is not set +# CONFIG_PACKAGE_mt7601u-firmware is not set +# CONFIG_PACKAGE_mt7622bt-firmware is not set +CONFIG_PACKAGE_kmod-mt76=y +CONFIG_PACKAGE_kmod-mt76-core=y +CONFIG_PACKAGE_kmod-mt76-usb=y +# CONFIG_PACKAGE_kmod-mt7601u is not set +CONFIG_PACKAGE_kmod-mt7603=y +CONFIG_PACKAGE_kmod-mt7615-common=y +# CONFIG_PACKAGE_kmod-mt7615-firmware is not set +# CONFIG_PACKAGE_kmod-mt7615e is not set +# CONFIG_PACKAGE_kmod-mt7663-firmware-ap is not set +# CONFIG_PACKAGE_kmod-mt7663-firmware-sta is not set +CONFIG_PACKAGE_kmod-mt7663-usb-sdio=y +# CONFIG_PACKAGE_kmod-mt7663s is not set +CONFIG_PACKAGE_kmod-mt7663u=y +CONFIG_PACKAGE_kmod-mt76x0-common=y +CONFIG_PACKAGE_kmod-mt76x02-common=y +CONFIG_PACKAGE_kmod-mt76x02-usb=y +# CONFIG_PACKAGE_kmod-mt76x0e is not set +CONFIG_PACKAGE_kmod-mt76x0u=y +CONFIG_PACKAGE_kmod-mt76x2=y +CONFIG_PACKAGE_kmod-mt76x2-common=y +CONFIG_PACKAGE_kmod-mt76x2u=y +# CONFIG_PACKAGE_kmod-mt7915e is not set diff --git a/patch_kernel_5.4.sh b/patch_kernel_5.4.sh index 38ee4fc..0e0d2ec 100644 --- a/patch_kernel_5.4.sh +++ b/patch_kernel_5.4.sh @@ -1,8 +1,8 @@ cd friendlywrt-rk3328 cd kernel/ git apply ../../add_fullconenat.diff -wget https://github.com/armbian/build/raw/master/patch/kernel/rockchip64-dev/RK3328-enable-1512mhz-opp.patch -git apply RK3328-enable-1512mhz-opp.patch +wget https://raw.githubusercontent.com/coolsnowwolf/lede/c39177efcfd9df8ea8e5d8e687d327fe77bfde52/target/linux/rockchip/patches-5.4/003-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch +git apply 003-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch cd ../ git clone https://github.com/openwrt/openwrt && cd openwrt/ git checkout a47279154e08d54df05fa8bf45fe935ebf0df5da