merge lean

.github/workflows/R1S-H5-Autobuild.yml

@@ -31,6 +31,9 @@ jobs:
         env:
           DEBIAN_FRONTEND: noninteractive
         run: |
+          docker rmi `docker images -q`
+          sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php /etc/apt/sources.list.d
+          sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* mysql* php*
           sudo -E apt-get update
           sudo -E apt-get clean
           sudo wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash
@@ -56,8 +59,20 @@ jobs:
       - name: Merge Lean's OpenWrt source
         run: |
           cd friendlywrt-h5/friendlywrt
+          # sudo mkdir -p -m 777 /mnt/openwrt/bin /mnt/openwrt/build_dir/host /mnt/openwrt/build_dir/hostpkg /mnt/openwrt/dl /mnt/openwrt/feeds /mnt/openwrt/staging_dir
+          # ln -s /mnt/openwrt/bin ./bin
+          # mkdir -p ./build_dir/host && ln -s /mnt/openwrt/build_dir/host ./build_dir/host
+          # mkdir -p ./build_dir/host && ln -s /mnt/openwrt/build_dir/hostpkg ./build_dir/hostpkg
+          # ln -s /mnt/openwrt/dl ./dl
+          # ln -s /mnt/openwrt/feeds ./feeds
+          # ln -s /mnt/openwrt/staging_dir ./staging_dir               
           cp -r ../../lede/package/lean package/
-          sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' include/target.mk 
+          cp -r ../../lede/tools/upx ./tools
+          cp -r ../../lede/tools/ucl ./tools
+          sed --in-place 's/tools-y += mtools dosfstools libressl/tools-y += mtools dosfstools libressl upx ucl/' ./tools/Makefile
+          sed --in-place 's/# builddir dependencies/$(curdir)\/upx\/compile := $(curdir)\/ucl\/compile/' ./tools/Makefile
+          cp -r ../../lede/package/libs/librpc package/libs/
+          cp -f ../../lede/feeds.conf.default ./feeds.conf.default 
 
       - name: Update and install feeds
         run: |
@@ -85,6 +100,7 @@ jobs:
         if: always()
         run: |
           cd friendlywrt-h5
+          sed --in-place 's/make -j$(nproc) V=s/make -j1 V=s/' ./scripts/mk-friendlywrt.sh
           echo "Start building..."
           ./build.sh nanopi_r1s.mk
 

R1S-H5.diffconfig

@@ -1,15 +1,88 @@
-CONFIG_TARGET_sunxi=y
-CONFIG_TARGET_sunxi_cortexa53=y
-CONFIG_TARGET_sunxi_cortexa53_DEVICE_sun50i-h5-nanopi-neo-plus2=y
+CONFIG_TARGET_allwinner_h5=y
+CONFIG_TARGET_allwinner_h5_Default=y
+CONFIG_TARGET_BOARD="allwinner-h5"
+CONFIG_PACKAGE_kmod-crypto-acompress=y
+CONFIG_PACKAGE_kmod-crypto-aead=y
+CONFIG_PACKAGE_kmod-crypto-authenc=y
+CONFIG_PACKAGE_kmod-crypto-cbc=y
+CONFIG_PACKAGE_kmod-crypto-crc32c=y
+CONFIG_PACKAGE_kmod-crypto-ctr=y
+CONFIG_PACKAGE_kmod-crypto-deflate=y
+CONFIG_PACKAGE_kmod-crypto-des=y
+CONFIG_PACKAGE_kmod-crypto-echainiv=y
+CONFIG_PACKAGE_kmod-crypto-gcm=y
+CONFIG_PACKAGE_kmod-crypto-gf128=y
+CONFIG_PACKAGE_kmod-crypto-ghash=y
+CONFIG_PACKAGE_kmod-crypto-hash=y
+CONFIG_PACKAGE_kmod-crypto-hmac=y
+CONFIG_PACKAGE_kmod-crypto-iv=y
+CONFIG_PACKAGE_kmod-crypto-manager=y
+CONFIG_PACKAGE_kmod-crypto-md5=y
+CONFIG_PACKAGE_kmod-crypto-null=y
+CONFIG_PACKAGE_kmod-crypto-pcompress=y
+CONFIG_PACKAGE_kmod-crypto-rng=y
+CONFIG_PACKAGE_kmod-crypto-seqiv=y
+CONFIG_PACKAGE_kmod-crypto-sha1=y
+CONFIG_PACKAGE_kmod-crypto-sha256=y
+CONFIG_PACKAGE_kmod-crypto-wq=y
+CONFIG_PACKAGE_kmod-cryptodev=y
+CONFIG_PACKAGE_kmod-cfg80211=y
+CONFIG_PACKAGE_kmod-mac80211=y
+CONFIG_PACKAGE_collectd=y
+CONFIG_PACKAGE_collectd-mod-cpu=y
+CONFIG_PACKAGE_collectd-mod-interface=y
+CONFIG_PACKAGE_collectd-mod-iwinfo=y
+CONFIG_PACKAGE_collectd-mod-load=y
+CONFIG_PACKAGE_collectd-mod-memory=y
+CONFIG_PACKAGE_collectd-mod-network=y
+CONFIG_PACKAGE_collectd-mod-rrdtool=y
+CONFIG_PACKAGE_collectd-mod-thermal=y
+CONFIG_PACKAGE_collectd-mod-uptime=y
+CONFIG_PACKAGE_collectd-mod-wireless=y
+CONFIG_PACKAGE_ar3k-firmware=y
+CONFIG_PACKAGE_ath6k-firmware=y
+CONFIG_PACKAGE_ath9k-htc-firmware=y
+CONFIG_PACKAGE_brcmfmac-firmware-43430-sdio=y
+CONFIG_PACKAGE_brcmfmac-firmware-usb=y
+CONFIG_PACKAGE_carl9170-firmware=y
+CONFIG_PACKAGE_wireless-regdb=y
+CONFIG_PACKAGE_wpad=y
+CONFIG_PACKAGE_iw=y
+CONFIG_PACKAGE_iwinfo=y
+CONFIG_TARGET_ROOTFS_PARTSIZE=512
 
 # CONFIG_PACKAGE_dnsmasq is not set
 CONFIG_PACKAGE_dnsmasq-full=y
