From a28d4c5471d0206b949d128605cc35e7d7f15ae7 Mon Sep 17 00:00:00 2001 From: kiddin9 <48883331+kiddin9@users.noreply.github.com> Date: Sun, 10 Jul 2022 05:51:15 +0800 Subject: [PATCH] update --- .github/workflows/repo-dispatcher.yml | 35 ++++++++++++++++----------- devices/bcm27xx_bcm2711/.config | 2 ++ devices/bcm53xx/.config | 1 + devices/common/kernel_5.15.sh | 2 +- devices/common/patches/targets.patch | 12 ++++----- devices/ramips_mt7621/.config | 5 ++-- devices/ramips_mt7621/diy.sh | 4 --- 7 files changed, 32 insertions(+), 29 deletions(-) diff --git a/.github/workflows/repo-dispatcher.yml b/.github/workflows/repo-dispatcher.yml index 812e2d26227b..af80d6f33fcc 100644 --- a/.github/workflows/repo-dispatcher.yml +++ b/.github/workflows/repo-dispatcher.yml @@ -16,8 +16,8 @@ on: # - cron: 30 18 * * * workflow_dispatch: inputs: - version: - description: 'Version' + param: + description: 'parameter' required: false default: '' @@ -32,6 +32,13 @@ jobs: - name: Checkout uses: actions/checkout@main + - name: cancel running workflows + uses: styfle/cancel-workflow-action@main + if: contains(${{ github.event.inputs.version }}, 'cw') + with: + workflow_id: 4439867 + access_token: ${{ github.token }} + - name: Load Settings.ini run: | source "${GITHUB_WORKSPACE}/devices/common/settings.ini" @@ -48,60 +55,60 @@ jobs: -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "x86_64 ${{ github.event.inputs.version }}", "client_payload": {"target": "x86_64"}}' + -d '{"event_type": "x86_64", "client_payload": {"target": "x86_64"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "rockchip_armv8 ${{ github.event.inputs.version }}", "client_payload": {"target": "rockchip_armv8"}}' + -d '{"event_type": "rockchip_armv8", "client_payload": {"target": "rockchip_armv8"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "bcm27xx_bcm2711 ${{ github.event.inputs.version }}", "client_payload": {"target": "bcm27xx_bcm2711"}}' + -d '{"event_type": "bcm27xx_bcm2711", "client_payload": {"target": "bcm27xx_bcm2711"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "bcm27xx_bcm2710 ${{ github.event.inputs.version }}", "client_payload": {"target": "bcm27xx_bcm2710"}}' + -d '{"event_type": "bcm27xx_bcm2710", "client_payload": {"target": "bcm27xx_bcm2710"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "bcm27xx_bcm2709 ${{ github.event.inputs.version }}", "client_payload": {"target": "bcm27xx_bcm2709"}}' + -d '{"event_type": "bcm27xx_bcm2709", "client_payload": {"target": "bcm27xx_bcm2709"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "armvirt_64 ${{ github.event.inputs.version }}", "client_payload": {"target": "armvirt_64"}}' + -d '{"event_type": "armvirt_64", "client_payload": {"target": "armvirt_64"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "mediatek_mt7622 ${{ github.event.inputs.version }}", "client_payload": {"target": "mediatek_mt7622"}}' + -d '{"event_type": "mediatek_mt7622", "client_payload": {"target": "mediatek_mt7622"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "ramips_mt7621 ${{ github.event.inputs.version }}", "client_payload": {"target": "ramips_mt7621"}}' + -d '{"event_type": "ramips_mt7621", "client_payload": {"target": "ramips_mt7621"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "ramips_mt76x8 ${{ github.event.inputs.version }}", "client_payload": {"target": "ramips_mt76x8"}}' + -d '{"event_type": "ramips_mt76x8", "client_payload": {"target": "ramips_mt76x8"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "ipq807x ${{ github.event.inputs.version }}", "client_payload": {"target": "ipq807x"}}' + -d '{"event_type": "ipq807x", "client_payload": {"target": "ipq807x"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "ipq40xx_generic ${{ github.event.inputs.version }}", "client_payload": {"target": "ipq40xx_generic"}}' + -d '{"event_type": "ipq40xx_generic", "client_payload": {"target": "ipq40xx_generic"}}' curl \ -X POST https://api.github.com/repos/${{ github.repository }}/dispatches \ -H "Accept: application/vnd.github.everest-preview+json" \ -H "Authorization: token ${{ secrets.REPO_TOKEN }}" \ - -d '{"event_type": "bcm53xx ${{ github.event.inputs.version }}", "client_payload": {"target": "bcm53xx"}}' + -d '{"event_type": "bcm53xx", "client_payload": {"target": "bcm53xx"}}' diff --git a/devices/bcm27xx_bcm2711/.config b/devices/bcm27xx_bcm2711/.config index 53a391b679fc..01be0e258439 100644 --- a/devices/bcm27xx_bcm2711/.config +++ b/devices/bcm27xx_bcm2711/.config @@ -6,3 +6,5 @@ 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 + diff --git a/devices/bcm53xx/.config b/devices/bcm53xx/.config index 3f3940a6a955..236c2929d8c7 100644 --- a/devices/bcm53xx/.config +++ b/devices/bcm53xx/.config @@ -3,6 +3,7 @@ CONFIG_TARGET_bcm53xx=y CONFIG_TARGET_bcm53xx_generic=y CONFIG_TARGET_MULTI_PROFILE=y CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_phicomm_k3=y +CONFIG_TARGET_DEVICE_bcm53xx_generic_DEVICE_asus_rt-ac88u=y CONFIG_PACKAGE_luci-ssl=y # uhttpd服务 diff --git a/devices/common/kernel_5.15.sh b/devices/common/kernel_5.15.sh index 364580edaadd..993eef55ed5a 100644 --- a/devices/common/kernel_5.15.sh +++ b/devices/common/kernel_5.15.sh @@ -5,7 +5,7 @@ latest="$(curl -sfL https://github.com/openwrt/openwrt/commits/master/include | mkdir new; cp -rf .git new/.git cd new [ "$latest" ] && git reset --hard $latest || git reset --hard origin/master -git checkout HEAD^ +#git checkout HEAD^ [ "$(echo $(git log -1 --pretty=short) | grep "kernel: bump 5.15")" ] && git checkout $latest cp -rf --parents target/linux package/kernel package/boot package/firmware/linux-firmware include/{kernel-*,netfilter.mk} ../ cd - diff --git a/devices/common/patches/targets.patch b/devices/common/patches/targets.patch index 1eed0b3b88c5..a2642132ffde 100644 --- a/devices/common/patches/targets.patch +++ b/devices/common/patches/targets.patch @@ -1,17 +1,15 @@ --- a/include/target.mk +++ b/include/target.mk -@@ -53,10 +53,10 @@ DEFAULT_PACKAGES.nas:=\ +@@ -53,10 +53,11 @@ DEFAULT_PACKAGES.nas:=\ mdadm # For router targets DEFAULT_PACKAGES.router:=\ - dnsmasq \ -- firewall4 \ -- nftables \ -- kmod-nft-offload \ + dnsmasq-full \ -+ firewall \ -+ iptables-legacy ip6tables-legacy kmod-ipt-nat6 ip6tables-mod-nat \ -+ kmod-ipt-offload \ + firewall4 \ + nftables \ + kmod-nft-offload \ ++ kmod-ipt-offload kmod-ipt-nat6 ip6tables-mod-nat \ odhcp6c \ odhcpd-ipv6only \ ppp \ diff --git a/devices/ramips_mt7621/.config b/devices/ramips_mt7621/.config index 7a346d8f138d..a29da2f68624 100644 --- a/devices/ramips_mt7621/.config +++ b/devices/ramips_mt7621/.config @@ -10,6 +10,7 @@ CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-4=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_redmi-router-ac2100=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaomi_mi-router-ac2100=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_xiaoyu_xy-c5=y +CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_lenovo_newifi-d1=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_d-team_newifi-d2=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_glinet_gl-mt1300=y CONFIG_TARGET_DEVICE_ramips_mt7621_DEVICE_phicomm_k2p=y @@ -30,6 +31,4 @@ CONFIG_PACKAGE_luci-ssl=y # uhttpd服务 CONFIG_PACKAGE_kmod-shortcut-fe=n CONFIG_PACKAGE_kmod-shortcut-fe-cm=n -CONFIG_PACKAGE_kmod-fs-ntfs3-oot=n - - +CONFIG_PACKAGE_kmod-fs-ntfs3-oot=n \ No newline at end of file diff --git a/devices/ramips_mt7621/diy.sh b/devices/ramips_mt7621/diy.sh index 3799e9c67997..811dfa3d67ac 100644 --- a/devices/ramips_mt7621/diy.sh +++ b/devices/ramips_mt7621/diy.sh @@ -2,9 +2,5 @@ shopt -s extglob -#rm -Rf target/linux/{ramips,generic} -#svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/ramips target/linux/ramips -#svn co https://github.com/coolsnowwolf/lede/trunk/target/linux/generic target/linux/generic -#curl -sfL https://raw.githubusercontent.com/coolsnowwolf/lede/master/include/kernel-5.4 -o include/kernel-5.4