From d631563dc27b861da32808bd432a90855431bfed Mon Sep 17 00:00:00 2001 From: Hyy2001X <1804430051@qq.com> Date: Fri, 9 Jul 2021 22:04:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20ipq807x=20=E7=B3=BB?= =?UTF-8?q?=E5=88=97=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Scripts/AutoBuild_Function.sh | 122 ++++++++++++++++++---------------- 1 file changed, 63 insertions(+), 59 deletions(-) diff --git a/Scripts/AutoBuild_Function.sh b/Scripts/AutoBuild_Function.sh index e01f184..72baf30 100755 --- a/Scripts/AutoBuild_Function.sh +++ b/Scripts/AutoBuild_Function.sh @@ -7,18 +7,18 @@ GET_INFO() { Home="${GITHUB_WORKSPACE}/openwrt" [[ -f ${GITHUB_WORKSPACE}/Openwrt.info ]] && source ${GITHUB_WORKSPACE}/Openwrt.info [[ ${Short_Firmware_Date} == true ]] && Compile_Date="$(echo ${Compile_Date} | cut -c1-8)" - User_Repo="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100 | sed 's/^[ \t]*//g')" - [[ -z ${Author} ]] && Author="$(echo "${User_Repo}" | cut -d "/" -f4)" - Openwrt_Maintainer="$(echo "${Openwrt_Repo}" | cut -d "/" -f4)" - Openwrt_Repo_Name="$(echo "${Openwrt_Repo}" | cut -d "/" -f5)" - Openwrt_Branch="$(GET_BRANCH)" - if [[ ${Openwrt_Branch} == master || ${Openwrt_Branch} == main ]];then + Author_Repository="$(grep "https://github.com/[a-zA-Z0-9]" ${GITHUB_WORKSPACE}/.git/config | cut -c8-100 | sed 's/^[ \t]*//g')" + [[ -z ${Author} ]] && Author="$(echo "${Author_Repository}" | cut -d "/" -f4)" + OP_Maintainer="$(echo "${Openwrt_Repository}" | cut -d "/" -f4)" + OP_REPO_NAME="$(echo "${Openwrt_Repository}" | cut -d "/" -f5)" + OP_BRANCH="$(GET_BRANCH)" + if [[ ${OP_BRANCH} == master || ${OP_BRANCH} == main ]];then Openwrt_Version_Head="R$(date +%y.%m)-" else - Openwrt_Branch="$(echo ${Openwrt_Branch} | egrep -o "[0-9]+.[0-9]+")" - Openwrt_Version_Head="R${Openwrt_Branch}-" + OP_BRANCH="$(echo ${OP_BRANCH} | egrep -o "[0-9]+.[0-9]+")" + Openwrt_Version_Head="R${OP_BRANCH}-" fi - case "${Openwrt_Maintainer}" in + case "${OP_Maintainer}" in coolsnowwolf) Version_File=package/lean/default-settings/files/zzz-default-settings zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})" @@ -43,20 +43,13 @@ GET_INFO() { } || { TARGET_PROFILE="$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/.*DEVICE_(.*)=y/\1/')" } - [[ -z ${TARGET_PROFILE} ]] && { - if [[ -n ${Default_TARGET_PROFILE} && ${Default_TARGET_PROFILE} != auto ]];then - TARGET_PROFILE="${Default_TARGET_PROFILE}" - else - TIME "[ERROR] Can not get TARGET_PROFILE,please check!" - exit 1 - fi - } + [[ -z ${TARGET_PROFILE} ]] && TIME "Empty [TARGET_PROFILE]" [[ ${TARGET_PROFILE} == x86_64 ]] && { [[ $(cat ${Home}/.config) =~ CONFIG_TARGET_IMAGES_GZIP=y ]] && Firmware_Type=img.gz || Firmware_Type=img } TARGET_BOARD="$(awk -F '[="]+' '/TARGET_BOARD/{print $2}' .config)" case "${TARGET_BOARD}" in - ramips | reltek | ipq40xx | ath79) + ramips | reltek | ipq40xx | ath79 | ipq807x) Firmware_Type=bin ;; rockchip) @@ -65,7 +58,7 @@ GET_INFO() { esac TARGET_SUBTARGET="$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' .config)" - case "${Openwrt_Maintainer}" in + case "${OP_Maintainer}" in immortalwrt) Firmware_Head=immortalwrt ;; @@ -73,9 +66,9 @@ GET_INFO() { Firmware_Head=openwrt ;; esac - case "${Openwrt_Branch}" in + case "${OP_BRANCH}" in 19.07 | 18.06) - case "${Openwrt_Maintainer}" in + case "${OP_Maintainer}" in immortalwrt) Legacy_Tail=combined-squashfs UEFI_Tail=uefi-gpt-squashfs @@ -96,37 +89,52 @@ GET_INFO() { x86_64) Default_Legacy_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${Legacy_Tail}.${Firmware_Type}" Default_UEFI_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${UEFI_Tail}.${Firmware_Type}" - AutoBuild_Firmware='AutoBuild-${Openwrt_Repo_Name}-${TARGET_PROFILE}-${CURRENT_Version}-${x86_64_Boot}-${SHA5BIT}.${Firmware_Type}' - Egrep_Firmware='AutoBuild-${Openwrt_Repo_Name}-${TARGET_PROFILE}-R[0-9.]+-[0-9]+-${x86_64_Boot}.[0-9a-z]+.${Firmware_Type}' + AutoBuild_Firmware='AutoBuild-${OP_REPO_NAME}-${TARGET_PROFILE}-${CURRENT_Version}-${x86_64_Boot}-${SHA5BIT}.${Firmware_Type}' + Egrep_Firmware='AutoBuild-${OP_REPO_NAME}-${TARGET_PROFILE}-R[0-9.]+-[0-9]+-${x86_64_Boot}.[0-9a-z]+.${Firmware_Type}' ;; *) - case "${TARGET_SUBTARGET}" in - generic) - Default_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_PROFILE}-squashfs-sysupgrade.${Firmware_Type}" + case ${TARGET_BOARD} in + ipq807x) + Common_Tail=squashfs-nand-sysupgrade ;; *) - Default_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${TARGET_PROFILE}-squashfs-sysupgrade.${Firmware_Type}" + Common_Tail=squashfs-sysupgrade + ;; + esac + case "${TARGET_SUBTARGET}" in + generic) + case ${TARGET_BOARD} in + ipq807x) + Default_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${TARGET_PROFILE}-${Common_Tail}.${Firmware_Type}" + ;; + *) + Default_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_PROFILE}-${Common_Tail}.${Firmware_Type}" + ;; + esac + ;; + *) + Default_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${TARGET_PROFILE}-${Common_Tail}.${Firmware_Type}" ;; esac - AutoBuild_Firmware='AutoBuild-${Openwrt_Repo_Name}-${TARGET_PROFILE}-${CURRENT_Version}-${SHA5BIT}.${Firmware_Type}' - Egrep_Firmware='AutoBuild-${Openwrt_Repo_Name}-${TARGET_PROFILE}-R[0-9.]+-[0-9]+-[0-9a-z]+.${Firmware_Type}' + AutoBuild_Firmware='AutoBuild-${OP_REPO_NAME}-${TARGET_PROFILE}-${CURRENT_Version}-${SHA5BIT}.${Firmware_Type}' + Egrep_Firmware='AutoBuild-${OP_REPO_NAME}-${TARGET_PROFILE}-R[0-9.]+-[0-9]+-[0-9a-z]+.${Firmware_Type}' ;; esac Firmware_Path="bin/targets/${TARGET_BOARD}/${TARGET_SUBTARGET}" cat >> VARIABLE_FILE_Main <> VARIABLE_FILE_Sec <> target/linux/x86/${X}; done @@ -215,7 +219,7 @@ Firmware-Diy_Base() { } || AutoUpdate_Version=OFF Copy CustomFiles/Depends/profile package/base-files/files/etc Copy CustomFiles/Depends/base-files-essential package/base-files/files/lib/upgrade/keep.d - case "${Openwrt_Maintainer}" in + case "${OP_Maintainer}" in coolsnowwolf) sed -i "/dns_caching_dns/d" $(PKG_Finder d package luci-app-turboacc)/root/etc/config/turboacc echo " option dns_caching_dns '223.5.5.5,114.114.114.114'" >> $(PKG_Finder d package luci-app-turboacc)/root/etc/config/turboacc @@ -229,12 +233,12 @@ Firmware-Diy_Base() { immortalwrt) sed -i "/dns_caching_dns/d" $(PKG_Finder d "package feeds" luci-app-turboacc)/root/etc/config/turboacc echo " option dns_caching_dns '223.5.5.5,114.114.114.114'" >> $(PKG_Finder d "package feeds" luci-app-turboacc)/root/etc/config/turboacc - Copy CustomFiles/Depends/openwrt_release_${Openwrt_Maintainer} package/base-files/files/etc openwrt_release + Copy CustomFiles/Depends/openwrt_release_${OP_Maintainer} package/base-files/files/etc openwrt_release Copy CustomFiles/Depends/cpuinfo_x86 $(PKG_Finder d package autocore | awk 'NR==1')/files/x86/sbin cpuinfo sed -i "s?ImmortalWrt?ImmortalWrt @ ${Author} [${Display_Date}]?g" ${Version_File} ;; esac - case "${Openwrt_Maintainer}" in + case "${OP_Maintainer}" in immortalwrt) Copy CustomFiles/Depends/banner $(PKG_Finder d package default-settings)/files openwrt_banner sed -i "s?By?By ${Author}?g" $(PKG_Finder d package default-settings)/files/openwrt_banner @@ -253,34 +257,34 @@ Other_Scripts() { source ./VARIABLE_FILE_Sec case "${INCLUDE_Obsolete_PKG_Compatible}" in 19.07) - Openwrt_Branch=19.07 + OP_BRANCH=19.07 Force_mode=1 INCLUDE_Obsolete_PKG_Compatible=true ;; 21.02) - Openwrt_Branch=21.02 + OP_BRANCH=21.02 Force_mode=1 INCLUDE_Obsolete_PKG_Compatible=true ;; esac if [[ ${INCLUDE_Obsolete_PKG_Compatible} == true ]];then TIME "Start to run Obsolete_Package_Compatible Scripts ..." - if [[ ${Openwrt_Maintainer} == openwrt || ${Force_mode} == 1 ]];then - case "${Openwrt_Branch}" in + if [[ ${OP_Maintainer} == openwrt || ${Force_mode} == 1 ]];then + case "${OP_BRANCH}" in 19.07 | 21.02) - Copy CustomFiles/Patches/0003-upx-ucl-${Openwrt_Branch}.patch ./ - cat 0003-upx-ucl-${Openwrt_Branch}.patch | patch -p1 > /dev/null 2>&1 + Copy CustomFiles/Patches/0003-upx-ucl-${OP_BRANCH}.patch ./ + cat 0003-upx-ucl-${OP_BRANCH}.patch | patch -p1 > /dev/null 2>&1 # AddPackage svn feeds/packages golang coolsnowwolf/packages/trunk/lang TIME "Start to convert zh-cn translation files to zh_Hans ..." Copy Scripts/Convert_Translation.sh package cd ./package && bash ./Convert_Translation.sh && cd .. ;; *) - TIME "Current branch: [${Openwrt_Branch}] is not supported,skip..." + TIME "Current branch: [${OP_BRANCH}] is not supported,skip..." ;; esac else - TIME "Current source: [${Openwrt_Maintainer}] is not supported,skip..." + TIME "Current source: [${OP_Maintainer}] is not supported,skip..." fi fi if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then @@ -399,7 +403,7 @@ AddPackage() { PKG_NAME="$3" REPO_URL="https://github.com/$4" [[ -z $5 ]] && REPO_BRANCH=master || REPO_BRANCH="$5" - [[ ${REPO_URL} =~ "${Openwrt_Maintainer}/${Openwrt_Repo_Name}" ]] && return 0 + [[ ${REPO_URL} =~ "${OP_Maintainer}/${OP_REPO_NAME}" ]] && return 0 mkdir -p package/${PKG_DIR} [[ -d package/${PKG_DIR}/${PKG_NAME} ]] && {