-CONFIG_PACKAGE_dnsmasq_full_auth=y
-CONFIG_PACKAGE_dnsmasq_full_conntrack=y
-CONFIG_PACKAGE_dnsmasq_full_dhcp=y
-CONFIG_PACKAGE_dnsmasq_full_dhcpv6=y
-CONFIG_PACKAGE_dnsmasq_full_dnssec=y
-CONFIG_PACKAGE_dnsmasq_full_ipset=y
-CONFIG_PACKAGE_dnsmasq_full_noid=y
-CONFIG_PACKAGE_dnsmasq_full_tftp=y
 
+CONFIG_PACKAGE_luci=y
+CONFIG_PACKAGE_luci-app-openvpn=y
+CONFIG_PACKAGE_luci-app-openvpn-server=y
+CONFIG_PACKAGE_luci-app-ssr-plus=y
+CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Shadowsocks=y
+CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Simple_obfs=y
+CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_V2ray_plugin=y
+CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_V2ray=y
+CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Trojan=y
+CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Kcptun=y
+CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Socks=y
+# The above is the default config try not to modified it
+
+# 以下为可选配置
+# Addition option
+CONFIG_PACKAGE_luci-app-adbyby-plus=y
+CONFIG_PACKAGE_luci-app-aria2=y
+CONFIG_PACKAGE_luci-app-flowoffload=y
+CONFIG_PACKAGE_luci-app-baidupcs-web=y
+CONFIG_PACKAGE_luci-app-verysync=y
+CONFIG_PACKAGE_luci-app-vlmcsd=y
+CONFIG_PACKAGE_luci-app-wol=y
+
+CONFIG_PACKAGE_python3=y
+CONFIG_PACKAGE_bash=y
+CONFIG_PACKAGE_tcpdump=y
+
+# unblockmusic需加入wget依赖
+CONFIG_PACKAGE_wget=y
+CONFIG_PACKAGE_luci-app-unblockmusic=y
+
+CONFIG_PACKAGE_bash=y

README.md

@@ -1,3 +1,8 @@
+## 项目迁移
+
+1. 这个repo由于名字太长，编译uclibs会出现[No such file or directory这个错误](https://github.com/coolsnowwolf/lede/issues/4192#issuecomment-609736953)
+2. 现已转到[NanoR1s](https://github.com/i6o6i/NanoR1s)
+
 <p align=center>
   <br>
   <span>NanoPi R1S-H5 OpenWrt Autobuild</span>
@@ -20,22 +25,14 @@
 
 
 
+
 ## Usage
 
 1. Fork [this repository](https://github.com/tjuyy/NanoPi-R1S-H5-Openwrt-Autobuild)
-2. Click the `Star` button of your own forked repository or `Create a new release` in your forked repository 
-3. Github Actions workflow will be triggered and run automaticlly
-4. SSH to tmate using the link in the "SSH connection to Actions" step
-5. Run code in tmux
-    ```shell
-    cd friendlywrt-h5/friendlywrt
-    make menuconfig
-    ``` 
-6. Exit the SSH connection, then the workflow will be running again
-    ```shell
-    exit
-    ````
-7. Wait completion of the workflow and download files from `Aritifact`
+2. Modified R1S-H5.diffconfig to add some package if necessary 
+3. Click the `Star` button of your own forked repository or `Create a new release` in your forked repository 
+4. Github Actions workflow will be triggered and run automaticlly
+5. Wait completion of the workflow and download files from `Aritifact`
 
 ## Info