diff --git a/.woodpecker/ipq60xx.yml b/.woodpecker/ipq60xx.yml index 1fb9154..d7312d4 100644 --- a/.woodpecker/ipq60xx.yml +++ b/.woodpecker/ipq60xx.yml @@ -28,59 +28,62 @@ steps: DEBIAN_FRONTEND: noninteractive UPSTREAM_GENERAL_REF: ${UPSTREAM_GENERAL_REF:-main} commands: - - chmod +x ${CI_WORKSPACE}/Scripts/sync_upstream_config.sh - - ${CI_WORKSPACE}/Scripts/sync_upstream_config.sh + - export WORKSPACE="${CI_WORKSPACE:-$PWD}" + - chmod +x ${WORKSPACE}/Scripts/sync_upstream_config.sh + - ${WORKSPACE}/Scripts/sync_upstream_config.sh - name: build-ipq60xx-wifi-yes image: ubuntu:24.04 environment: DEBIAN_FRONTEND: noninteractive commands: + - export WORKSPACE="${CI_WORKSPACE:-$PWD}" - git clone --depth=1 --single-branch --branch ${WRT_BRANCH} ${WRT_REPO} wrt-yes - cd wrt-yes - ./scripts/feeds update -a - ./scripts/feeds install -a - cd package - - dos2unix ${CI_WORKSPACE}/Scripts/*.sh || true - - chmod +x ${CI_WORKSPACE}/Scripts/*.sh - - ${CI_WORKSPACE}/Scripts/Packages.sh ${CI_WORKSPACE}/Scripts/Handles.sh + - dos2unix ${WORKSPACE}/Scripts/*.sh || true + - chmod +x ${WORKSPACE}/Scripts/*.sh + - ${WORKSPACE}/Scripts/Packages.sh ${WORKSPACE}/Scripts/Handles.sh - cd .. - - cat ${CI_WORKSPACE}/Config/IPQ60XX-WIFI-YES.txt \ - ${CI_WORKSPACE}/Config/GENERAL.upstream.txt \ - ${CI_WORKSPACE}/Config/GENERAL.local.txt > .config - - ${CI_WORKSPACE}/Scripts/Settings.sh + - cat ${WORKSPACE}/Config/IPQ60XX-WIFI-YES.txt \ + ${WORKSPACE}/Config/GENERAL.upstream.txt \ + ${WORKSPACE}/Config/GENERAL.local.txt > .config + - ${WORKSPACE}/Scripts/Settings.sh - make defconfig -j"$(nproc)" - make download -j"$(nproc)" - make -j"$(nproc)" || make -j1 V=s - - mkdir -p ${CI_WORKSPACE}/artifacts/ipq60xx-wifi-yes - - cp -rf bin/targets ${CI_WORKSPACE}/artifacts/ipq60xx-wifi-yes/ + - mkdir -p ${WORKSPACE}/artifacts/ipq60xx-wifi-yes + - cp -rf bin/targets ${WORKSPACE}/artifacts/ipq60xx-wifi-yes/ - name: build-ipq60xx-wifi image: ubuntu:24.04 environment: DEBIAN_FRONTEND: noninteractive commands: + - export WORKSPACE="${CI_WORKSPACE:-$PWD}" - git clone --depth=1 --single-branch --branch ${WRT_BRANCH} ${WRT_REPO} wrt-wifi - cd wrt-wifi - ./scripts/feeds update -a - ./scripts/feeds install -a - cd package - - dos2unix ${CI_WORKSPACE}/Scripts/*.sh || true - - chmod +x ${CI_WORKSPACE}/Scripts/*.sh - - ${CI_WORKSPACE}/Scripts/Packages.sh ${CI_WORKSPACE}/Scripts/Handles.sh + - dos2unix ${WORKSPACE}/Scripts/*.sh || true + - chmod +x ${WORKSPACE}/Scripts/*.sh + - ${WORKSPACE}/Scripts/Packages.sh ${WORKSPACE}/Scripts/Handles.sh - cd .. - - cat ${CI_WORKSPACE}/Config/IPQ60XX-WIFI.txt \ - ${CI_WORKSPACE}/Config/GENERAL.upstream.txt \ - ${CI_WORKSPACE}/Config/GENERAL.local.txt > .config - - ${CI_WORKSPACE}/Scripts/Settings.sh + - cat ${WORKSPACE}/Config/IPQ60XX-WIFI.txt \ + ${WORKSPACE}/Config/GENERAL.upstream.txt \ + ${WORKSPACE}/Config/GENERAL.local.txt > .config + - ${WORKSPACE}/Scripts/Settings.sh - make defconfig -j"$(nproc)" - make download -j"$(nproc)" - make -j"$(nproc)" || make -j1 V=s - - mkdir -p ${CI_WORKSPACE}/artifacts/ipq60xx-wifi - - cp -rf bin/targets ${CI_WORKSPACE}/artifacts/ipq60xx-wifi/ + - mkdir -p ${WORKSPACE}/artifacts/ipq60xx-wifi + - cp -rf bin/targets ${WORKSPACE}/artifacts/ipq60xx-wifi/ diff --git a/Config/GENERAL.local.txt b/Config/GENERAL.local.txt index 09de477..9f9668c 100644 --- a/Config/GENERAL.local.txt +++ b/Config/GENERAL.local.txt @@ -1,6 +1,135 @@ -# Your overrides/additions here -# This file is merged with GENERAL.upstream.txt during build +#科学插件调整 +#CONFIG_PACKAGE_luci-app-homeproxy=y +CONFIG_PACKAGE_luci-app-daed=y +CONFIG_PACKAGE_luci-app-dae=y +CONFIG_PACKAGE_luci-app-nikki=y +#CONFIG_PACKAGE_luci-app-momo=y +#增加插件 +CONFIG_PACKAGE_luci-app-autoreboot=y +CONFIG_PACKAGE_luci-app-gecoosac=y +#CONFIG_PACKAGE_luci-app-netspeedtest=y +#CONFIG_PACKAGE_luci-app-partexp=y +CONFIG_PACKAGE_luci-app-samba4=y +CONFIG_PACKAGE_luci-app-tailscale-community=y +CONFIG_PACKAGE_luci-app-tailscale=n +CONFIG_PACKAGE_luci-app-upnp=y +CONFIG_PACKAGE_luci-app-wolplus=y +#CONFIG_PACKAGE_luci-app-advancedplus=n +#CONFIG_PACKAGE_luci-theme-kucat=y +CONFIG_PACKAGE_luci-theme-argon=y +CONFIG_PACKAGE_luci-proto-wireguard=y +#CONFIG_PACKAGE_luci-app-zerotier=y +CONFIG_PACKAGE_luci-app-vlmcsd=y +CONFIG_PACKAGE_luci-app-ttyd=y +CONFIG_PACKAGE_luci-app-cpufreq=y +#CONFIG_PACKAGE_luci-app-ddns-go=y +CONFIG_PACKAGE_luci-app-gecoosac=y +#CONFIG_PACKAGE_luci-app-pushbot=y +#CONFIG_PACKAGE_luci-app-mwan3=y +#CONFIG_PACKAGE_luci-app-lucky=y +CONFIG_PACKAGE_podman=y +CONFIG_PACKAGE_luci-app-podman=y +#删除插件 +CONFIG_PACKAGE_luci-app-wol=n +#参数调整 +CONFIG_CCACHE=y +CONFIG_DEVEL=y +CONFIG_TARGET_MULTI_PROFILE=y +CONFIG_TARGET_PER_DEVICE_ROOTFS=y +CONFIG_TARGET_ROOTFS_INITRAMFS=n +#内核调整 +CONFIG_PACKAGE_kmod-dsa=y +CONFIG_PACKAGE_kmod-fs-btrfs=y +CONFIG_PACKAGE_kmod-fuse=y +CONFIG_PACKAGE_kmod-inet-diag=y +CONFIG_PACKAGE_kmod-mtd-rw=y +CONFIG_PACKAGE_kmod-netlink-diag=y +CONFIG_PACKAGE_kmod-nft-bridge=y +CONFIG_PACKAGE_kmod-nft-core=y +CONFIG_PACKAGE_kmod-nft-fib=y +CONFIG_PACKAGE_kmod-nft-fullcone=y +CONFIG_PACKAGE_kmod-nft-nat=y +CONFIG_PACKAGE_kmod-nft-netdev=y +CONFIG_PACKAGE_kmod-nft-offload=y +CONFIG_PACKAGE_kmod-nft-queue=y +CONFIG_PACKAGE_kmod-nft-socket=y +CONFIG_PACKAGE_kmod-nft-tproxy=y +CONFIG_PACKAGE_kmod-sound-core=y +CONFIG_PACKAGE_kmod-tun=y +CONFIG_PACKAGE_kmod-usb3=y +CONFIG_PACKAGE_kmod-usb-audio=y +CONFIG_PACKAGE_kmod-usb-core=y +CONFIG_PACKAGE_kmod-usb-dwc3=y +CONFIG_PACKAGE_kmod-usb-net=y +CONFIG_PACKAGE_kmod-usb-net-cdc-eem=y +CONFIG_PACKAGE_kmod-usb-net-cdc-ether=y +CONFIG_PACKAGE_kmod-usb-net-cdc-mbim=y +CONFIG_PACKAGE_kmod-usb-net-cdc-ncm=y +CONFIG_PACKAGE_kmod-usb-net-cdc-subset=y +CONFIG_PACKAGE_kmod-usb-net-huawei-cdc-ncm=y +CONFIG_PACKAGE_kmod-usb-net-ipheth=y +CONFIG_PACKAGE_kmod-usb-net-qmi-wwan=y +CONFIG_PACKAGE_kmod-usb-net-rndis=y +CONFIG_PACKAGE_kmod-usb-net-rtl8150=y +CONFIG_PACKAGE_kmod-usb-net-rtl8152=y +CONFIG_PACKAGE_kmod-usb-ohci=y +CONFIG_PACKAGE_kmod-usb-storage=y +CONFIG_PACKAGE_kmod-usb-storage-extras=y +CONFIG_PACKAGE_kmod-usb-storage-uas=y +CONFIG_PACKAGE_kmod-usb-uhci=y +CONFIG_PACKAGE_kmod-usb-xhci=y +CONFIG_PACKAGE_kmod-wireguard=y +#组件调整 +CONFIG_PACKAGE_autocore=y +CONFIG_PACKAGE_automount=y +CONFIG_PACKAGE_blkid=y +CONFIG_PACKAGE_cfdisk=y +CONFIG_PACKAGE_cgdisk=y +CONFIG_PACKAGE_coremark=y +CONFIG_PACKAGE_cpufreq=y +CONFIG_PACKAGE_dmesg=y +CONFIG_PACKAGE_fdisk=y +CONFIG_PACKAGE_gdisk=y +#CONFIG_PACKAGE_htop=y +CONFIG_PACKAGE_iperf3=y +CONFIG_PACKAGE_ip-full=y +CONFIG_PACKAGE_lsblk=y +CONFIG_PACKAGE_luci-base=y +CONFIG_PACKAGE_luci-compat=y +CONFIG_PACKAGE_luci-lib-base=y +CONFIG_PACKAGE_luci-lib-ipkg=y +CONFIG_PACKAGE_luci-lua-runtime=y +CONFIG_PACKAGE_luci-proto-bonding=y +CONFIG_PACKAGE_luci-proto-relay=y +CONFIG_PACKAGE_mmc-utils=y +CONFIG_PACKAGE_nand-utils=y +CONFIG_PACKAGE_openssh-sftp-server=y +CONFIG_PACKAGE_sfdisk=y +CONFIG_PACKAGE_sgdisk=y + +#文件系统 +CONFIG_PACKAGE_kmod-fs-ext4=y +CONFIG_PACKAGE_kmod-fs-f2fs=y +CONFIG_PACKAGE_e2fsprogs=y +CONFIG_PACKAGE_f2fsck=y +CONFIG_PACKAGE_mkf2fs=y +#其他调整 +CONFIG_PACKAGE_openssh-sftp-server=y +CONFIG_PACKAGE_kmod-tcp-bbr=y +#CONFIG_DEFAULT_tcp_bbr=y +CONFIG_DEFAULT_tcp_cubic=y +CONFIG_PACKAGE_v2ray-geodata-updater=y +CONFIG_PACKAGE_tcpdump=y +CONFIG_PACKAGE_block-mount=y +CONFIG_PACKAGE_btop=y +CONFIG_PACKAGE_iperf3=y +CONFIG_PACKAGE_luci=y +CONFIG_LUCI_LANG_zh_Hans=y +CONFIG_PACKAGE_default-settings=y +CONFIG_PACKAGE_default-settings-chn=y +CONFIG_PACKAGE_bash=y +CONFIG_PACKAGE_bind-dig=y +# CONFIG_PACKAGE_bind-host is not set +CONFIG_PACKAGE_bind-nslookup=y + -# Example packages to add: -# CONFIG_PACKAGE_luci-app-xxx=y -# CONFIG_PACKAGE_luci-app-yyy=y