xinb
/
X-OpenWrt
mirror of https://github.com/xopenwrt/X-OpenWrt-New.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

添加 ipq807x 系列支持

This commit is contained in:
Hyy2001X 2021-07-09 22:04:24 +08:00
parent 7a5ab5f614
commit d631563dc2
1 changed files with 63 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
Scripts/AutoBuild_Function.sh
View File

@ -7,18 +7,18 @@ GET_INFO() {
Home="${GITHUB_WORKSPACE}/openwrt" Home="${GITHUB_WORKSPACE}/openwrt"
[[ -f ${GITHUB_WORKSPACE}/Openwrt.info ]] && source ${GITHUB_WORKSPACE}/Openwrt.info [[ -f ${GITHUB_WORKSPACE}/Openwrt.info ]] && source ${GITHUB_WORKSPACE}/Openwrt.info
[[ ${Short_Firmware_Date} == true ]] && Compile_Date="$(echo ${Compile_Date} | cut -c1-8)" [[ ${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')" 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 "${User_Repo}" | cut -d "/" -f4)" [[ -z ${Author} ]] && Author="$(echo "${Author_Repository}" | cut -d "/" -f4)"
Openwrt_Maintainer="$(echo "${Openwrt_Repo}" | cut -d "/" -f4)" OP_Maintainer="$(echo "${Openwrt_Repository}" | cut -d "/" -f4)"
Openwrt_Repo_Name="$(echo "${Openwrt_Repo}" | cut -d "/" -f5)" OP_REPO_NAME="$(echo "${Openwrt_Repository}" | cut -d "/" -f5)"
Openwrt_Branch="$(GET_BRANCH)" OP_BRANCH="$(GET_BRANCH)"
if [[ ${Openwrt_Branch} == master || ${Openwrt_Branch} == main ]];then if [[ ${OP_BRANCH} == master || ${OP_BRANCH} == main ]];then
Openwrt_Version_Head="R$(date +%y.%m)-" Openwrt_Version_Head="R$(date +%y.%m)-"
else else
Openwrt_Branch="$(echo ${Openwrt_Branch} | egrep -o "[0-9]+.[0-9]+")" OP_BRANCH="$(echo ${OP_BRANCH} | egrep -o "[0-9]+.[0-9]+")"
Openwrt_Version_Head="R${Openwrt_Branch}-" Openwrt_Version_Head="R${OP_BRANCH}-"
fi fi
case "${Openwrt_Maintainer}" in case "${OP_Maintainer}" in
coolsnowwolf) coolsnowwolf)
Version_File=package/lean/default-settings/files/zzz-default-settings Version_File=package/lean/default-settings/files/zzz-default-settings
zzz_Default_Version="$(egrep -o "R[0-9]+\.[0-9]+\.[0-9]+" ${Version_File})" 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/')" TARGET_PROFILE="$(egrep -o "CONFIG_TARGET.*DEVICE.*=y" .config | sed -r 's/.*DEVICE_(.*)=y/\1/')"
} }
[[ -z ${TARGET_PROFILE} ]] && { [[ -z ${TARGET_PROFILE} ]] && TIME "Empty [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
}
[[ ${TARGET_PROFILE} == x86_64 ]] && { [[ ${TARGET_PROFILE} == x86_64 ]] && {
[[ $(cat ${Home}/.config) =~ CONFIG_TARGET_IMAGES_GZIP=y ]] && Firmware_Type=img.gz || Firmware_Type=img [[ $(cat ${Home}/.config) =~ CONFIG_TARGET_IMAGES_GZIP=y ]] && Firmware_Type=img.gz || Firmware_Type=img
} }
TARGET_BOARD="$(awk -F '[="]+' '/TARGET_BOARD/{print $2}' .config)" TARGET_BOARD="$(awk -F '[="]+' '/TARGET_BOARD/{print $2}' .config)"
case "${TARGET_BOARD}" in case "${TARGET_BOARD}" in
ramips | reltek | ipq40xx | ath79) ramips | reltek | ipq40xx | ath79 | ipq807x)
Firmware_Type=bin Firmware_Type=bin
;; ;;
rockchip) rockchip)
@ -65,7 +58,7 @@ GET_INFO() {
esac esac
TARGET_SUBTARGET="$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' .config)" TARGET_SUBTARGET="$(awk -F '[="]+' '/TARGET_SUBTARGET/{print $2}' .config)"
case "${Openwrt_Maintainer}" in case "${OP_Maintainer}" in
immortalwrt) immortalwrt)
Firmware_Head=immortalwrt Firmware_Head=immortalwrt
;; ;;
@ -73,9 +66,9 @@ GET_INFO() {
Firmware_Head=openwrt Firmware_Head=openwrt
;; ;;
esac esac
case "${Openwrt_Branch}" in case "${OP_BRANCH}" in
19.07 | 18.06) 19.07 | 18.06)
case "${Openwrt_Maintainer}" in case "${OP_Maintainer}" in
immortalwrt) immortalwrt)
Legacy_Tail=combined-squashfs Legacy_Tail=combined-squashfs
UEFI_Tail=uefi-gpt-squashfs UEFI_Tail=uefi-gpt-squashfs
@ -96,37 +89,52 @@ GET_INFO() {
x86_64) x86_64)
Default_Legacy_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${Legacy_Tail}.${Firmware_Type}" 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}" 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}' AutoBuild_Firmware='AutoBuild-${OP_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}' Egrep_Firmware='AutoBuild-${OP_REPO_NAME}-${TARGET_PROFILE}-R[0-9.]+-[0-9]+-${x86_64_Boot}.[0-9a-z]+.${Firmware_Type}'
;; ;;
*) *)
case ${TARGET_BOARD} in
ipq807x)
Common_Tail=squashfs-nand-sysupgrade
;;
*)
Common_Tail=squashfs-sysupgrade
;;
esac
case "${TARGET_SUBTARGET}" in case "${TARGET_SUBTARGET}" in
generic) generic)
Default_Firmware="${Firmware_Head}-${TARGET_BOARD}-${TARGET_PROFILE}-squashfs-sysupgrade.${Firmware_Type}" 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_SUBTARGET}-${TARGET_PROFILE}-squashfs-sysupgrade.${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 esac
AutoBuild_Firmware='AutoBuild-${Openwrt_Repo_Name}-${TARGET_PROFILE}-${CURRENT_Version}-${SHA5BIT}.${Firmware_Type}' AutoBuild_Firmware='AutoBuild-${OP_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}' Egrep_Firmware='AutoBuild-${OP_REPO_NAME}-${TARGET_PROFILE}-R[0-9.]+-[0-9]+-[0-9a-z]+.${Firmware_Type}'
;; ;;
esac esac
Firmware_Path="bin/targets/${TARGET_BOARD}/${TARGET_SUBTARGET}" Firmware_Path="bin/targets/${TARGET_BOARD}/${TARGET_SUBTARGET}"
cat >> VARIABLE_FILE_Main <<EOF cat >> VARIABLE_FILE_Main <<EOF
Author=${Author} Author=${Author}
Github=${User_Repo} Github=${Author_Repository}
TARGET_PROFILE=${TARGET_PROFILE} TARGET_PROFILE=${TARGET_PROFILE}
TARGET_BOARD=${TARGET_BOARD} TARGET_BOARD=${TARGET_BOARD}
TARGET_SUBTARGET=${TARGET_SUBTARGET} TARGET_SUBTARGET=${TARGET_SUBTARGET}
Firmware_Type=${Firmware_Type} Firmware_Type=${Firmware_Type}
CURRENT_Version=${CURRENT_Version} CURRENT_Version=${CURRENT_Version}
Openwrt_Maintainer=${Openwrt_Maintainer} OP_Maintainer=${OP_Maintainer}
Openwrt_Branch=${Openwrt_Branch} OP_BRANCH=${OP_BRANCH}
OP_REPO_NAME=${OP_REPO_NAME}
AutoBuild_Firmware=${AutoBuild_Firmware} AutoBuild_Firmware=${AutoBuild_Firmware}
Openwrt_Repo_Name=${Openwrt_Repo_Name}
Egrep_Firmware=${Egrep_Firmware} Egrep_Firmware=${Egrep_Firmware}
EOF EOF
cat >> VARIABLE_FILE_Sec <<EOF cat >> VARIABLE_FILE_Sec <<EOF
@ -171,12 +179,12 @@ Firmware-Diy_Base() {
Copy Scripts/AutoUpdate.sh package/base-files/files/bin Copy Scripts/AutoUpdate.sh package/base-files/files/bin
} }
[[ ${INCLUDE_Argon} == true ]] && { [[ ${INCLUDE_Argon} == true ]] && {
case "${Openwrt_Maintainer}" in case "${OP_Maintainer}" in
coolsnowwolf) coolsnowwolf)
AddPackage git lean luci-theme-argon jerrykuku 18.06 AddPackage git lean luci-theme-argon jerrykuku 18.06
;; ;;
*) *)
case "${Openwrt_Branch}" in case "${OP_BRANCH}" in
19.07) 19.07)
AddPackage git other luci-theme-argon jerrykuku v2.2.5 AddPackage git other luci-theme-argon jerrykuku v2.2.5
;; ;;
@ -187,25 +195,21 @@ Firmware-Diy_Base() {
AddPackage git other luci-theme-argon jerrykuku 18.06 AddPackage git other luci-theme-argon jerrykuku 18.06
;; ;;
*) *)
TIME "[ERROR] Unknown Openwrt branch: [${Openwrt_Branch}] !" TIME "[ERROR] Unknown Openwrt branch: [${OP_BRANCH}] !"
;; ;;
esac esac
;; ;;
esac esac
AddPackage git other luci-app-argon-config jerrykuku AddPackage git other luci-app-argon-config jerrykuku
} }
[[ -n ${Defined_IP_Address} ]] && Default_LAN_IP="${Defined_IP_Address}" [[ -n ${Before_IP_Address} ]] && Default_LAN_IP="${Before_IP_Address}"
[[ -n ${Default_LAN_IP} && ${Default_LAN_IP} != false ]] && { [[ -n ${Default_LAN_IP} && ${Default_LAN_IP} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]] && {
if [[ ${Default_LAN_IP} =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]];then
Old_IP_Address=$(awk -F '[="]+' '/ipaddr:-/{print $3}' package/base-files/files/bin/config_generate | awk 'NR==1') Old_IP_Address=$(awk -F '[="]+' '/ipaddr:-/{print $3}' package/base-files/files/bin/config_generate | awk 'NR==1')
if [[ ! ${Default_LAN_IP} == ${Old_IP_Address} ]];then if [[ ! ${Default_LAN_IP} == ${Old_IP_Address} ]];then
TIME "Setting default IP Address to ${Default_LAN_IP} ..." TIME "Setting default IP Address to ${Default_LAN_IP} ..."
sed -i "s/${Old_IP_Address}/${Default_LAN_IP}/g" package/base-files/files/bin/config_generate sed -i "s/${Old_IP_Address}/${Default_LAN_IP}/g" package/base-files/files/bin/config_generate
fi fi
else } || TIME "[ERROR] [${Default_LAN_IP}] is not an IP Address,skip .."
TIME "[ERROR] ${Default_LAN_IP} is not an IP Address !"
fi
}
[[ ${INCLUDE_DRM_I915} == true && ${TARGET_PROFILE} == x86_64 ]] && { [[ ${INCLUDE_DRM_I915} == true && ${TARGET_PROFILE} == x86_64 ]] && {
Copy CustomFiles/Depends/DRM-I915 target/linux/x86 Copy CustomFiles/Depends/DRM-I915 target/linux/x86
for X in $(ls -1 target/linux/x86 | grep "config-"); do echo -e "\n$(cat target/linux/x86/DRM-I915)" >> target/linux/x86/${X}; done for X in $(ls -1 target/linux/x86 | grep "config-"); do echo -e "\n$(cat target/linux/x86/DRM-I915)" >> target/linux/x86/${X}; done
@ -215,7 +219,7 @@ Firmware-Diy_Base() {
} || AutoUpdate_Version=OFF } || AutoUpdate_Version=OFF
Copy CustomFiles/Depends/profile package/base-files/files/etc Copy CustomFiles/Depends/profile package/base-files/files/etc
Copy CustomFiles/Depends/base-files-essential package/base-files/files/lib/upgrade/keep.d Copy CustomFiles/Depends/base-files-essential package/base-files/files/lib/upgrade/keep.d
case "${Openwrt_Maintainer}" in case "${OP_Maintainer}" in
coolsnowwolf) coolsnowwolf)
sed -i "/dns_caching_dns/d" $(PKG_Finder d package luci-app-turboacc)/root/etc/config/turboacc 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 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) immortalwrt)
sed -i "/dns_caching_dns/d" $(PKG_Finder d "package feeds" luci-app-turboacc)/root/etc/config/turboacc 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 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 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} sed -i "s?ImmortalWrt?ImmortalWrt @ ${Author} [${Display_Date}]?g" ${Version_File}
;; ;;
esac esac
case "${Openwrt_Maintainer}" in case "${OP_Maintainer}" in
immortalwrt) immortalwrt)
Copy CustomFiles/Depends/banner $(PKG_Finder d package default-settings)/files openwrt_banner 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 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 source ./VARIABLE_FILE_Sec
case "${INCLUDE_Obsolete_PKG_Compatible}" in case "${INCLUDE_Obsolete_PKG_Compatible}" in
19.07) 19.07)
Openwrt_Branch=19.07 OP_BRANCH=19.07
Force_mode=1 Force_mode=1
INCLUDE_Obsolete_PKG_Compatible=true INCLUDE_Obsolete_PKG_Compatible=true
;; ;;
21.02) 21.02)
Openwrt_Branch=21.02 OP_BRANCH=21.02
Force_mode=1 Force_mode=1
INCLUDE_Obsolete_PKG_Compatible=true INCLUDE_Obsolete_PKG_Compatible=true
;; ;;
esac esac
if [[ ${INCLUDE_Obsolete_PKG_Compatible} == true ]];then if [[ ${INCLUDE_Obsolete_PKG_Compatible} == true ]];then
TIME "Start to run Obsolete_Package_Compatible Scripts ..." TIME "Start to run Obsolete_Package_Compatible Scripts ..."
if [[ ${Openwrt_Maintainer} == openwrt || ${Force_mode} == 1 ]];then if [[ ${OP_Maintainer} == openwrt || ${Force_mode} == 1 ]];then
case "${Openwrt_Branch}" in case "${OP_BRANCH}" in
19.07 | 21.02) 19.07 | 21.02)
Copy CustomFiles/Patches/0003-upx-ucl-${Openwrt_Branch}.patch ./ Copy CustomFiles/Patches/0003-upx-ucl-${OP_BRANCH}.patch ./
cat 0003-upx-ucl-${Openwrt_Branch}.patch | patch -p1 > /dev/null 2>&1 cat 0003-upx-ucl-${OP_BRANCH}.patch | patch -p1 > /dev/null 2>&1
# AddPackage svn feeds/packages golang coolsnowwolf/packages/trunk/lang # AddPackage svn feeds/packages golang coolsnowwolf/packages/trunk/lang
TIME "Start to convert zh-cn translation files to zh_Hans ..." TIME "Start to convert zh-cn translation files to zh_Hans ..."
Copy Scripts/Convert_Translation.sh package Copy Scripts/Convert_Translation.sh package
cd ./package && bash ./Convert_Translation.sh && cd .. 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 esac
else else
TIME "Current source: [${Openwrt_Maintainer}] is not supported,skip..." TIME "Current source: [${OP_Maintainer}] is not supported,skip..."
fi fi
fi fi
if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then if [[ -s $GITHUB_WORKSPACE/Configs/Common ]];then
@ -399,7 +403,7 @@ AddPackage() {
PKG_NAME="$3" PKG_NAME="$3"
REPO_URL="https://github.com/$4" REPO_URL="https://github.com/$4"
[[ -z $5 ]] && REPO_BRANCH=master || REPO_BRANCH="$5" [[ -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} mkdir -p package/${PKG_DIR}
[[ -d package/${PKG_DIR}/${PKG_NAME} ]] && { [[ -d package/${PKG_DIR}/${PKG_NAME} ]] && {