修改编译选项

- 增加编译名称显示最新commit hash
- cherry-pick失败后停止

.github/workflows/build-firmware.yml

@@ -53,9 +53,8 @@ jobs:
     - name: Get Architecture
       working-directory: ${{ github.workspace }}/openwrt
       run: |
-        TARGET_DEVICE_ARCH="$(grep "^CONFIG_TARGET_.*_.*=y$" ".config" | head -n 1 | sed 's/^CONFIG_TARGET_//g' | awk -F '_' '{print $1}')"
-        echo "TARGET_DEVICE_ARCH=${TARGET_DEVICE_ARCH}-3328" >>$GITHUB_ENV
-        # latest_release="$(curl -s https://github.com/openwrt/openwrt/tags | grep -Eo "v[0-9\.]+\-*r*c*[0-9]*.tar.gz" | sed -n '/[2-9][3-9]/p' | sed -n 1p | sed 's/.tar.gz//g' | sed 's/v//g')"
+        LAST_COMMIT_HASH=$(curl -s "https://api.github.com/repos/bitthief/openwrt/commits/qualcommax-6.1-nss" | grep -m 1 '"sha":' | cut -d '"' -f 4 | cut -c 1-7)
+        echo "LAST_COMMIT_HASH=${LAST_COMMIT_HASH}" >> $GITHUB_ENV
         tag_name=$(date +%Y%m%d-%H%M)
         echo "tag_name=${tag_name}" >>$GITHUB_ENV
     - name: Make Download
@@ -97,9 +96,9 @@ jobs:
       id: create_release
       uses: ncipollo/[email protected]
       with:
-        name: ax3600-${{ env.tag_name }}
+        name: ax3600-${{ env.tag_name }}-${{ env.LAST_COMMIT_HASH }}
         allowUpdates: true
-        tag: ${{ env.tag_name }}
+        tag: ${{ env.tag_name }}-${{ env.LAST_COMMIT_HASH }}
         replacesArtifacts: true
         token: ${{ secrets.GITHUB_TOKEN }}
