Skip to content

GitLab

"include/git@developer.sourcefind.cn:yangql/googletest.git" did not exist on "1afe1c7971e649ae8b85a39fc1ab6ac595e1dd58"
Unverified Commit 016c645a authored by wukongdaily's avatar wukongdaily Committed by GitHub
Browse files

调整第三方软件包定义的位置shell/custom-packages.sh

parent bd263f4d
Show whitespace changes
Inline Side-by-side
Showing with 45 additions and 74 deletions
.github/workflows/build-x86-64-23.05.4.yml
View file @ 016c645a
...@@ -66,7 +66,7 @@ jobs: ...@@ -66,7 +66,7 @@ jobs:
-v "${{ github.workspace }}/bin:/home/build/immortalwrt/bin" \ -v "${{ github.workspace }}/bin:/home/build/immortalwrt/bin" \
-v "${{ github.workspace }}/files:/home/build/immortalwrt/files" \ -v "${{ github.workspace }}/files:/home/build/immortalwrt/files" \
-v "${{ github.workspace }}/x86-64/imm.config:/home/build/immortalwrt/.config" \ -v "${{ github.workspace }}/x86-64/imm.config:/home/build/immortalwrt/.config" \
-v "${{ github.workspace }}/shell/prepare-packages.sh:/home/build/immortalwrt/prepare-packages.sh" \ -v "${{ github.workspace }}/shell:/home/build/immortalwrt/shell" \
-v "${{ github.workspace }}/x86-64/build.sh:/home/build/immortalwrt/build.sh" \ -v "${{ github.workspace }}/x86-64/build.sh:/home/build/immortalwrt/build.sh" \
-e PROFILE=$profile \ -e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \ -e INCLUDE_DOCKER=$include_docker \
......
.github/workflows/build-x86-64-24.10.2.yml
View file @ 016c645a
...@@ -66,7 +66,7 @@ jobs: ...@@ -66,7 +66,7 @@ jobs:
-v "${{ github.workspace }}/bin:/home/build/immortalwrt/bin" \ -v "${{ github.workspace }}/bin:/home/build/immortalwrt/bin" \
-v "${{ github.workspace }}/files:/home/build/immortalwrt/files" \ -v "${{ github.workspace }}/files:/home/build/immortalwrt/files" \
-v "${{ github.workspace }}/x86-64/imm.config:/home/build/immortalwrt/.config" \ -v "${{ github.workspace }}/x86-64/imm.config:/home/build/immortalwrt/.config" \
-v "${{ github.workspace }}/shell/prepare-packages.sh:/home/build/immortalwrt/prepare-packages.sh" \ -v "${{ github.workspace }}/shell:/home/build/immortalwrt/shell" \
-v "${{ github.workspace }}/x86-64/24.10/build.sh:/home/build/immortalwrt/build.sh" \ -v "${{ github.workspace }}/x86-64/24.10/build.sh:/home/build/immortalwrt/build.sh" \
-e PROFILE=$profile \ -e PROFILE=$profile \
-e INCLUDE_DOCKER=$include_docker \ -e INCLUDE_DOCKER=$include_docker \
......
shell/custom-packages.sh
View file @ 016c645a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# ============= imm仓库外的第三方插件============== # ============= imm仓库外的第三方插件==============
# ============= 若启用 则打开注释 ================ # ============= 若启用 则打开注释 ================
# istore商店 # istore商店
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store" CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-store"
# 首页和网络向导 # 首页和网络向导
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-quickstart-zh-cn" #CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-quickstart-zh-cn"
# 去广告adghome # 去广告adghome
......
x86-64/24.10/build.sh
View file @ 016c645a
#!/bin/bash #!/bin/bash
# Log file for debugging # Log file for debugging
source shell/custom-packages.sh
echo "第三方软件包: $CUSTOM_PACKAGES"
LOGFILE="/tmp/uci-defaults-log.txt" LOGFILE="/tmp/uci-defaults-log.txt"
echo "Starting 99-custom.sh at $(date)" >> $LOGFILE echo "Starting 99-custom.sh at $(date)" >> $LOGFILE
echo "编译固件大小为: $PROFILE MB" echo "编译固件大小为: $PROFILE MB"
...@@ -18,20 +20,24 @@ EOF ...@@ -18,20 +20,24 @@ EOF
echo "cat pppoe-settings" echo "cat pppoe-settings"
cat /home/build/immortalwrt/files/etc/config/pppoe-settings cat /home/build/immortalwrt/files/etc/config/pppoe-settings
# ============= 同步第三方插件库============== if [ -z "$CUSTOM_PACKAGES" ]; then
# 下载 run 文件仓库 echo "⚪️ 未选择 任何第三方软件包"
echo "🔄 Cloning run file repo..." else
git clone --depth=1 https://github.com/wukongdaily/store.git /tmp/store-run-repo # ============= 同步第三方插件库==============
# 同步第三方软件仓库run/ipk
echo "🔄 正在同步第三方软件仓库 Cloning run file repo..."
git clone --depth=1 https://github.com/wukongdaily/store.git /tmp/store-run-repo
# 拷贝 run/x86 下所有 run 文件和ipk文件 到 extra-packages 目录 # 拷贝 run/x86 下所有 run 文件和ipk文件 到 extra-packages 目录
mkdir -p /home/build/immortalwrt/extra-packages mkdir -p /home/build/immortalwrt/extra-packages
cp -r /tmp/store-run-repo/run/x86/* /home/build/immortalwrt/extra-packages/ cp -r /tmp/store-run-repo/run/x86/* /home/build/immortalwrt/extra-packages/
echo "✅ Run files copied to extra-packages:" echo "✅ Run files copied to extra-packages:"
ls -lh /home/build/immortalwrt/extra-packages/*.run ls -lh /home/build/immortalwrt/extra-packages/*.run
# 解压并拷贝ipk到packages目录 # 解压并拷贝ipk到packages目录
sh prepare-packages.sh sh shell/prepare-packages.sh
ls -lah /home/build/immortalwrt/packages/ ls -lah /home/build/immortalwrt/packages/
fi
# 输出调试信息 # 输出调试信息
echo "$(date '+%Y-%m-%d %H:%M:%S') - 开始构建固件..." echo "$(date '+%Y-%m-%d %H:%M:%S') - 开始构建固件..."
...@@ -56,30 +62,10 @@ PACKAGES="$PACKAGES luci-i18n-samba4-zh-cn" ...@@ -56,30 +62,10 @@ PACKAGES="$PACKAGES luci-i18n-samba4-zh-cn"
PACKAGES="$PACKAGES luci-i18n-filemanager-zh-cn" PACKAGES="$PACKAGES luci-i18n-filemanager-zh-cn"
# 静态文件服务器dufs(推荐) # 静态文件服务器dufs(推荐)
PACKAGES="$PACKAGES luci-i18n-dufs-zh-cn" PACKAGES="$PACKAGES luci-i18n-dufs-zh-cn"
# ======== shell/custom-packages.sh =======
# 合并imm仓库以外的第三方插件
PACKAGES="$PACKAGES $CUSTOM_PACKAGES"
# ============= imm仓库外的第三方插件==============
# ============= 若启用 则打开注释 ================
# istore商店
#PACKAGES="$PACKAGES luci-app-store"
# 首页和网络向导
#PACKAGES="$PACKAGES luci-i18n-quickstart-zh-cn"
# 去广告adghome
#PACKAGES="$PACKAGES luci-app-adguardhome"
# 代理相关
#PACKAGES="$PACKAGES luci-app-ssr-plus"
#PACKAGES="$PACKAGES luci-app-passwall2"
#PACKAGES="$PACKAGES luci-i18n-nikki-zh-cn"
# VPN
#PACKAGES="$PACKAGES luci-app-tailscale"
#PACKAGES="$PACKAGES luci-i18n-tailscale-zh-cn"
# 分区扩容 by sirpdboy
#PACKAGES="$PACKAGES luci-app-partexp"
#PACKAGES="$PACKAGES luci-i18n-partexp-zh-cn"
# 酷猫主题 by sirpdboy
#PACKAGES="$PACKAGES luci-theme-kucat"
# 网络测速 by sirpdboy
#PACKAGES="$PACKAGES luci-app-netspeedtest"
#PACKAGES="$PACKAGES luci-i18n-netspeedtest-zh-cn"
# 判断是否需要编译 Docker 插件 # 判断是否需要编译 Docker 插件
if [ "$INCLUDE_DOCKER" = "yes" ]; then if [ "$INCLUDE_DOCKER" = "yes" ]; then
......
x86-64/build.sh
View file @ 016c645a
#!/bin/bash #!/bin/bash
# Log file for debugging # Log file for debugging
source shell/custom-packages.sh
echo "第三方软件包: $CUSTOM_PACKAGES"
LOGFILE="/tmp/uci-defaults-log.txt" LOGFILE="/tmp/uci-defaults-log.txt"
echo "Starting 99-custom.sh at $(date)" >> $LOGFILE echo "Starting 99-custom.sh at $(date)" >> $LOGFILE
echo "编译固件大小为: $PROFILE MB" echo "编译固件大小为: $PROFILE MB"
...@@ -18,20 +20,24 @@ EOF ...@@ -18,20 +20,24 @@ EOF
echo "cat pppoe-settings" echo "cat pppoe-settings"
cat /home/build/immortalwrt/files/etc/config/pppoe-settings cat /home/build/immortalwrt/files/etc/config/pppoe-settings
# ============= 同步第三方插件库============== if [ -z "$CUSTOM_PACKAGES" ]; then
# 下载 run 文件仓库 echo "⚪️ 未选择 任何第三方软件包"
echo "🔄 Cloning run file repo..." else
git clone --depth=1 https://github.com/wukongdaily/store.git /tmp/store-run-repo # ============= 同步第三方插件库==============
# 正在同步第三方软件仓库
echo "🔄 正在同步第三方软件仓库 Cloning run file repo..."
git clone --depth=1 https://github.com/wukongdaily/store.git /tmp/store-run-repo
# 拷贝 run/x86 下所有 run 文件和ipk文件 到 extra-packages 目录 # 拷贝 run/x86 下所有 run 文件和ipk文件 到 extra-packages 目录
mkdir -p /home/build/immortalwrt/extra-packages mkdir -p /home/build/immortalwrt/extra-packages
cp -r /tmp/store-run-repo/run/x86/* /home/build/immortalwrt/extra-packages/ cp -r /tmp/store-run-repo/run/x86/* /home/build/immortalwrt/extra-packages/
echo "✅ Run files copied to extra-packages:" echo "✅ Run files copied to extra-packages:"
ls -lh /home/build/immortalwrt/extra-packages/*.run ls -lh /home/build/immortalwrt/extra-packages/*.run
# 解压并拷贝ipk到packages目录 # 解压并拷贝ipk到packages目录
sh prepare-packages.sh sh shell/prepare-packages.sh
ls -lah /home/build/immortalwrt/packages/ ls -lah /home/build/immortalwrt/packages/
fi
# 输出调试信息 # 输出调试信息
echo "$(date '+%Y-%m-%d %H:%M:%S') - 开始构建..." echo "$(date '+%Y-%m-%d %H:%M:%S') - 开始构建..."
...@@ -52,30 +58,9 @@ PACKAGES="$PACKAGES openssh-sftp-server" ...@@ -52,30 +58,9 @@ PACKAGES="$PACKAGES openssh-sftp-server"
PACKAGES="$PACKAGES luci-i18n-samba4-zh-cn" PACKAGES="$PACKAGES luci-i18n-samba4-zh-cn"
# 静态文件服务器dufs(推荐) # 静态文件服务器dufs(推荐)
PACKAGES="$PACKAGES luci-i18n-dufs-zh-cn" PACKAGES="$PACKAGES luci-i18n-dufs-zh-cn"
# ======== shell/custom-packages.sh =======
# ============= imm仓库外的第三方插件============== # 合并imm仓库以外的第三方插件
# ============= 若启用 则打开注释 ================ PACKAGES="$PACKAGES $CUSTOM_PACKAGES"
# istore商店
#PACKAGES="$PACKAGES luci-app-store"
# 首页和网络向导
#PACKAGES="$PACKAGES luci-i18n-quickstart-zh-cn"
# 去广告adghome
#PACKAGES="$PACKAGES luci-app-adguardhome"
# 代理相关
#PACKAGES="$PACKAGES luci-app-ssr-plus"
#PACKAGES="$PACKAGES luci-app-passwall2"
#PACKAGES="$PACKAGES luci-i18n-nikki-zh-cn"
# VPN
#PACKAGES="$PACKAGES luci-app-tailscale"
#PACKAGES="$PACKAGES luci-i18n-tailscale-zh-cn"
# 分区扩容 by sirpdboy
#PACKAGES="$PACKAGES luci-app-partexp"
#PACKAGES="$PACKAGES luci-i18n-partexp-zh-cn"
# 酷猫主题 by sirpdboy
#PACKAGES="$PACKAGES luci-theme-kucat"
# 网络测速 by sirpdboy
#PACKAGES="$PACKAGES luci-app-netspeedtest"
#PACKAGES="$PACKAGES luci-i18n-netspeedtest-zh-cn"
# 判断是否需要编译 Docker 插件 # 判断是否需要编译 Docker 插件
if [ "$INCLUDE_DOCKER" = "yes" ]; then if [ "$INCLUDE_DOCKER" = "yes" ]; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment