update

kiddin9 · Nov 25, 2024 · cbc8a3b · cbc8a3b
1 parent 67eed73
commit cbc8a3b
Show file tree

Hide file tree

Showing 106 changed files with 1,445 additions and 3,292 deletions.
diff --git a/.github/workflows/Openwrt-AutoBuild.yml b/.github/workflows/Openwrt-AutoBuild.yml
@@ -69,13 +69,13 @@ jobs:
         elif [ ${{matrix.target}} == "x86_generic" ]; then
             echo "ARCH=linux/amd32" >> $GITHUB_ENV
             echo "MTARGET=x86_generic" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (armsr_armv8|ipq807x_generic|mediatek_mt7622|mediatek_mt7981|mediatek_filogic|bcm27xx_bcm2710|qualcommax_ipq60xx|bcm4908_generic|sunxi_cortexa53) ]]; then
+        elif [[ ${{matrix.target}} =~ (armsr_armv8|qualcommax_ipq807x|mediatek_mt7622|mediatek_mt7981|mediatek_filogic|bcm27xx_bcm2710|qualcommax_ipq60xx|bcm4908_generic|sunxi_cortexa53) ]]; then
             echo "MTARGET=aarch64_cortex-a53" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} =~ (ramips_mt7621|ramips_mt7620|ramips_mt76x8) ]]; then
             echo "MTARGET=mipsel_24kc" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} == "ath79_nand" ]]; then
             echo "MTARGET=mips_24kc" >> $GITHUB_ENV
-        elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709|sunxi_cortexa7|ipq50xx_arm) ]]; then
+        elif [[ ${{matrix.target}} =~ (ipq40xx_generic|bcm27xx_bcm2709|sunxi_cortexa7|qualcommax_ipq50xx) ]]; then
             echo "MTARGET=arm_cortex-a7_neon-vfpv4" >> $GITHUB_ENV
         elif [[ ${{matrix.target}} == "amlogic_meson8b" ]]; then
             echo "MTARGET=arm_cortex-a5_vfpv4" >> $GITHUB_ENV
@@ -98,8 +98,9 @@ jobs:
 
     - name: Trigger Packages Update
       continue-on-error: true
+      if: contains(github.event.action, 'pkg')
       run: |
