yanistyle/nanopi-openwrt-r1s-h3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some changes

Browse Source
This commit is contained in:
klever
2020-03-19 18:05:09 +01:00
parent 6813353af2
commit c478752fd4
12 changed files with 77 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/r1s_lean.yml vendored
View File

@@ -12,12 +12,12 @@ on:
jobs:
build:
runs-on: ubuntu-latest
if: github.repository == 'klever1988/nanopi-openwrt'
steps:
- name: Checkout
uses: actions/checkout@master
with:
@@ -32,18 +32,18 @@ jobs:
sudo apt-get -y install bc build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler
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/
- name: Init 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
repo sync -c --no-clone-bundle -j8
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1
repo sync -c --no-tags --no-clone-bundle -j8
- name: Mods
run: |
@@ -72,20 +72,14 @@ jobs:
rm -rf luci-theme-argon
git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git
cd ../../
sed -i '/exit/i\mv /etc/rc.d/S25dockerd /etc/rc.d/S92dockerd && sed -i "s/START=25/START=92/g" S92dockerd' package/lean/default-settings/files/zzz-default-settings
git apply ../../enable_autocore.diff
sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings
sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings
sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config
sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings
sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner
- name: Mod luci
run: |
cd friendlywrt-h5/friendlywrt
./scripts/feeds update -a && ./scripts/feeds install -a
sed -i '/Load Average/i\<tr><td width="33%"><%:CPU Temperature%></td><td><%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%></td></tr>' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
sed -i 's/pcdata(boardinfo.system or "?")/"ARMv8"/' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
- name: Build FriendlyWrt
run: |
cd friendlywrt-h5
@@ -143,12 +137,13 @@ jobs:
draft: false
prerelease: false
- name: Upload Release Asset
id: upload-release-asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.sec_token }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./artifact.zip
asset_name: ${{ steps.assemble_artifact.outputs.release_tag }}-ROM.zip
asset_content_type: application/zip

35
.github/workflows/r1s_lean_h3.yml vendored
View File

@@ -2,7 +2,7 @@ name: r1s(H3) Lean版openwrt
on:
push:
branches:
branches:
- master
paths:
- '.github/workflows/r1s_lean_h3.yml_'
@@ -12,12 +12,12 @@ on:
jobs:
build:
runs-on: ubuntu-latest
if: github.repository == 'klever1988/nanopi-openwrt'
steps:
- name: Checkout
uses: actions/checkout@master
with:
@@ -32,19 +32,19 @@ jobs:
sudo apt-get -y install bc build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler
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/
- name: Init Source
run: |
mkdir friendlywrt-h3
cd friendlywrt-h3
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h3.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle
repo sync -c --no-clone-bundle -j8
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master -m h3.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1
repo sync -c --no-tags --no-clone-bundle -j8
- name: Mods
run: |
cd friendlywrt-h3
@@ -75,20 +75,14 @@ jobs:
rm -rf luci-theme-argon
git clone -b 18.06 https://github.com/jerrykuku/luci-theme-argon.git
cd ../../
sed -i '/exit/i\mv /etc/rc.d/S25dockerd /etc/rc.d/S92dockerd && sed -i "s/START=25/START=92/g" S92dockerd' package/lean/default-settings/files/zzz-default-settings
git apply ../../enable_autocore.diff
sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings
sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings
sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config
sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings
sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner
- name: Mod luci
run: |
cd friendlywrt-h3/friendlywrt
./scripts/feeds update -a && ./scripts/feeds install -a
sed -i '/Load Average/i\<tr><td width="33%"><%:CPU Temperature%></td><td><%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%></td></tr>' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
sed -i 's/pcdata(boardinfo.system or "?")/"ARMv7"/' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
- name: Build FriendlyWrt
run: |
cd friendlywrt-h3
@@ -146,12 +140,13 @@ jobs:
draft: false
prerelease: false
- name: Upload Release Asset
id: upload-release-asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.sec_token }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./artifact.zip
asset_name: ${{ steps.assemble_artifact.outputs.release_tag }}-ROM.zip
asset_content_type: application/zip

15
.github/workflows/r1s_lienol.yml vendored
View File

