From 7bf707755cfb75af58305c9eeaa22f10e189344a Mon Sep 17 00:00:00 2001 From: John Doe Date: Thu, 26 Aug 2021 09:20:16 +0800 Subject: [PATCH] build: prepare for snapshot branch --amend --amend --amend --amend --- .github/workflows/dispatch.yml | 9 ++++++--- .github/workflows/lo-test.yml | 19 ++++++++++--------- extra_packages.seed | 3 ++- patches.sh | 34 +++++++++++++++++++++++++--------- r1p.config.seed | 5 +++++ r1s-h3.config.seed | 1 + r1s.config.seed | 1 + r2c.config.seed | 5 +++++ r2s.config.seed | 5 +++++ r4s.config.seed | 5 +++++ x86.config.seed | 9 +++++++++ 11 files changed, 74 insertions(+), 22 deletions(-) diff --git a/.github/workflows/dispatch.yml b/.github/workflows/dispatch.yml index dc47898..9014b62 100644 --- a/.github/workflows/dispatch.yml +++ b/.github/workflows/dispatch.yml @@ -2,10 +2,14 @@ name: Repo Dispatcher on: workflow_dispatch: inputs: + branch: + description: 'select code branch to build' + default: '18.06' + require: true device: description: 'select device to build' default: 'r2s' - required: false + required: true package_clean: description: 'check to make clean package' default: 'false' @@ -21,5 +25,4 @@ jobs: -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.SEC_TOKEN }}" \ - -d '{"event_type": "${{ github.event.inputs.device }}", "client_payload": {"device": "${{ github.event.inputs.device }}", "package_clean": "${{ github.event.inputs.package_clean }}"}}' \ - -v + -d '{"event_type": "${{ github.event.inputs.device }}", "client_payload": {"branch": "${{ github.event.inputs.branch }}", "device": "${{ github.event.inputs.device }}", "package_clean": "${{ github.event.inputs.package_clean }}" }}' diff --git a/.github/workflows/lo-test.yml b/.github/workflows/lo-test.yml index ba593ae..879bbdb 100644 --- a/.github/workflows/lo-test.yml +++ b/.github/workflows/lo-test.yml @@ -16,6 +16,7 @@ jobs: runs-on: ubuntu-18.04 env: DEVICE: ${{ github.event.client_payload.device || github.event.inputs.device }} + BRANCH: ${{ github.event.client_payload.branch }} TG: ${{ secrets.TELEGRAM_BOT_TOKEN }} DEPLOY_SSHKEY: ${{ secrets.SSH_KEY }} if: github.repository_owner=='klever1988' @@ -46,13 +47,12 @@ jobs: LOOP_DEVICE=$(losetup -f) && echo "LOOP_DEVICE=$LOOP_DEVICE" >> $GITHUB_ENV sudo losetup -P --direct-io $LOOP_DEVICE lede.img mkdir lede && sudo mount -o nossd,compress=zstd $LOOP_DEVICE lede + [ $BRANCH != 'master' ] && BRANCH='openwrt-18.06-k5.4' if [ -d 'lede/.git' ]; then cd lede && rm -f zerospace && git config --local user.email "action@github.com" && git config --local user.name "GitHub Action" - git fetch && git reset --hard origin/openwrt-18.06-k5.4 - #git remote set-branches --add origin openwrt-18.06 - #git merge -X theirs --no-edit origin/openwrt-18.06 + git fetch && git reset --hard origin/$BRANCH else - sudo chown $USER:$(id -gn) lede && git clone -b openwrt-18.06-k5.4 --single-branch https://github.com/immortalwrt/immortalwrt lede + sudo chown $USER:$(id -gn) lede && git clone -b $BRANCH --single-branch https://github.com/immortalwrt/immortalwrt lede fi - name: Update feeds and packages @@ -69,7 +69,8 @@ jobs: . $GITHUB_WORKSPACE/merge_packages.sh . $GITHUB_WORKSPACE/patches.sh cd - svn export https://github.com/openwrt/luci/branches/openwrt-18.06 luci + [ $BRANCH != 'master' ] && BRANCH='openwrt-18.06' + svn export https://github.com/openwrt/luci/branches/$BRANCH luci echo > more_luci.txt pushd luci ls -d */ | xargs -n1 -i diff -q {} ../lede/feeds/luci/{} | grep Only | grep lede | grep -E applications\|themes | awk '{print $4}' | xargs -n1 -i echo CONFIG_PACKAGE_{}=m >> ~/lede/more_luci.txt @@ -200,7 +201,7 @@ jobs: sed -i '/luci-lib-base/d;/luci-lib-ipkg/d' include/target.mk sed -i 's/luci-app-[^ ]*//g' include/target.mk $(find target/ -name Makefile) sed -i 's/$(OPKG) install $(BUILD_PACKAGES)/$(OPKG) install --force-overwrite $(BUILD_PACKAGES)/' Makefile - PACKAGES=$(cat $GITHUB_WORKSPACE/$DEVICE.config.seed | grep CONFIG_PACKAGE | sed '/dnsmasq_full_dhcpv6/d;/INCLUDE/d' | grep -v luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs echo) + PACKAGES=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed | grep CONFIG_PACKAGE | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}* 2>/dev/null' | grep -v luci-app | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo) make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files" mkdir -p $GITHUB_WORKSPACE/release @@ -245,8 +246,8 @@ jobs: sed -i '/luci-lib-base/d;/luci-lib-ipkg/d' include/target.mk sed -i 's/luci-app-[^ ]*//g' include/target.mk $(find target/ -name Makefile) sed -i 's/$(OPKG) install $(BUILD_PACKAGES)/$(OPKG) install --force-overwrite $(BUILD_PACKAGES)/' Makefile - PACKAGES=$(cat $GITHUB_WORKSPACE/$DEVICE.config.seed | grep CONFIG_PACKAGE | sed '/dnsmasq_full_dhcpv6/d;/INCLUDE/d' | grep -v luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs echo) - LUCI=$(echo `cat $GITHUB_WORKSPACE/$DEVICE.config.seed | grep CONFIG_PACKAGE | sed '/dnsmasq_full_dhcpv6/d;/INCLUDE/d;/docker/d' | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//'`) + PACKAGES=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed | grep CONFIG_PACKAGE | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}* 2>/dev/null' | grep -v luci-app | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo) + LUCI=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}* 2>/dev/null' | grep -v docker | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo) LP=$(cd packages; echo $LUCI | sed 's/-app-/-i18n-/g;s/ /\n/g' | xargs -n1 -i sh -c 'ls {}-zh-cn* 2>/dev/null' | sed 's/zh-.*.ipk/zh-cn/' | xargs echo) make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files" @@ -262,7 +263,7 @@ jobs: fi cd $GITHUB_WORKSPACE/ib rm -rf bin/ - LUCI=$(echo `cat $GITHUB_WORKSPACE/$DEVICE.config.seed | grep CONFIG_PACKAGE | sed '/dnsmasq_full_dhcpv6/d;/INCLUDE/d' | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//'`) + LUCI=$(cd packages; cat $GITHUB_WORKSPACE/$DEVICE.config.seed | grep luci-app | sed 's/CONFIG_PACKAGE_//;s/=y//' | xargs -n1 -i sh -c 'ls {}* 2>/dev/null' | sed 's/\([^_]*\)_.*ipk/\1/g' | xargs echo) LP=$(cd packages; echo $LUCI | sed 's/-app-/-i18n-/g;s/ /\n/g' | xargs -n1 -i sh -c 'ls {}-zh-cn* 2>/dev/null' | sed 's/zh-.*.ipk/zh-cn/' | xargs echo) make image PACKAGES="$PACKAGES $LUCI $LP luci-i18n-base-zh-cn luci-i18n-firewall-zh-cn" FILES="files" mv $(ls -1 ./bin/targets/*/*/*img.gz | head -1) $GITHUB_WORKSPACE/release/$DEVICE-with-docker.img.gz diff --git a/extra_packages.seed b/extra_packages.seed index 9259b05..453f2cc 100644 --- a/extra_packages.seed +++ b/extra_packages.seed @@ -15,4 +15,5 @@ CONFIG_PACKAGE_luci-proto-openconnect=m CONFIG_PACKAGE_luci-proto-bonding=m CONFIG_PACKAGE_luci-app-openvpn=m CONFIG_PACKAGE_luci-app-wireguard=m -CONFIG_PACKAGE_luci-app-udpxy=m \ No newline at end of file +CONFIG_PACKAGE_luci-app-udpxy=m +CONFIG_DEFAULT_SETTINGS_OPTIMIZE_FOR_CHINESE=y \ No newline at end of file diff --git a/patches.sh b/patches.sh index 0614471..fd5d417 100644 --- a/patches.sh +++ b/patches.sh @@ -40,13 +40,29 @@ sed -i '/182.140.223.146/d' scripts/download.pl sed -i '/\.cn\//d' scripts/download.pl sed -i '/tencent/d' scripts/download.pl -status_page=`find package/ -follow -type f -path '*/autocore/files/arm/index.htm'` -line_number_FV=`grep -n 'Firmware Version' $status_page | cut -d : -f 1` -sed -i '/ver\./d' $status_page +#inject the firmware version strDate=`TZ=UTC-8 date +%Y-%m-%d` -sed -i $line_number_FV' a klever1988/nanopi-openwrt '$strDate $status_page -status_page=`find package/ -follow -type f -path '*/autocore/files/x86/index.htm'` -line_number_FV=`grep -n 'Firmware Version' $status_page | cut -d : -f 1` -sed -i '/ver\./d' $status_page -strDate=`TZ=UTC-8 date +%Y-%m-%d` -sed -i $line_number_FV' a klever1988/nanopi-openwrt '$strDate $status_page \ No newline at end of file +status_pages=`find package/ -follow -type f \( -path '*/autocore/files/arm/index.htm' -o -path '*/autocore/files/x86/index.htm' -o -path '*/autocore/files/arm/rpcd_10_system.js' \)` +for status_page in $status_pages; do +case $status_page in + *htm) + line_number_FV=`grep -n 'Firmware Version' $status_page | cut -d: -f 1` + sed -i '/ver\./d' $status_page + sed -i $line_number_FV' a klever1988/nanopi-openwrt '$strDate $status_page + ;; + *js) + line_number_FV=`grep -m1 -n 'corelink' $status_page | cut -d: -f1` + sed -i $line_number_FV' i var pfv = document.createElement('\''placeholder'\'');pfv.innerHTML = '\''klever1988/nanopi-openwrt '$strDate"';" $status_page + line_number_FV=`grep -n 'Firmware Version' $status_page | cut -d : -f 1` + sed -i '/Firmware Version/d' $status_page + sed -i $line_number_FV' a _('\''Firmware Version'\''), pfv,' $status_page + ;; +esac +done + +#fix argon css +css_file=`find package/ -follow -type f -path '*/argon/css/cascade.css'` +line_number_h6=`grep -m1 -n 'h6 {' $css_file | cut -d: -f1` +if [[ ! -z "$line_number_h6" ]]; then +sed -i $line_number_h6',+10 s/font-weight: normal/font-weight: bold/' $css_file +fi diff --git a/r1p.config.seed b/r1p.config.seed index 0ced71d..148cc4d 100644 --- a/r1p.config.seed +++ b/r1p.config.seed @@ -53,9 +53,13 @@ CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-xlnetacc=y +CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-theme-argonv3=y +CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y +CONFIG_PACKAGE_luci-theme-openwrt=y +CONFIG_PACKAGE_luci-theme-openwrt-2020=y CONFIG_PACKAGE_luci-theme-rosy=y CONFIG_PACKAGE_luci-theme-infinityfreedom=y CONFIG_PACKAGE_bash=y @@ -76,6 +80,7 @@ CONFIG_PACKAGE_wget=y # CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO is not set CONFIG_PACKAGE_collectd-mod-ping=y CONFIG_PACKAGE_collectd-mod-thermal=y +CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y diff --git a/r1s-h3.config.seed b/r1s-h3.config.seed index b34e009..ec968c5 100644 --- a/r1s-h3.config.seed +++ b/r1s-h3.config.seed @@ -40,6 +40,7 @@ CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-xlnetacc=y CONFIG_PACKAGE_luci-theme-argonv3=y +CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y CONFIG_PACKAGE_luci-theme-rosy=y diff --git a/r1s.config.seed b/r1s.config.seed index 94f7441..db3f19b 100644 --- a/r1s.config.seed +++ b/r1s.config.seed @@ -40,6 +40,7 @@ CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-xlnetacc=y CONFIG_PACKAGE_luci-theme-argonv3=y +CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y CONFIG_PACKAGE_luci-theme-rosy=y diff --git a/r2c.config.seed b/r2c.config.seed index 9217705..af1de4a 100644 --- a/r2c.config.seed +++ b/r2c.config.seed @@ -53,9 +53,13 @@ CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-xlnetacc=y +CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-theme-argonv3=y +CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y +CONFIG_PACKAGE_luci-theme-openwrt=y +CONFIG_PACKAGE_luci-theme-openwrt-2020=y CONFIG_PACKAGE_luci-theme-rosy=y CONFIG_PACKAGE_luci-theme-infinityfreedom=y CONFIG_PACKAGE_bash=y @@ -76,6 +80,7 @@ CONFIG_PACKAGE_wget=y # CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO is not set CONFIG_PACKAGE_collectd-mod-ping=y CONFIG_PACKAGE_collectd-mod-thermal=y +CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y diff --git a/r2s.config.seed b/r2s.config.seed index 31dbe04..de5baa4 100644 --- a/r2s.config.seed +++ b/r2s.config.seed @@ -53,9 +53,13 @@ CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-xlnetacc=y +CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-theme-argonv3=y +CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y +CONFIG_PACKAGE_luci-theme-openwrt=y +CONFIG_PACKAGE_luci-theme-openwrt-2020=y CONFIG_PACKAGE_luci-theme-rosy=y CONFIG_PACKAGE_luci-theme-infinityfreedom=y CONFIG_PACKAGE_bash=y @@ -76,6 +80,7 @@ CONFIG_PACKAGE_wget=y # CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO is not set CONFIG_PACKAGE_collectd-mod-ping=y CONFIG_PACKAGE_collectd-mod-thermal=y +CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y diff --git a/r4s.config.seed b/r4s.config.seed index 90d412c..e730198 100644 --- a/r4s.config.seed +++ b/r4s.config.seed @@ -53,9 +53,13 @@ CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y CONFIG_PACKAGE_luci-app-xlnetacc=y +CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-theme-argonv3=y +CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y +CONFIG_PACKAGE_luci-theme-openwrt=y +CONFIG_PACKAGE_luci-theme-openwrt-2020=y CONFIG_PACKAGE_luci-theme-rosy=y CONFIG_PACKAGE_luci-theme-infinityfreedom=y CONFIG_PACKAGE_bash=y @@ -76,6 +80,7 @@ CONFIG_PACKAGE_wget=y # CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO is not set CONFIG_PACKAGE_collectd-mod-ping=y CONFIG_PACKAGE_collectd-mod-thermal=y +CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y diff --git a/x86.config.seed b/x86.config.seed index c4ac855..e0c8398 100644 --- a/x86.config.seed +++ b/x86.config.seed @@ -19,6 +19,8 @@ CONFIG_PACKAGE_luci-app-adguardhome=y CONFIG_PACKAGE_luci-app-argon-config=y CONFIG_PACKAGE_luci-app-aria2=y CONFIG_PACKAGE_luci-app-arpbind=y +CONFIG_PACKAGE_luci-app-cifsd=y +CONFIG_PACKAGE_luci-app-cpufreq=y CONFIG_PACKAGE_luci-app-ddns=y CONFIG_PACKAGE_luci-app-ddnsto=y CONFIG_PACKAGE_luci-app-diskman=y @@ -51,9 +53,14 @@ CONFIG_PACKAGE_luci-app-vlmcsd=y CONFIG_PACKAGE_luci-app-vnstat=y CONFIG_PACKAGE_luci-app-vsftpd=y CONFIG_PACKAGE_luci-app-vssr=y +CONFIG_PACKAGE_luci-app-xlnetacc=y +CONFIG_PACKAGE_luci-theme-argon=y CONFIG_PACKAGE_luci-theme-argonv3=y +CONFIG_PACKAGE_luci-theme-bootstrap=y CONFIG_PACKAGE_luci-theme-material=y CONFIG_PACKAGE_luci-theme-netgear=y +CONFIG_PACKAGE_luci-theme-openwrt=y +CONFIG_PACKAGE_luci-theme-openwrt-2020=y CONFIG_PACKAGE_luci-theme-rosy=y CONFIG_PACKAGE_luci-theme-infinityfreedom=y CONFIG_PACKAGE_bash=y @@ -74,6 +81,7 @@ CONFIG_PACKAGE_wget=y # CONFIG_OPENSSL_ENGINE_BUILTIN_DEVCRYPTO is not set CONFIG_PACKAGE_collectd-mod-ping=y CONFIG_PACKAGE_collectd-mod-thermal=y +CONFIG_PACKAGE_ddns-scripts_cloudflare.com=y CONFIG_PACKAGE_ddns-scripts_cloudflare.com-v4=y CONFIG_PACKAGE_iptables-mod-conntrack-extra=y CONFIG_PACKAGE_iptables-mod-ipopt=y @@ -93,6 +101,7 @@ CONFIG_PACKAGE_kmod-mt76x2u=y CONFIG_PACKAGE_kmod-rtl8821cu=y CONFIG_PACKAGE_kmod-rtl8812au-ac=y CONFIG_PACKAGE_kmod-rtl88x2bu=y +CONFIG_PACKAGE_kmod-usb-net-rtl8152-vendor=y CONFIG_PACKAGE_iw=y CONFIG_PACKAGE_iwinfo=y CONFIG_PACKAGE_wpad-wolfssl=y