-        status=$(curl -H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }} -s "https://api.github.com/repos/kiddin9/kwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
+        status=$(curl -H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" -s "https://api.github.com/repos/kiddin9/kwrt-packages/actions/runs" | jq -r '.workflow_runs[0].status')
         if [[ "$status" == "completed" ]]; then
           curl -X POST https://api.github.com/repos/kiddin9/kwrt-packages/dispatches \
             -H "Accept: application/vnd.github.everest-preview+json" \
@@ -153,19 +154,25 @@ jobs:
         if [[ $(( ($(date +%s) - $(date -d "$TAG_DATE" +%s)) / 86400 )) -lt 30 ]]; then
         REPO_BRANCH="$( echo ${TAG_INFO} | jq -r '.data.repository.refs.nodes[].name' | grep v23 | head -n 1)"
         else
-        REPO_BRANCH="openwrt-23.05"
+        REPO_BRANCH="openwrt-24.10"
         fi
-        #echo "CONFIG_VERSION_REPO=\"https://dl.openwrt.ai/`echo $REPO_BRANCH  | cut -d . -f 1,2 | sed -e 's/^v//'`\"">>devices/common/.config
-        echo "CONFIG_VERSION_REPO=\"https://dl.openwrt.ai/23.05\"">>devices/common/.config
+        #echo "CONFIG_VERSION_REPO=\"https://dl.openwrt.ai/releases/`echo $REPO_BRANCH  | cut -d . -f 1,2 | sed -e 's/^v//'`\"">>devices/common/.config
+        echo "CONFIG_VERSION_REPO=\"https://dl.openwrt.ai/releases/24.10\"">>devices/common/.config
         if [[ ! "${{ env.REPO_BRANCH }}" && "$REPO_URL" == "https://github.com/openwrt/openwrt" ]]; then
             git clone $REPO_URL -b $REPO_BRANCH openwrt
         elif [[ ! "${{ env.REPO_BRANCH }}" ]]; then
             git clone $REPO_URL openwrt
         else
-            git clone $REPO_URL -b ${{ env.REPO_BRANCH }} openwrt
-            echo "git clone $REPO_URL -b ${{ env.REPO_BRANCH }} openwrt"
+            REPO_BRANCH="${{env.REPO_BRANCH}}"
+            if [[ ${#REPO_BRANCH} -lt 10 ]]; then
+                git clone $REPO_URL -b ${REPO_BRANCH} openwrt
+            else
+                git clone $REPO_URL openwrt
+                cd openwrt
+                git checkout ${REPO_BRANCH}
+            fi
         fi
-    
+
     - name: Free up disk space
       env:
         DEBIAN_FRONTEND: noninteractive
@@ -252,13 +259,6 @@ jobs:
         fi
         cat .config
 
-    - name: Download package
-      id: package
-      run: |
-        cd openwrt
-        make download -j$(($(nproc)+1)) &
-        sleep 5
-
     - name: Cache
       uses: stupidloud/cachewrtbuild@main
       with:

diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml
@@ -122,7 +122,7 @@ jobs:
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" \
-          -d '{"event_type": "ipq50xx_arm ${{ github.event.inputs.param }}", "client_payload": {"target": "ipq50xx_arm"}}'
+          -d '{"event_type": "qualcommax_ipq50xx ${{ github.event.inputs.param }}", "client_payload": {"target": "qualcommax_ipq50xx"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
@@ -142,7 +142,7 @@ jobs:
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \
           -H "Authorization: token ${{ secrets.TOKEN_KIDDIN9 }}" \
-          -d '{"event_type": "ipq807x_generic ${{ github.event.inputs.param }}", "client_payload": {"target": "ipq807x_generic"}}'
+          -d '{"event_type": "qualcommax_ipq807x ${{ github.event.inputs.param }}", "client_payload": {"target": "qualcommax_ipq807x"}}'
           curl \
           -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \
           -H "Accept: application/vnd.github.everest-preview+json" \

diff --git a/devices/amlogic_meson8b/diy.sh b/devices/amlogic_meson8b/diy.sh
@@ -10,10 +10,16 @@ SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
 #git_clone_path c640f7b93736621b4d56627e4f6ab824093f9c3d https://github.com/openwrt/openwrt package/kernel/mac80211
 
-git_clone_path main https://github.com/shiyu1314/openwrt-onecloud kernel/amlogic && mv -f kernel/amlogic target/linux/
 
-sed -i "s/CPU_SUBTYPE:=neon-vfpv4/CPU_SUBTYPE:=vfpv4/" target/linux/amlogic/meson8b/target.mk
+git_clone_path main https://github.com/lxiaya/openwrt-onecloud target/linux/amlogic
+
+mv -f gen_aml_emmc_img.sh target/linux/amlogic/image/
+
+chmod +x target/linux/amlogic/image/gen_aml_emmc_img.sh
 
 sed -i "s/wpad-openssl/wpad-basic-mbedtls/" target/linux/amlogic/image/Makefile
 
+sed -i "s/neon-vfpv4/vfpv4/" target/linux/amlogic/meson8b/target.mk
+
+rm -rf package/feeds/routing/batman-adv
 
diff --git a/devices/amlogic_meson8b/gen_aml_emmc_img.sh b/devices/amlogic_meson8b/gen_aml_emmc_img.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# 检查参数数量
+if [ "$#" -ne 5 ]; then
+    echo "Usage: $0 <output_image> <boot_partition_image> <rootfs_image>"
+    exit 1
+fi
+
+OUTPUT_IMAGE=$1
+BOOT_PARTITION_IMAGE=$2
+ROOTFS_IMAGE=$3
+
+
+# 下载并准备工具
+ver="v0.3.1"
+[ -f AmlImg ] || curl -L -o ./AmlImg https://github.com/hzyitc/AmlImg/releases/download/$ver/AmlImg_${ver}_linux_amd64
+chmod +x ./AmlImg
+[ -f uboot.img ] || curl -L -o ./uboot.img https://github.com/hzyitc/u-boot-onecloud/releases/download/build-20221028-0940/eMMC.burn.img
+./AmlImg unpack ./uboot.img burn/
+
+# 转换镜像格式
+img2simg ${BOOT_PARTITION_IMAGE} burn/boot.simg
+img2simg ${ROOTFS_IMAGE} burn/rootfs.simg
+
+# 创建命令文件
+cat <<EOF >>burn/commands.txt
+PARTITION:boot:sparse:boot.simg
+PARTITION:rootfs:sparse:rootfs.simg
+EOF
+
+# 打包生成最终镜像
+./AmlImg pack ${OUTPUT_IMAGE} burn/
+
+# 清理临时文件夹
+rm -rf burn
diff --git a/devices/amlogic_meson8b/patches/onecloud.patch b/devices/amlogic_meson8b/patches/onecloud.patch
@@ -1,12 +1,24 @@
 --- a/target/linux/amlogic/image/Makefile
 +++ b/target/linux/amlogic/image/Makefile
-@@ -49,7 +49,8 @@ endef
+@@ -36,7 +36,7 @@ endef
+ ### Devices ###
+ define Device/Default
+   FILESYSTEMS := ext4
+-  IMAGES := emmc.img
++  IMAGES := emmc_burn.img
+   KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts)
+   KERNEL_LOADADDR := 0x01080000
+   KERNEL_NAME := Image
+@@ -46,9 +46,10 @@ endef
 
  define Device/thunder-onecloud
-   DEVICE_DTS := meson8b-onecloud
+   DEVICE_DTS := amlogic/meson8b-onecloud
 -  DEVICE_TITLE := Thunder OneCloud
 +  DEVICE_TITLE := OneCloud 玩客云
 +  DEVICE_PACKAGES += kmod-usb-net-rtl8152
    KERNEL_LOADADDR := 0x00208000
-   IMAGE/emmc_burn.img := boot-script onecloud | emmc-common $$(DEVICE_NAME)
+-  IMAGE/emmc.img := boot-script onecloud | emmc-common $$(DEVICE_NAME)
++  IMAGE/emmc_burn.img := boot-script onecloud | emmc-common $$(DEVICE_NAME)
  endef
+ ifeq ($(SUBTARGET),meson8b)
+   TARGET_DEVICES += thunder-onecloud
diff --git a/devices/amlogic_mesongx/diy.sh b/devices/amlogic_mesongx/diy.sh
@@ -4,7 +4,7 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-bash $SHELL_FOLDER/../common/kernel_6.1.sh
+#bash $SHELL_FOLDER/../common/kernel_6.1.sh
 
 git_clone_path master https://github.com/coolsnowwolf/lede target/linux/amlogic package/boot/uboot-amlogic
 

diff --git a/devices/armsr_armv8/.config b/devices/armsr_armv8/.config
@@ -8,9 +8,6 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 CONFIG_TARGET_ROOTFS_EXT4FS=y
 CONFIG_TARGET_ROOTFS_SQUASHFS=n
 
-CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
-CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
-
 CONFIG_PACKAGE_kmod-switch-ar8xxx=n
 
 
diff --git a/devices/armsr_armv8/patches/enable_wifi.patch b/devices/armsr_armv8/patches/enable_wifi.patch
diff --git a/devices/armsr_armv8/patches/rootfs.patch b/devices/armsr_armv8/patches/rootfs.patch
@@ -50,7 +50,7 @@
 +  if [ "$(PROFILE_SANITIZED)" == "box" ]; then \
 +  	export BIN_DIR=$(BIN_DIR); \
 +  	export DATE=$(DATE); \
-+  	export MORE=$(MORE); \
++  	export MORE="$(MORE)"; \
 +	export ROOTFS_PARTSIZE=$(shell echo $$(($(ROOTFS_PARTSIZE)/1024/1024))); \
 +  	cd /data/packit/amlogic-s9xxx-openwrt; \
 +  	. ~/packit/packit_amlogic.sh; \

diff --git a/devices/ath79_nand/.config b/devices/ath79_nand/.config
@@ -17,7 +17,6 @@ CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_zte_mf286=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_zte_mf281=y
 CONFIG_TARGET_DEVICE_ath79_nand_DEVICE_domywifi_dw33d=y
 
-CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 
 
 
diff --git a/devices/ath79_nand/diy.sh b/devices/ath79_nand/diy.sh
@@ -4,7 +4,4 @@ shopt -s extglob
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-
-
-
-
+sed -i '/# start dockerd/,/# end dockerd/d' .config
diff --git a/devices/bcm27xx_bcm2708/.config b/devices/bcm27xx_bcm2708/.config
@@ -4,8 +4,8 @@ CONFIG_TARGET_bcm27xx_bcm2708=y
 CONFIG_TARGET_MULTI_PROFILE=y
 CONFIG_TARGET_DEVICE_bcm27xx_bcm2708_DEVICE_rpi=y
 
-CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
-CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
+CONFIG_PACKAGE_kmod-codec-bcm2835=n
+CONFIG_PACKAGE_kmod-isp-bcm2835=n
 
 
 
diff --git a/devices/bcm27xx_bcm2709/.config b/devices/bcm27xx_bcm2709/.config
@@ -3,10 +3,5 @@ CONFIG_TARGET_bcm27xx=y
 CONFIG_TARGET_bcm27xx_bcm2709=y
 CONFIG_TARGET_bcm27xx_bcm2709_DEVICE_rpi-2=y
 
-CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
-CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
-
-CONFIG_PACKAGE_kmod-pcie_mhi=m
-
-
-
+CONFIG_PACKAGE_kmod-codec-bcm2835=n
+CONFIG_PACKAGE_kmod-isp-bcm2835=n
diff --git a/devices/bcm27xx_bcm2710/.config b/devices/bcm27xx_bcm2710/.config
@@ -3,8 +3,8 @@ CONFIG_TARGET_bcm27xx=y
 CONFIG_TARGET_bcm27xx_bcm2710=y
 CONFIG_TARGET_bcm27xx_bcm2710_DEVICE_rpi-3=y
 
-CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
-CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
+CONFIG_PACKAGE_kmod-codec-bcm2835=n
+CONFIG_PACKAGE_kmod-isp-bcm2835=n
 
 CONFIG_PACKAGE_kmod-pcie_mhi=m
 

diff --git a/devices/bcm27xx_bcm2711/.config b/devices/bcm27xx_bcm2711/.config
@@ -3,10 +3,8 @@ CONFIG_TARGET_bcm27xx=y
 CONFIG_TARGET_bcm27xx_bcm2711=y
 CONFIG_TARGET_bcm27xx_bcm2711_DEVICE_rpi-4=y
 
-CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
-CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
-
-CONFIG_PACKAGE_kmod-of-mdio=n
+CONFIG_PACKAGE_kmod-codec-bcm2835=n
+CONFIG_PACKAGE_kmod-isp-bcm2835=n
 
 CONFIG_PACKAGE_kmod-pcie_mhi=m
 
diff --git a/devices/bcm27xx_bcm2712/.config b/devices/bcm27xx_bcm2712/.config
@@ -3,9 +3,6 @@ CONFIG_TARGET_bcm27xx=y
 CONFIG_TARGET_bcm27xx_bcm2712=y
 CONFIG_TARGET_bcm27xx_bcm2712_DEVICE_rpi-5=y
 
-CONFIG_PACKAGE_luci-ssl=n # uhttpd服务
-CONFIG_PACKAGE_luci-ssl-nginx=y # nginx
-
 CONFIG_PACKAGE_kmod-of-mdio=n
 
 CONFIG_PACKAGE_kmod-pcie_mhi=m

diff --git a/devices/bcm27xx_bcm2712/diy.sh b/devices/bcm27xx_bcm2712/diy.sh
@@ -2,6 +2,6 @@
 
 SHELL_FOLDER=$(dirname $(readlink -f "$0"))
 
-bash $SHELL_FOLDER/../common/kernel_6.6.sh
+#bash $SHELL_FOLDER/../common/kernel_6.6.sh
 
 sed -i 's/DEFAULT_PACKAGES +=/DEFAULT_PACKAGES += fdisk lsblk kmod-usb-net-asix-ax88179 kmod-usb-net-rtl8152/' target/linux/bcm27xx/Makefile
diff --git a/devices/bcm53xx/.config b/devices/bcm53xx/.config
@@ -6,12 +6,9 @@ CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_phicomm_k3=y
 CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_asus_rt-ac88u=y
 CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_dlink_dir-885l=y
 
-CONFIG_PACKAGE_perf=n
-
 CONFIG_KERNEL_DEVMEM=y
 CONFIG_BUSYBOX_CONFIG_ARPING=y
 
-CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
 
 
 
diff --git a/devices/common/.config b/devices/common/.config
@@ -8,14 +8,13 @@ CONFIG_LUCI_CSSTIDY=n
 CONFIG_SIGNED_PACKAGES=n
 CONFIG_SIGNATURE_CHECK=n
 
-CONFIG_PACKAGE_kmod-switch-rtl8367b=n
-CONFIG_PACKAGE_kmod-aic8800=n
-
 # 设置固件大小:
 CONFIG_TARGET_ROOTFS_PARTSIZE=1004
 
 CONFIG_ALL_NONSHARED=y
 
+CONFIG_USE_APK=n
+
 CONFIG_IB=y
 CONFIG_IB_STANDALONE=y
 CONFIG_JSON_OVERVIEW_IMAGE_INFO=y
@@ -42,6 +41,9 @@ CONFIG_PACKAGE_dnsmasq-full=y
 CONFIG_PACKAGE_dnsmasq_full_dhcp=y
 CONFIG_PACKAGE_dnsmasq_full_ipset=y
 
+CONFIG_PACKAGE_firewall=m
+CONFIG_PACKAGE_miniupnpd-iptables=m
+
 CONFIG_NGINX_DAV=y
 CONFIG_PACKAGE_luci-base=y
 CONFIG_PACKAGE_luci-compat=y
@@ -74,24 +76,12 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_CROND_SPECIAL_TIMES=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_SYSLOG_INFO=y
 
+CONFIG_PACKAGE_luci-ssl=y # uhttpd服务
+
 CONFIG_PACKAGE_bash=y
 CONFIG_PACKAGE_ca-bundle=y
 
-CONFIG_KERNEL_CGROUP_DEVICE=y
-CONFIG_KERNEL_CGROUP_FREEZER=y
-CONFIG_KERNEL_NET_CLS_CGROUP=y
-CONFIG_KERNEL_CGROUP_NET_PRIO=y
-CONFIG_KERNEL_MEMCG_SWAP_ENABLED=y
-CONFIG_KERNEL_CFQ_GROUP_IOSCHED=y
-CONFIG_KERNEL_CGROUP_PERF=y
-CONFIG_KERNEL_CGROUP_HUGETLB=y
-CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y
-CONFIG_KERNEL_EXT4_FS_SECURITY=y
-CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y
-
-
-CONFIG_PACKAGE_kmod-sprd_pcie=n
-CONFIG_PACKAGE_kmod-drm-nouveau=n
+CONFIG_PACKAGE_wifi-scripts=m
 
 CONFIG_PACKAGE_kmod-pcie_mhi=n
 
@@ -106,3 +96,24 @@ CONFIG_VERSION_CODE_FILENAMES=n
 
 CONFIG_BPF_TOOLCHAIN_HOST=y
 CONFIG_BPF_TOOLCHAIN_NONE=n
+
+CONFIG_ZLIB_OPTIMIZE_SPEED=y
+CONFIG_ZSTD_OPTIMIZE_O3=y
+
+CONFIG_BUILD_PATENTED=y
+
+
+# start dockerd
+CONFIG_KERNEL_CGROUP_DEVICE=y
+CONFIG_KERNEL_CGROUP_FREEZER=y
+CONFIG_KERNEL_NET_CLS_CGROUP=y
+CONFIG_KERNEL_CGROUP_NET_PRIO=y
+CONFIG_KERNEL_MEMCG_SWAP_ENABLED=y
+CONFIG_KERNEL_CFQ_GROUP_IOSCHED=y
+CONFIG_KERNEL_CGROUP_PERF=y
+CONFIG_KERNEL_CGROUP_HUGETLB=y
+CONFIG_KERNEL_EXT4_FS_POSIX_ACL=y
+CONFIG_KERNEL_EXT4_FS_SECURITY=y
+CONFIG_KERNEL_BTRFS_FS_POSIX_ACL=y
+# end dockerd
+