-        artifacts: ./artifact/*
+        artifacts: ./artifact/*

config/xiaomi_ax3600-stock.config

@@ -61,10 +61,16 @@ CONFIG_OPENSSL_WITH_SEED=y
 CONFIG_OPENSSL_WITH_SRP=y
 CONFIG_OPENSSL_WITH_TLS13=y
 CONFIG_OPENSSL_WITH_WHIRLPOOL=y
+CONFIG_PACKAGE_TAR_BZIP2=y
+CONFIG_PACKAGE_TAR_GZIP=y
+CONFIG_PACKAGE_TAR_XZ=y
+CONFIG_PACKAGE_TAR_ZSTD=y
+CONFIG_PACKAGE_adguardhome=y
 # CONFIG_PACKAGE_ath10k-board-qca9887 is not set
 # CONFIG_PACKAGE_ath10k-firmware-qca9887-ct is not set
 CONFIG_PACKAGE_autocore=y
 CONFIG_PACKAGE_bash=y
+CONFIG_PACKAGE_bzip2=y
 CONFIG_PACKAGE_ca-certificates=y
 CONFIG_PACKAGE_cgi-io=y
 CONFIG_PACKAGE_coremark=y
@@ -83,6 +89,8 @@ CONFIG_PACKAGE_dnsmasq_full_dnssec=y
 CONFIG_PACKAGE_dnsmasq_full_nftset=y
 CONFIG_PACKAGE_dnsmasq_full_noid=y
 CONFIG_PACKAGE_dnsmasq_full_tftp=y
+CONFIG_PACKAGE_git=y
+CONFIG_PACKAGE_git-http=y
 # CONFIG_PACKAGE_hostapd-common is not set
 CONFIG_PACKAGE_htop=y
 CONFIG_PACKAGE_ip-full=y
@@ -135,6 +143,7 @@ CONFIG_PACKAGE_kmod-udptunnel6=y
 CONFIG_PACKAGE_kmod-vxlan=y
 CONFIG_PACKAGE_libatomic=y
 CONFIG_PACKAGE_libbpf=y
+CONFIG_PACKAGE_libbz2=y
 CONFIG_PACKAGE_libcap=y
 CONFIG_PACKAGE_libcap-bin=y
 CONFIG_PACKAGE_libcap-bin-capsh-shell="/bin/sh"
@@ -150,13 +159,15 @@ CONFIG_PACKAGE_liblua=y
 CONFIG_PACKAGE_liblucihttp=y
 CONFIG_PACKAGE_liblucihttp-lua=y
 CONFIG_PACKAGE_liblucihttp-ucode=y
+CONFIG_PACKAGE_liblzma=y
 CONFIG_PACKAGE_libncurses=y
 CONFIG_PACKAGE_libnetfilter-conntrack=y
 CONFIG_PACKAGE_libnettle=y
 CONFIG_PACKAGE_libnfnetlink=y
 CONFIG_PACKAGE_libnghttp2=y
 CONFIG_PACKAGE_libopenssl=y
 CONFIG_PACKAGE_libpci=y
+CONFIG_PACKAGE_libpcre=y
 CONFIG_PACKAGE_libreadline=y
 CONFIG_PACKAGE_libruby=y
 CONFIG_PACKAGE_libstdcpp=y
@@ -166,6 +177,7 @@ CONFIG_PACKAGE_libusb-1.0=y
 CONFIG_PACKAGE_libuv=y
 CONFIG_PACKAGE_libwebsockets-full=y
 CONFIG_PACKAGE_libyaml=y
+CONFIG_PACKAGE_libzstd=y
 CONFIG_PACKAGE_lua=y
 CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-app-firewall=y
@@ -176,6 +188,11 @@ CONFIG_PACKAGE_luci-app-upnp=y
 CONFIG_PACKAGE_luci-app-vlmcsd=y
 CONFIG_PACKAGE_luci-base=y
 CONFIG_PACKAGE_luci-compat=y
+CONFIG_PACKAGE_luci-i18n-base-zh-cn=y
+CONFIG_PACKAGE_luci-i18n-firewall-zh-cn=y
+CONFIG_PACKAGE_luci-i18n-opkg-zh-cn=y
+CONFIG_PACKAGE_luci-i18n-ttyd-zh-cn=y
+CONFIG_PACKAGE_luci-i18n-upnp-zh-cn=y
 CONFIG_PACKAGE_luci-lib-base=y
 CONFIG_PACKAGE_luci-lib-ip=y
 CONFIG_PACKAGE_luci-lib-jsonc=y
@@ -220,19 +237,24 @@ CONFIG_PACKAGE_ttyd=y
 CONFIG_PACKAGE_ucode-mod-html=y
 CONFIG_PACKAGE_ucode-mod-lua=y
 CONFIG_PACKAGE_ucode-mod-math=y
+# CONFIG_PACKAGE_ucode-mod-nl80211 is not set
+# CONFIG_PACKAGE_ucode-mod-rtnl is not set
+# CONFIG_PACKAGE_ucode-mod-uloop is not set
 CONFIG_PACKAGE_uhttpd=y
 CONFIG_PACKAGE_uhttpd-mod-ubus=y
 CONFIG_PACKAGE_unzip=y
 CONFIG_PACKAGE_usbutils=y
-CONFIG_PACKAGE_vlmcsd=y
-CONFIG_PACKAGE_zsh=y
 CONFIG_PACKAGE_vim=y
+CONFIG_PACKAGE_vlmcsd=y
 CONFIG_PACKAGE_vsftpd=y
-CONFIG_PACKAGE_git-http=y
 # CONFIG_PACKAGE_wireless-regdb is not set
 # CONFIG_PACKAGE_wpad-basic-mbedtls is not set
+CONFIG_PACKAGE_xz=y
+CONFIG_PACKAGE_xz-utils=y
 CONFIG_PACKAGE_zlib=y
+CONFIG_PACKAGE_zsh=y
 # CONFIG_WPA_MBO_SUPPORT is not set
+CONFIG_ZSTD_OPTIMIZE_O3=y
 CONFIG_PACKAGE_iw=y
 CONFIG_PACKAGE_kmod-crypto-aead=y
 CONFIG_PACKAGE_kmod-crypto-ccm=y

scripts/prepare.sh

@@ -1,18 +1,24 @@
 ###
 # @Author: zhkong
 # @Date: 2023-07-25 17:07:02
-# @LastEditors: zhkong
-# @LastEditTime: 2023-08-07 02:06:04
-# @FilePath: /xiaomi-ax3600-openwrt-build/scripts/prepare.sh
+ # @LastEditors: zhkong
+ # @LastEditTime: 2023-08-13 03:28:50
+ # @FilePath: /xiaomi-ax3600-openwrt-build/scripts/prepare.sh
 ###
 
 git clone https://github.com/bitthief/openwrt.git -b qualcommax-6.1-nss --single-branch openwrt --depth 1
 cd openwrt
 
+# 增加ax3600 stock布局
 git remote add upstream https://github.com/zhkong/openwrt-ipq807x.git
 git fetch upstream qualcommax-6.1-nss --depth 3
 git cherry-pick eaad44af90
 git cherry-pick 10c91d822e
+#如果checkout失败，说明有冲突，停止编译
+if [ $? -ne 0 ]; then
+    echo "cherry-pick failed, please check"
+    exit 1
+fi
 
 # 更新 Feeds
 ./scripts/feeds update -a
@@ -26,7 +32,7 @@ git clone https://github.com/jerrykuku/luci-theme-argon.git --single-branch --de
 ## KMS激活
 git clone https://github.com/flytosky-f/openwrt-vlmcsd.git --single-branch --depth 1 package/new/vlmcsd
 git clone https://github.com/ssuperh/luci-app-vlmcsd-new.git --single-branch --depth 1 package/new/luci-app-vlmcsd-new
-## adguardhome
+## Adguard Home
 svn export https://github.com/immortalwrt/packages/branches/master/net/adguardhome package/new/adguardhome
 ## mosdns
 git clone https://github.com/sbwml/luci-app-mosdns -b v5 package/new/mosdns
@@ -54,10 +60,9 @@ svn export https://github.com/immortalwrt/immortalwrt/branches/openwrt-23.05/pac
 bash ../scripts/preset-terminal-tools.sh
 
 # config file
-# cp ../config/xiaomi_ax3600-stock.config .config
 cp ../config/xiaomi_ax3600-stock.config .config
 make defconfig
 
-# # # 编译固件
+# 编译固件
 # make download -j$(nproc)
 # make -j$(nproc) || make -j1 V=s