@@ -42,9 +42,9 @@ jobs:
run: |
mkdir friendlywrt-h5
cd friendlywrt-h5
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle
repo sync -c --no-clone-bundle -j8
cd friendlywrt/ && git fetch
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m h5.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1
repo sync -c --no-tags --no-clone-bundle -j8
cd friendlywrt/ && git fetch --unshallow
- name: Mods
run: |
@@ -60,19 +60,12 @@ jobs:
git rebase adc1a9a3676b8d7be1b48b5aed185a94d8e42728^ --onto tmp -X theirs
git revert --no-edit f092ca098e80c667b10cdd1dba328506a2673c1d
git checkout upstream/dev-19.07 -- feeds.conf.default
git apply ../../enable_autocore.diff
sed -i '/ucl upx/d' tools/Makefile
sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings
sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config
sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner
- name: Mod luci
run: |
cd friendlywrt-h5/friendlywrt
./scripts/feeds update -a && ./scripts/feeds install -a
ln -s /usr/bin/upx staging_dir/host/bin/upx
sed -i '/Load Average/i\<div class="tr"><div class="td left" width="33%"><%:CPU Temperature%></div><div class="td left" id="_cputemp"><%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%></div></div>' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
sed -i 's/pcdata(boardinfo.system or "?")/"ARMv8"/' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
- name: Build FriendlyWrt
run: |

18
.github/workflows/r2s_lean.yml vendored
View File

@@ -80,21 +80,12 @@ jobs:
cd ../../
git apply ../../enable_autocore.diff
git apply ../../fix_cpufreq.diff
#sed -i '/exit/i\mv /etc/rc.d/S25dockerd /etc/rc.d/S92dockerd && sed -i "s/START=25/START=92/g" S92dockerd' package/lean/default-settings/files/zzz-default-settings
sed -i '/exit/i\/etc/init.d/dockerd disabled' package/lean/default-settings/files/zzz-default-settings
sed -i '/uci commit luci/i\uci set luci.main.mediaurlbase="/luci-static/argon"' package/lean/default-settings/files/zzz-default-settings
sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/lean/default-settings/files/zzz-default-settings
#sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config
sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config
sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings
sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner
#rm target/linux/rockchip-rk3328/base-files/etc/modules.d/10-rtl8821cu
- name: Mod luci
run: |
cd friendlywrt-rk3328/friendlywrt
./scripts/feeds update -a && ./scripts/feeds install -a
sed -i '/Load Average/i\<tr><td width="33%"><%:CPU Temperature%></td><td><%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%></td></tr>' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
sed -i 's/pcdata(boardinfo.system or "?")/"ARMv8"/' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
- name: Build FriendlyWrt
run: |
@@ -126,12 +117,13 @@ jobs:
draft: false
prerelease: false
- name: Upload Release Asset
id: upload-release-asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.sec_token }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./artifact.zip
asset_name: ${{ steps.assemble_artifact.outputs.release_tag }}-ROM.zip
asset_content_type: application/zip

11
.github/workflows/r2s_lean_minimal.yml vendored
View File

@@ -67,6 +67,8 @@ jobs:
CONFIG_PACKAGE_htop=y
CONFIG_PACKAGE_diffutils=y
CONFIG_PACKAGE_vim-fuller=y
CONFIG_PACKAGE_pv=y
CONFIG_PACKAGE_unzip=y
CONFIG_PACKAGE_luci-app-frpc=y
CONFIG_PACKAGE_luci-app-netdata=y
CONFIG_LIBSODIUM_MINIMAL=y
@@ -120,7 +122,6 @@ jobs:
# CONFIG_PACKAGE_kmod-cryptodev is not set
# CONFIG_V2RAY_COMPRESS_UPX is not set
' >> configs/config_rk3328
# CONFIG_PACKAGE_luci-app-cpufreq is not set
cd friendlywrt
git config --local user.email "action@github.com" && git config --local user.name "GitHub Action"
git remote add upstream https://github.com/coolsnowwolf/lede && git fetch upstream
@@ -150,13 +151,6 @@ jobs:
sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner
- name: Mod luci
run: |
cd friendlywrt-rk3328/friendlywrt
./scripts/feeds update -a && ./scripts/feeds install -a
sed -i '/Load Average/i\<tr><td width="33%"><%:CPU Temperature%></td><td><%=luci.sys.exec("cut -c1-2 /sys/class/thermal/thermal_zone0/temp")%></td></tr>' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
sed -i 's/pcdata(boardinfo.system or "?")/"ARMv8"/' feeds/luci/modules/luci-mod-admin-full/luasrc/view/admin_status/index.htm
- name: Build FriendlyWrt
run: |
cd friendlywrt-rk3328
@@ -196,3 +190,4 @@ jobs:
asset_path: ./artifact.zip
asset_name: ${{ steps.assemble_artifact.outputs.release_tag }}-ROM.zip
asset_content_type: application/zip

29
.github/workflows/r2s_lienol.yml vendored
View File

