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-04-16 21:37:28 +08:00
parent 931cb14841
commit 1b8ca1b6d5
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Scripts/AutoBuild_Function.sh
View File

@ -133,18 +133,18 @@ Firmware-Diy_Base() {
coolsnowwolf) coolsnowwolf)
Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh Replace_File CustomFiles/Depends/coremark_lede.sh package/lean/coremark coremark.sh
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
ExtraPackages git lean helloworld https://github.com/fw876 master ExtraPackages git other helloworld https://github.com/fw876 master
sed -i 's/143/143,8080/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr sed -i 's/143/143,8080/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
sed -i "s?iptables?#iptables?g" ${Version_File} > /dev/null 2>&1 sed -i "s?iptables?#iptables?g" ${Version_File} > /dev/null 2>&1
sed -i "s?${Old_Version}?${Old_Version} Compiled by ${Author} [${Display_Date}]?g" $Version_File sed -i "s?${Old_Version}?${Old_Version} Compiled by ${Author} [${Display_Date}]?g" ${Version_File}
[[ "${INCLUDE_DRM_I915}" == true ]] && Replace_File CustomFiles/Depends/i915-5.4 target/linux/x86 config-5.4 [[ "${INCLUDE_DRM_I915}" == true ]] && Replace_File CustomFiles/Depends/i915-5.4 target/linux/x86 config-5.4
;; ;;
immortalwrt) immortalwrt)
sed -i 's/143/143,8080/' package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr sed -i 's/143/143,8080/' $(PKG_Finder d package luci-app-ssr-plus)/root/etc/init.d/shadowsocksr
Replace_File CustomFiles/Depends/coremark_ImmortalWrt.sh package/base-files/files/etc coremark.sh Replace_File CustomFiles/Depends/coremark_ImmortalWrt.sh package/base-files/files/etc coremark.sh
Replace_File CustomFiles/Depends/ImmortalWrt package/base-files/files/etc openwrt_release Replace_File CustomFiles/Depends/ImmortalWrt package/base-files/files/etc openwrt_release
Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo Replace_File CustomFiles/Depends/cpuinfo_x86 package/lean/autocore/files/x86/sbin cpuinfo
sed -i "s?Template?Compiled by ${Author} [${Display_Date}]?g" $Version_File sed -i "s?Template?Compiled by ${Author} [${Display_Date}]?g" ${Version_File}
[[ "${INCLUDE_DRM_I915}" == true ]] && Replace_File CustomFiles/Depends/i915-4.19 target/linux/x86 config-4.19 [[ "${INCLUDE_DRM_I915}" == true ]] && Replace_File CustomFiles/Depends/i915-4.19 target/linux/x86 config-4.19
;; ;;
esac esac
@ -170,7 +170,6 @@ Firmware-Diy_Base() {
Replace_File CustomFiles/Patches/0003-upx-ucl-${Current_Branch}.patch ./ Replace_File CustomFiles/Patches/0003-upx-ucl-${Current_Branch}.patch ./
cat 0003-upx-ucl-${Current_Branch}.patch | patch -p1 > /dev/null 2>&1 cat 0003-upx-ucl-${Current_Branch}.patch | patch -p1 > /dev/null 2>&1
ExtraPackages svn ../feeds/packages/lang golang https://github.com/coolsnowwolf/packages/trunk/lang ExtraPackages svn ../feeds/packages/lang golang https://github.com/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 ..."
Replace_File Scripts/Convert_Translation.sh package Replace_File Scripts/Convert_Translation.sh package
cd ./package cd ./package
@ -222,8 +221,8 @@ PS_Firmware() {
case "${TARGET_PROFILE}" in case "${TARGET_PROFILE}" in
x86_64) x86_64)
cd ${Firmware_Path} cd ${Firmware_Path}
Legacy_Firmware=${_Firmware}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${_Legacy_Firmware}.${Firmware_Type} Legacy_Firmware="${_Firmware}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${_Legacy_Firmware}.${Firmware_Type}"
EFI_Firmware=${_Firmware}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${_EFI_Firmware}.${Firmware_Type} EFI_Firmware="${_Firmware}-${TARGET_BOARD}-${TARGET_SUBTARGET}-${_EFI_Firmware}.${Firmware_Type}"
AutoBuild_Firmware="AutoBuild-${TARGET_PROFILE}-${Openwrt_Version}" AutoBuild_Firmware="AutoBuild-${TARGET_PROFILE}-${Openwrt_Version}"
echo "[Preload Info] Legacy_Firmware: ${Legacy_Firmware}" echo "[Preload Info] Legacy_Firmware: ${Legacy_Firmware}"
echo "[Preload Info] UEFI_Firmware: ${EFI_Firmware}" echo "[Preload Info] UEFI_Firmware: ${EFI_Firmware}"
@ -311,6 +310,10 @@ Auto_ExtraPackages() {
} }
Auto_ExtraPackages_mod() { Auto_ExtraPackages_mod() {
[[ $# != 1 ]] && {
TIME "[ERROR] Error options: [$#] [$*] !"
return 0
}
_FILENAME=${1} _FILENAME=${1}
echo "" >> ${_FILENAME} echo "" >> ${_FILENAME}
[ -f "${_FILENAME}" ] && { [ -f "${_FILENAME}" ] && {
@ -343,9 +346,9 @@ ExtraPackages() {
REPO_URL=${4} REPO_URL=${4}
REPO_BRANCH=${5} REPO_BRANCH=${5}
Mkdir "package/${PKG_DIR}" Mkdir package/${PKG_DIR}
[ -d "package/${PKG_DIR}/${PKG_NAME}" ] && { [ -d "package/${PKG_DIR}/${PKG_NAME}" ] && {
TIME "Removing old package [${PKG_NAME}] ..." TIME "Removing old package: [${PKG_NAME}] ..."
rm -rf "package/${PKG_DIR}/${PKG_NAME}" rm -rf "package/${PKG_DIR}/${PKG_NAME}"
} }
TIME "Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..." TIME "Checking out package [${PKG_NAME}] to package/${PKG_DIR} ..."
@ -359,7 +362,7 @@ ExtraPackages() {
svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1 svn checkout ${REPO_URL}/${PKG_NAME} ${PKG_NAME} > /dev/null 2>&1
;; ;;
esac esac
[ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ] && { [ -f ${PKG_NAME}/Makefile ] || [ -f ${PKG_NAME}/README* ] || [[ -n "$(ls -A ${PKG_NAME})" ]] && {
mv -f "${PKG_NAME}" "package/${PKG_DIR}" mv -f "${PKG_NAME}" "package/${PKG_DIR}"
} || { } || {
TIME "[ERROR] Package [${PKG_NAME}] is not detected!" TIME "[ERROR] Package [${PKG_NAME}] is not detected!"