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

精简

This commit is contained in:
Hyy2001X 2021-03-04 11:48:24 +08:00 committed by GitHub
parent 97117dcc74
commit 7164dfcc54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Scripts/AutoBuild_Function.sh
View File

@ -20,7 +20,7 @@ GET_TARGET_INFO() {
[[ -z "${TARGET_PROFILE}" ]] && TARGET_PROFILE="${Default_Device}" [[ -z "${TARGET_PROFILE}" ]] && TARGET_PROFILE="${Default_Device}"
case "${TARGET_PROFILE}" in case "${TARGET_PROFILE}" in
x86_64) x86_64)
grep "CONFIG_TARGET_IMAGES_GZIP=y" ${Home}/.config grep "CONFIG_TARGET_IMAGES_GZIP=y" ${Home}/.config > /dev/null 2>&1
if [[ ! $? -ne 0 ]];then if [[ ! $? -ne 0 ]];then
Firmware_sfx="img.gz" Firmware_sfx="img.gz"
else else
@ -74,7 +74,6 @@ Diy_Part1_Base() {
fi fi
Update_Makefile xray-core package/lean/helloworld/xray-core Update_Makefile xray-core package/lean/helloworld/xray-core
Update_Makefile exfat package/kernel/exfat Update_Makefile exfat package/kernel/exfat
# ExtraPackages svn kernel mt76 https://github.com/openwrt/openwrt/trunk/package/kernel
} }
Diy_Part2_Base() { Diy_Part2_Base() {
@ -200,38 +199,23 @@ ExtraPackages() {
rm -rf package/${PKG_DIR}/${PKG_NAME} rm -rf package/${PKG_DIR}/${PKG_NAME}
fi fi
[ -d "${PKG_NAME}" ] && rm -rf ${PKG_NAME} [ -d "${PKG_NAME}" ] && rm -rf ${PKG_NAME}
Retry_Times=3
while [ ! -f "${PKG_NAME}/Makefile" ]
do
echo "[$(date "+%H:%M:%S")] Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..." echo "[$(date "+%H:%M:%S")] Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..."
case "${PKG_PROTO}" in case "${PKG_PROTO}" in
git) git)
[[ -z "${REPO_BRANCH}" ]] && REPO_BRANCH=master
if [[ -z "${REPO_BRANCH}" ]];then
REPO_BRANCH="master"
fi
git clone -b ${REPO_BRANCH} ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 git clone -b ${REPO_BRANCH} ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
;; ;;
svn) svn)
svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
;; ;;
*) *)
echo "[$(date "+%H:%M:%S")] Wrong option: ${PKG_PROTO} (Can only use git and svn),skip check out..." echo "[$(date "+%H:%M:%S")] Error option: ${PKG_PROTO} !" && return
break
;; ;;
esac esac
if [ "$?" -eq 0 ] || [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ] || [ ! "$(ls -A ${PKG_NAME})" = "" ];then if [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ] || [ ! "$(ls -A ${PKG_NAME})" = "" ];then
echo "[$(date "+%H:%M:%S")] Package [${PKG_NAME}] is detected!" echo "[$(date "+%H:%M:%S")] Package [${PKG_NAME}] is detected!"
mv -f ${PKG_NAME} package/${PKG_DIR} mv -f ${PKG_NAME} package/${PKG_DIR}
break
else
[ ${Retry_Times} -lt 1 ] && echo "[$(date "+%H:%M:%S")] Skip check out package [${PKG_NAME}] ..." && break
echo "[$(date "+%H:%M:%S")] [Error] [${Retry_Times}] Checkout failed,retry in 3s ..."
Retry_Times=$(($Retry_Times - 1))
rm -rf ${PKG_NAME}
sleep 3
fi fi
done
unset PKG_PROTO PKG_DIR PKG_NAME REPO_URL REPO_BRANCH unset PKG_PROTO PKG_DIR PKG_NAME REPO_URL REPO_BRANCH
} }
@ -240,10 +224,10 @@ Replace_File() {
PATCH_DIR=${GITHUB_WORKSPACE}/openwrt/${2} PATCH_DIR=${GITHUB_WORKSPACE}/openwrt/${2}
FILE_RENAME=${3} FILE_RENAME=${3}
Mkdir "${PATCH_DIR}" Mkdir ${PATCH_DIR}
[ -f "${GITHUB_WORKSPACE}/${FILE_NAME}" ] && _TYPE1="f" && _TYPE2="File" [ -f "${GITHUB_WORKSPACE}/${FILE_NAME}" ] && _TYPE1="f" && _TYPE2="File"
[ -d "${GITHUB_WORKSPACE}/${FILE_NAME}" ] && _TYPE1="d" && _TYPE2="Folder" [ -d "${GITHUB_WORKSPACE}/${FILE_NAME}" ] && _TYPE1="d" && _TYPE2="Folder"
if [ -e "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then if [ -f "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then
[[ ! -z "${FILE_RENAME}" ]] && _RENAME="${FILE_RENAME}" || _RENAME="" [[ ! -z "${FILE_RENAME}" ]] && _RENAME="${FILE_RENAME}" || _RENAME=""
if [ -${_TYPE1} "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then if [ -${_TYPE1} "${GITHUB_WORKSPACE}/${FILE_NAME}" ];then
echo "[$(date "+%H:%M:%S")] Moving [${_TYPE2}] ${FILE_NAME} to ${2}/${FILE_RENAME} ..." echo "[$(date "+%H:%M:%S")] Moving [${_TYPE2}] ${FILE_NAME} to ${2}/${FILE_RENAME} ..."
@ -252,7 +236,7 @@ Replace_File() {
echo "[$(date "+%H:%M:%S")] Customize ${_TYPE2} [${FILE_NAME}] is not detected,skip move ..." echo "[$(date "+%H:%M:%S")] Customize ${_TYPE2} [${FILE_NAME}] is not detected,skip move ..."
fi fi
fi fi
unset FILE_NAME PATCH_DIR FILE_RENAME _RENAME _TYPE1 _TYPE2 unset FILE_NAME PATCH_DIR FILE_RENAME
} }
Update_Makefile() { Update_Makefile() {