@@ -2,7 +2,7 @@ name: r2s Lienol版openwrt
on:
push:
branches:
branches:
- master
paths:
- '.github/workflows/r2s_lienol.yml_'
@@ -12,12 +12,12 @@ on:
jobs:
build:
runs-on: ubuntu-latest
if: github.repository == 'klever1988/nanopi-openwrt'
steps:
- name: Checkout
uses: actions/checkout@master
with:
@@ -32,12 +32,12 @@ jobs:
sudo apt-get -y install bc build-essential asciidoc binutils bzip2 gawk gettext git libncurses5-dev libz-dev patch unzip zlib1g-dev lib32gcc1 libc6-dev-i386 subversion flex uglifyjs git-core gcc-multilib p7zip p7zip-full msmtp libssl-dev texinfo libglib2.0-dev xmlto qemu-utils upx libelf-dev autoconf automake libtool autopoint device-tree-compiler
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/
- name: Init Source
run: |
mkdir friendlywrt-rk3328
@@ -45,11 +45,11 @@ jobs:
repo init -u https://github.com/friendlyarm/friendlywrt_manifests -b master-v19.07.1 -m rk3328.xml --repo-url=https://github.com/friendlyarm/repo --no-clone-bundle --depth=1
repo sync -c --no-tags --no-clone-bundle -j8
cd friendlywrt/ && git fetch --unshallow
- name: Patch Kernel
run: |
. patch_kernel_5.4.22.sh
- name: Mods
run: |
cd friendlywrt-rk3328
@@ -68,13 +68,9 @@ jobs:
git checkout upstream/dev-19.07 -- feeds.conf.default
sed -i '/exit/i\chown -R root:root /usr/share/netdata/web' package/default-settings/files/zzz-default-settings
sed -i 's/option fullcone\t1/option fullcone\t0/' package/network/config/firewall/files/firewall.config
sed -i '/exit/i\find /etc/rc.d/ -name *docker* -delete' package/lean/default-settings/files/zzz-default-settings
sed -i '/8.8.8.8/d' package/base-files/files/root/setup.sh
echo -e '\nDYC Build\n' >> package/base-files/files/etc/banner
#sed -i '/#/d' target/linux/rockchip-rk3328/config-4.14 #fix compile error
#sed -i '/CONFIG_BLK_CGROUP/a\CONFIG_DEBUG_BLK_CGROUP=y' target/linux/rockchip-rk3328/config-4.14 #as above
#sed -i '/CONFIG_BLK_CGROUP/a\CONFIG_CFS_BANDWIDTH=y' target/linux/rockchip-rk3328/config-4.14 #as above
#sed -i '/CONFIG_BLK_CGROUP/a\CONFIG_RT_GROUP_SCHED=y' target/linux/rockchip-rk3328/config-4.14 #as above
#sed -i '/CONFIG_BLK_CGROUP/a\CONFIG_CGROUP_FREEZER=y' target/linux/rockchip-rk3328/config-4.14 #as above
sed -i '/CONFIG_BLK_CGROUP/a\CONFIG_CGROUP_PERF=y' target/linux/rockchip-rk3328/config-4.14 #as above
- name: Mod luci
@@ -89,7 +85,7 @@ jobs:
cd friendlywrt-rk3328
sed -i 's/set -eu/set -u/' scripts/mk-friendlywrt.sh
./build.sh nanopi_r2s.mk
- name: Zip Files
run: |
gzip friendlywrt-rk3328/out/*.img
@@ -114,12 +110,13 @@ jobs:
draft: false
prerelease: false
- name: Upload Release Asset
id: upload-release-asset
id: upload-release-asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.sec_token }}
with:
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
upload_url: ${{ steps.create_release.outputs.upload_url }} # This pulls from the CREATE RELEASE step above, referencing it's ID to get its outputs object, which include a `upload_url`. See this blog post for more info: https://jasonet.co/posts/new-features-of-github-actions/#passing-data-to-future-steps
asset_path: ./artifact.zip
asset_name: ${{ steps.assemble_artifact.outputs.release_tag }}-ROM.zip
asset_content_type: application/zip

4
.github/workflows/r2s_lienol_from_lean.yml vendored
View File

@@ -67,6 +67,8 @@ jobs:
CONFIG_PACKAGE_htop=y
CONFIG_PACKAGE_diffutils=y
CONFIG_PACKAGE_vim-fuller=y
CONFIG_PACKAGE_pv=y
CONFIG_PACKAGE_unzip=y
CONFIG_PACKAGE_luci-app-frpc=y
CONFIG_PACKAGE_luci-app-netdata=y
CONFIG_LIBSODIUM_MINIMAL=y
@@ -181,4 +183,4 @@ jobs:
asset_path: ./artifact.zip
asset_name: ${{ steps.assemble_artifact.outputs.release_tag }}-ROM.zip
asset_content_type: application/zip