From 90e1566a544c48ce6f3edfdc27e9c44272ffe64e Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Fri, 23 Jul 2021 16:12:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20config=20=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E9=83=A8=E5=88=86=E6=8F=90=E7=A4=BA=20(=E4=BB=85?= =?UTF-8?q?=E4=BE=9B=E5=8F=82=E8=80=83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/AutoBuild-Test.yml | 9 ++++++++- .github/workflows/AutoBuild-asus_rt-acrh17.yml | 9 ++++++++- .github/workflows/AutoBuild-d-team_newifi-d2.yml | 9 ++++++++- .github/workflows/AutoBuild-redmi_ax6.yml | 9 ++++++++- .github/workflows/AutoBuild-x86_64.yml | 9 ++++++++- .../workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml | 9 ++++++++- .github/workflows/AutoBuild-xiaoyu_xy-c5.yml | 9 ++++++++- 7 files changed, 56 insertions(+), 7 deletions(-) diff --git a/.github/workflows/AutoBuild-Test.yml b/.github/workflows/AutoBuild-Test.yml index f774ddd..f0a53cd 100644 --- a/.github/workflows/AutoBuild-Test.yml +++ b/.github/workflows/AutoBuild-Test.yml @@ -98,10 +98,17 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | + #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do + line=$(grep -n "${X}" .config | cut -d ':' -f1) + [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { + echo "ERROR in line ${line}: ${X}" + } + done + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-asus_rt-acrh17.yml b/.github/workflows/AutoBuild-asus_rt-acrh17.yml index d5d974f..b84ab28 100644 --- a/.github/workflows/AutoBuild-asus_rt-acrh17.yml +++ b/.github/workflows/AutoBuild-asus_rt-acrh17.yml @@ -101,10 +101,17 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | + #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do + line=$(grep -n "${X}" .config | cut -d ':' -f1) + [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { + echo "ERROR in line ${line}: ${X}" + } + done + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-d-team_newifi-d2.yml b/.github/workflows/AutoBuild-d-team_newifi-d2.yml index e5eccba..ef4fc66 100644 --- a/.github/workflows/AutoBuild-d-team_newifi-d2.yml +++ b/.github/workflows/AutoBuild-d-team_newifi-d2.yml @@ -101,10 +101,17 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | + #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do + line=$(grep -n "${X}" .config | cut -d ':' -f1) + [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { + echo "ERROR in line ${line}: ${X}" + } + done + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-redmi_ax6.yml b/.github/workflows/AutoBuild-redmi_ax6.yml index 04a1e1e..d96641f 100644 --- a/.github/workflows/AutoBuild-redmi_ax6.yml +++ b/.github/workflows/AutoBuild-redmi_ax6.yml @@ -101,10 +101,17 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | + #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do + line=$(grep -n "${X}" .config | cut -d ':' -f1) + [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { + echo "ERROR in line ${line}: ${X}" + } + done + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-x86_64.yml b/.github/workflows/AutoBuild-x86_64.yml index 811e321..c9433cf 100644 --- a/.github/workflows/AutoBuild-x86_64.yml +++ b/.github/workflows/AutoBuild-x86_64.yml @@ -101,10 +101,17 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | + #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do + line=$(grep -n "${X}" .config | cut -d ':' -f1) + [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { + echo "ERROR in line ${line}: ${X}" + } + done + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml index a90ae81..81589e5 100644 --- a/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml +++ b/.github/workflows/AutoBuild-xiaomi_redmi-router-ac2100.yml @@ -101,10 +101,17 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | + #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do + line=$(grep -n "${X}" .config | cut -d ':' -f1) + [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { + echo "ERROR in line ${line}: ${X}" + } + done + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main diff --git a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml index 5f97116..618454b 100644 --- a/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml +++ b/.github/workflows/AutoBuild-xiaoyu_xy-c5.yml @@ -101,10 +101,17 @@ jobs: - name: Run AutoBuild_DiyScript.sh run: | + #!/bin/bash chmod +x Scripts/AutoBuild_*.sh cp $GITHUB_WORKSPACE/Configs/$CONFIG_FILE openwrt/.config cd openwrt - make defconfig > /dev/null 2>&1 + egrep -v "^#|LEVEL|DEFAULT|=[0-9]" .config | grep "CONFIG_PACKAGE" | sed '/^\s*$/d' | while read X;do + line=$(grep -n "${X}" .config | cut -d ':' -f1) + [[ ! ${X} =~ '=' || -z $(echo ${X} | cut -d '=' -f2) || ! $(echo ${X} | cut -d '=' -f2) =~ [nym] ]] && { + echo "ERROR in line ${line}: ${X}" + } + done + make defconfig source $GITHUB_WORKSPACE/Scripts/AutoBuild_DiyScript.sh source $GITHUB_WORKSPACE/Scripts/AutoBuild_Function.sh Firmware-Diy_Main