diff --git a/.github/workflows/18.yml b/.github/workflows/18.yml new file mode 100644 index 00000000..cbb4b305 --- /dev/null +++ b/.github/workflows/18.yml @@ -0,0 +1,151 @@ +# +# This is free software, lisence use MIT. +# +# Copyright (C) 2019 Jolly +# +# +# +# Write by Jolly 2019/12/7 +# last update at 2019/12/19 + +name: NanoPi-R1s H5 OpenWrt 18 Build + +on: + push: + paths: + - '.github/workflows/18.yml' + # schedule: + # - cron: 0 20 * * * + # release: + # types: [published] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + + - name: Checkout + uses: actions/checkout@master + with: + ref: master + + - name: Initialization Environment + env: + DEBIAN_FRONTEND: noninteractive + run: | + wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash + sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk + + - name: Install Repo + run: | + git clone https://github.com/friendlyarm/repo + sudo cp repo/repo /usr/bin/ + mkdir friendlywrt-h5 + cd friendlywrt-h5 + repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle + + - name: Download Source + run: | + cd friendlywrt-h5 + rm -f .repo/manifests/h5.xml + cp ../source_xml/h5.xml .repo/manifests/h5.xml + #sudo mkdir -p -m 777 /mnt/storage && mkdir -p friendlywrt /mnt/storage/friendlywrt && sudo mount --bind /mnt/storage/friendlywrt friendlywrt + repo sync -c --no-clone-bundle + cat .repo/manifests/h5.xml + + - name: Merge Lean's Package + run: | + cd friendlywrt-h5 + git clone https://github.com/klever1988/lede + cd friendlywrt + cp -r ../lede/package/lean package/ + #sed -i 's/http.*luci.*/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default + #sed -i 's/http.*feed\/packages.*/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default + #sed -i 's/http.*routing.*/https:\/\/git.openwrt.org\/feed\/routing.git;openwrt-19.07/' feeds.conf.default + #sed -i 's/http.*telephony.*/https:\/\/git.openwrt.org\/feed\/telephony.git;openwrt-19.07/' feeds.conf.default + echo 'src-git rosy https://github.com/rosywrt/luci-theme-rosy.git;openwrt-18.06' >> feeds.conf.default + cat feeds.conf.default + sed -i 's/exit 0//' package/lean/default-settings/files/zzz-default-settings + echo 'chown -R root:root /usr/share/netdata' >> package/lean/default-settings/files/zzz-default-settings + sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' include/target.mk + + - name: Update Feeds + run: | + cd friendlywrt-h5/friendlywrt + ./scripts/feeds update -a + ./scripts/feeds install -a + + - name: Custom Configure File + run: | + cd friendlywrt-h5 + sed -i '/docker/d;/DOCKER/d' ./configs/config_h5 + cat >> ./configs/config_h5 < +# +# +# +# Write by Jolly 2019/12/7 +# last update at 2019/12/19 + +name: NanoPi-R1s H5 OpenWrt 18 Build + +on: + push: + paths: + - '.github/workflows/18t.yml' + # schedule: + # - cron: 0 20 * * * + # release: + # types: [published] + +jobs: + + build: + + runs-on: ubuntu-latest + + steps: + + - name: Checkout + uses: actions/checkout@master + with: + ref: master + + - name: Initialization Environment + env: + DEBIAN_FRONTEND: noninteractive + run: | + wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash + #sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk + + - name: Install Repo + run: | + git clone https://github.com/friendlyarm/repo + sudo cp repo/repo /usr/bin/ + mkdir friendlywrt-h5 + cd friendlywrt-h5 + repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle + + - name: Download Source + run: | + cd friendlywrt-h5 + rm -f .repo/manifests/h5.xml + cp ../source_xml/h5.xml .repo/manifests/h5.xml + #sudo mkdir -p -m 777 /mnt/storage && mkdir -p friendlywrt /mnt/storage/friendlywrt && sudo mount --bind /mnt/storage/friendlywrt friendlywrt + repo sync -c --no-clone-bundle + cat .repo/manifests/h5.xml + + - name: Merge Lean's Package + run: | + cd friendlywrt-h5 + git clone https://github.com/klever1988/lede + cd friendlywrt + cp -r ../lede/package/lean package/ + #sed -i 's/http.*luci.*/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default + #sed -i 's/http.*feed\/packages.*/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default + #sed -i 's/http.*routing.*/https:\/\/git.openwrt.org\/feed\/routing.git;openwrt-19.07/' feeds.conf.default + #sed -i 's/http.*telephony.*/https:\/\/git.openwrt.org\/feed\/telephony.git;openwrt-19.07/' feeds.conf.default + echo 'src-git rosy https://github.com/rosywrt/luci-theme-rosy.git;openwrt-18.06' >> feeds.conf.default + cat feeds.conf.default + sed -i 's/exit 0//' package/lean/default-settings/files/zzz-default-settings + echo 'chown -R root:root /usr/share/netdata' >> package/lean/default-settings/files/zzz-default-settings + cd include + sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk + + - name: Update Feeds + run: | + cd friendlywrt-h5/friendlywrt + ./scripts/feeds update -a + ./scripts/feeds install -a + + - name: Custom Configure File + run: | + cp r1s-h5-config friendlywrt-h5/friendlywrt/.config + exit 0 + cd friendlywrt-h5 + sed -i '/docker/d;/DOCKER/d' ./configs/config_h5 + cat >> ./configs/config_hhh5 < -# +# # # # Write by Jolly 2019/12/7 @@ -12,8 +12,8 @@ name: NanoPi-R1s H5 OpenWrt 19.07 Build on: push: - branches: - - master + paths: + - '.github/workflows/NanoPi-R1s H5 OpenWrt 19.07 Build.yml' # schedule: # - cron: 0 20 * * * # release: @@ -36,83 +36,76 @@ jobs: env: DEBIAN_FRONTEND: noninteractive run: | - wget -O - https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash + #docker rmi `docker images -q` + #sudo rm -rf /usr/share/dotnet /etc/mysql /etc/php + #sudo -E apt-get -y purge azure-cli ghc* zulu* hhvm llvm* firefox google* dotnet* powershell openjdk* mysql* php* + sudo rm -rf /etc/apt/sources.list.d + #sudo -E apt-get update + curl https://raw.githubusercontent.com/friendlyarm/build-env-on-ubuntu-bionic/master/install.sh | bash + #sudo -E apt-get -y autoremove --purge + #sudo -E apt-get clean + sudo rm -rf /usr/share/dotnet /usr/local/lib/android/sdk - name: Install Repo run: | git clone https://github.com/friendlyarm/repo sudo cp repo/repo /usr/bin/ - - - name: Download Source - run: | mkdir friendlywrt-h5 cd friendlywrt-h5 repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle - - name: Merge UpStearm OpenWrt + - name: Download Source run: | cd friendlywrt-h5 - cd .repo/manifests - rm -f ./h5.xml - wget https://raw.githubusercontent.com/skytotwo/NanoPi-R1S-Build-By-Actions/master/source_xml/h5_19.07.xml - cp h5_19.07.xml h5.xml - rm -rf ./h5_19.07.xml + #rm -f .repo/manifests/h5.xml + #cp ../source_xml/h5_19.07.xml .repo/manifests/h5.xml + #sudo mkdir -p -m 777 /mnt/storage && mkdir -p friendlywrt /mnt/storage/friendlywrt && sudo mount --bind /mnt/storage/friendlywrt friendlywrt repo sync -c --no-clone-bundle + cat .repo/manifests/h5.xml - - name: Merge LEDE + - name: Merge Lean's Package run: | cd friendlywrt-h5 - git clone https://github.com/coolsnowwolf/lede + git clone https://github.com/klever1988/lede cd friendlywrt - cp -r ../lede/package/lean package/ - sed -i 's/https:\/\/git.openwrt.org\/project\/luci.git^039ef1f4deba725d3591b159bbc9569885d68131/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default - sed -i 's/https:\/\/git.openwrt.org\/feed\/packages.git^00803ffc91e80b16e9c1603ff32106d42e255923/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default - - - name: Custom Applications - run: | - cd friendlywrt-h5/friendlywrt/package - git clone https://github.com/Baozisoftware/luci-app-koolproxy - - - name: Update Target.mk - run: | - cd friendlywrt-h5/friendlywrt/include - sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk - - - name: Update Feeds - run: | - cd friendlywrt-h5/friendlywrt - ./scripts/feeds update -a - ./scripts/feeds install -a - - - name: Costom Configure File - run: | - cd friendlywrt-h5/friendlywrt - rm -f ./.config* - wget https://raw.githubusercontent.com/skytotwo/NanoPi-R1S-Build-By-Actions/master/r1s-h5-config - cp r1s-h5-config .config - - - name: Download package - if: always() + #cp -r ../lede/package/lean package/ + #sed -i 's/http.*luci.*/https:\/\/github.com\/coolsnowwolf\/luci/' feeds.conf.default + #sed -i 's/http.*feed\/packages.*/https:\/\/github.com\/coolsnowwolf\/packages/' feeds.conf.default + #sed -i 's/http.*routing.*/https:\/\/git.openwrt.org\/feed\/routing.git;openwrt-19.07/' feeds.conf.default + #sed -i 's/http.*telephony.*/https:\/\/git.openwrt.org\/feed\/telephony.git;openwrt-19.07/' feeds.conf.default + #echo 'src-git rosy https://github.com/rosywrt/luci-theme-rosy.git;openwrt-18.06' >> feeds.conf.default + cat feeds.conf.default + #sed -i 's/exit 0//' package/lean/default-settings/files/zzz-default-settings + #echo 'chown -R root:root /usr/share/netdata' >> package/lean/default-settings/files/zzz-default-settings + #cd include + #sed -i 's/dnsmasq /dnsmasq-full default-settings luci /' target.mk + ./scripts/feeds update -a && ./scripts/feeds install -a + + - name: Custom Configure File run: | - cd friendlywrt-h5/friendlywrt - make download -j8 - find dl -size -1024c -exec ls -l {} \; - find dl -size -1024c -exec rm -f {} \; + cd friendlywrt-h5 + #sed -i '/docker/d;/DOCKER/d' ./configs/config_h5 - name: Build OpenWrt run: | cd friendlywrt-h5 + #sed -i 's/make -j$(nproc)/make -j3/' scripts/mk-friendlywrt.sh + cat scripts/mk-friendlywrt.sh ./build.sh nanopi_r1s.mk - + df -h + - name: Zip Files run: | - find friendlywrt-h5/out/ -name "FriendlyWrt_*img*" | xargs -i zip -r {}.zip {} + #find friendlywrt-h5/out/ -name "FriendlyWrt_*img*" | xargs -i zip -r {}.zip {} + gzip friendlywrt-h5/out/*.img - name: Assemble Artifact run: | rm -rf ./artifact/ mkdir -p ./artifact/ - find friendlywrt-h5/out/ -name "FriendlyWrt_*img.zip*" | xargs -i mv -f {} ./artifact/ + #find friendlywrt-h5/out/ -name "FriendlyWrt_*img.zip*" | xargs -i mv -f {} ./artifact/ + mv friendlywrt-h5/out/*img* ./artifact/ + cp friendlywrt-h5/friendlywrt/.config ./artifact/ - name: Upload Artifact uses: actions/upload-artifact@master with: diff --git a/r1s-h5-config b/r1s-h5-config index e7c5a96f..2bd9b9a9 100644 --- a/r1s-h5-config +++ b/r1s-h5-config @@ -1480,12 +1480,12 @@ CONFIG_PACKAGE_zram-swap=y # CONFIG_PACKAGE_zabbix-proxy is not set # CONFIG_PACKAGE_zabbix-sender is not set # CONFIG_PACKAGE_zabbix-server is not set -# CONFIG_PACKAGE_htop is not set +CONFIG_PACKAGE_htop=y # CONFIG_PACKAGE_ipmitool is not set # CONFIG_PACKAGE_monit is not set # CONFIG_PACKAGE_monit-nossl is not set # CONFIG_PACKAGE_muninlite is not set -# CONFIG_PACKAGE_netdata is not set +CONFIG_PACKAGE_netdata=y # CONFIG_PACKAGE_sudo is not set # CONFIG_PACKAGE_syslog-ng is not set @@ -1529,7 +1529,7 @@ CONFIG_PACKAGE_u-boot-nanopi_neo_plus2=y # Extra packages # # CONFIG_PACKAGE_autosamba is not set -# CONFIG_PACKAGE_ipv6helper is not set +CONFIG_PACKAGE_ipv6helper=y # CONFIG_PACKAGE_k3wifi is not set # @@ -1899,7 +1899,7 @@ CONFIG_PACKAGE_kmod-ipt-core=y # CONFIG_PACKAGE_kmod-ipt-dnetmap is not set # CONFIG_PACKAGE_kmod-ipt-extra is not set # CONFIG_PACKAGE_kmod-ipt-filter is not set -# CONFIG_PACKAGE_kmod-ipt-fullconenat is not set +CONFIG_PACKAGE_kmod-ipt-fullconenat=y # CONFIG_PACKAGE_kmod-ipt-fuzzy is not set # CONFIG_PACKAGE_kmod-ipt-geoip is not set # CONFIG_PACKAGE_kmod-ipt-hashlimit is not set @@ -3738,16 +3738,16 @@ CONFIG_PACKAGE_luci-app-hd-idle=y # CONFIG_PACKAGE_luci-app-hnet is not set CONFIG_PACKAGE_luci-app-ipsec-vpnd=y CONFIG_PACKAGE_luci-app-kodexplorer=y -CONFIG_PACKAGE_luci-app-koolproxy=y +#CONFIG_PACKAGE_luci-app-koolproxy=y # CONFIG_PACKAGE_luci-app-lxc is not set # CONFIG_PACKAGE_luci-app-meshwizard is not set # CONFIG_PACKAGE_luci-app-minidlna is not set # CONFIG_PACKAGE_luci-app-mjpg-streamer is not set # CONFIG_PACKAGE_luci-app-mtwifi is not set -CONFIG_PACKAGE_luci-app-mwan3=y -CONFIG_PACKAGE_luci-app-mwan3helper=y +# CONFIG_PACKAGE_luci-app-mwan3 is not set +# CONFIG_PACKAGE_luci-app-mwan3helper is not set # CONFIG_PACKAGE_luci-app-n2n_v2 is not set -# CONFIG_PACKAGE_luci-app-netdata is not set +CONFIG_PACKAGE_luci-app-netdata=y # CONFIG_PACKAGE_luci-app-nft-qos is not set CONFIG_PACKAGE_luci-app-nlbwmon=y # CONFIG_PACKAGE_luci-app-noddos is not set @@ -3790,8 +3790,8 @@ CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_Trojan=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Server=y CONFIG_PACKAGE_luci-app-ssr-plus_INCLUDE_ShadowsocksR_Socks=y # CONFIG_PACKAGE_luci-app-ssrserver-python is not set -# CONFIG_PACKAGE_luci-app-statistics is not set -CONFIG_PACKAGE_luci-app-syncdial=y +CONFIG_PACKAGE_luci-app-statistics=y +# CONFIG_PACKAGE_luci-app-syncdial is not set # CONFIG_PACKAGE_luci-app-tinyproxy is not set CONFIG_PACKAGE_luci-app-transmission=y # CONFIG_PACKAGE_luci-app-travelmate is not set @@ -3805,7 +3805,7 @@ CONFIG_PACKAGE_luci-app-usb-printer=y CONFIG_PACKAGE_luci-app-v2ray-server=y # CONFIG_PACKAGE_luci-app-verysync is not set CONFIG_PACKAGE_luci-app-vlmcsd=y -# CONFIG_PACKAGE_luci-app-vnstat is not set +CONFIG_PACKAGE_luci-app-vnstat=y # CONFIG_PACKAGE_luci-app-vpnbypass is not set CONFIG_PACKAGE_luci-app-vsftpd=y # CONFIG_PACKAGE_luci-app-watchcat is not set @@ -3813,7 +3813,7 @@ CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-wifischedule=y # CONFIG_PACKAGE_luci-app-wireguard is not set CONFIG_PACKAGE_luci-app-wol=y -# CONFIG_PACKAGE_luci-app-wrtbwmon is not set +CONFIG_PACKAGE_luci-app-wrtbwmon=y CONFIG_PACKAGE_luci-app-xlnetacc=y CONFIG_PACKAGE_luci-app-zerotier=y @@ -4210,7 +4210,7 @@ CONFIG_PACKAGE_transmission-web-control=y # CONFIG_PACKAGE_aria2 is not set # CONFIG_PACKAGE_atftp is not set # CONFIG_PACKAGE_atftpd is not set -# CONFIG_PACKAGE_curl is not set +CONFIG_PACKAGE_curl=y # CONFIG_PACKAGE_gnurl is not set # CONFIG_PACKAGE_lftp is not set # CONFIG_PACKAGE_rosy-file-server is not set @@ -4220,7 +4220,7 @@ CONFIG_PACKAGE_transmission-web-control=y CONFIG_PACKAGE_vsftpd-alt=y CONFIG_VSFTPD_USE_UCI_SCRIPTS=y # CONFIG_PACKAGE_vsftpd-tls is not set -# CONFIG_PACKAGE_wget is not set +CONFIG_PACKAGE_wget=y # CONFIG_PACKAGE_wget-nossl is not set # @@ -4260,7 +4260,7 @@ CONFIG_PACKAGE_iptables-mod-conntrack-extra=y # CONFIG_PACKAGE_iptables-mod-dnetmap is not set # CONFIG_PACKAGE_iptables-mod-extra is not set # CONFIG_PACKAGE_iptables-mod-filter is not set -# CONFIG_PACKAGE_iptables-mod-fullconenat is not set +CONFIG_PACKAGE_iptables-mod-fullconenat=y # CONFIG_PACKAGE_iptables-mod-fuzzy is not set # CONFIG_PACKAGE_iptables-mod-geoip is not set # CONFIG_PACKAGE_iptables-mod-hashlimit is not set @@ -4515,7 +4515,7 @@ CONFIG_PACKAGE_ip-full=y # CONFIG_PACKAGE_lldpd is not set # CONFIG_PACKAGE_mcproxy is not set # CONFIG_PACKAGE_mrmctl is not set -CONFIG_PACKAGE_mwan3=y +# CONFIG_PACKAGE_mwan3 is not set # CONFIG_PACKAGE_nstat is not set # CONFIG_PACKAGE_olsrd is not set # CONFIG_PACKAGE_prince is not set @@ -5267,7 +5267,7 @@ CONFIG_PACKAGE_partx-utils=y # CONFIG_PACKAGE_nano is not set # CONFIG_PACKAGE_vim is not set # CONFIG_PACKAGE_vim-full is not set -# CONFIG_PACKAGE_vim-fuller is not set +CONFIG_PACKAGE_vim-fuller=y # CONFIG_PACKAGE_vim-help is not set # CONFIG_PACKAGE_vim-runtime is not set # CONFIG_PACKAGE_zile is not set @@ -5380,7 +5380,7 @@ CONFIG_PACKAGE_bash=y # CONFIG_PACKAGE_rtty-nossl is not set # CONFIG_PACKAGE_rtty-openssl is not set # CONFIG_PACKAGE_rtty-wolfssl is not set -# CONFIG_PACKAGE_screen is not set +CONFIG_PACKAGE_screen=y # CONFIG_PACKAGE_script-utils is not set # CONFIG_PACKAGE_serialconsole is not set # CONFIG_PACKAGE_setterm is not set @@ -5449,7 +5449,7 @@ CONFIG_PACKAGE_zoneinfo-asia=y # CONFIG_PACKAGE_canutils is not set # CONFIG_PACKAGE_cmdpad is not set # CONFIG_PACKAGE_coap-client is not set -# CONFIG_PACKAGE_collectd is not set +CONFIG_PACKAGE_collectd=y # CONFIG_PACKAGE_containerd is not set # CONFIG_PACKAGE_coremark is not set CONFIG_PACKAGE_coreutils=y @@ -5715,7 +5715,7 @@ CONFIG_STRACE_NONE=y # CONFIG_PACKAGE_taskwarrior is not set # CONFIG_PACKAGE_tini is not set # CONFIG_PACKAGE_tracertools is not set -# CONFIG_PACKAGE_tree is not set +CONFIG_PACKAGE_tree=y # CONFIG_PACKAGE_triggerhappy is not set # CONFIG_PACKAGE_udns-dnsget is not set # CONFIG_PACKAGE_udns-ex-rdns is not set @@ -5749,3 +5749,10 @@ CONFIG_PACKAGE_usb-modeswitch=y # font-utils # # CONFIG_PACKAGE_fontconfig is not set + +#CONFIG_FEED_rosy is not set +CONFIG_PACKAGE_luci-theme-rosy=y +CONFIG_PACKAGE_collectd-mod-ping=y +CONFIG_PACKAGE_collectd-mod-thermal=y +CONFIG_PACKAGE_collectd-mod-cpufreq=y + diff --git a/source_xml/h5.xml b/source_xml/h5.xml index 6fb6b238..03d95ad4 100644 --- a/source_xml/h5.xml +++ b/source_xml/h5.xml @@ -3,24 +3,19 @@ - - - - + - + - - + + diff --git a/source_xml/h5_19.07.xml b/source_xml/h5_19.07.xml index c630c7de..5471f045 100644 --- a/source_xml/h5_19.07.xml +++ b/source_xml/h5_19.07.xml @@ -3,24 +3,19 @@ - - - - + - + - - + + @@ -28,7 +23,7 @@ - +