some changes

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

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