Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
kiddin9 committed Jul 9, 2022
1 parent d5559e1 commit a28d4c5
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 29 deletions.
35 changes: 21 additions & 14 deletions .github/workflows/repo-dispatcher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ on:
# - cron: 30 18 * * *
workflow_dispatch:
inputs:
version:
description: 'Version'
param:
description: 'parameter'
required: false
default: ''

Expand All @@ -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"
Expand All @@ -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"}}'
2 changes: 2 additions & 0 deletions devices/bcm27xx_bcm2711/.config
Original file line number Diff line number Diff line change
Expand Up @@ -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

1 change: 1 addition & 0 deletions devices/bcm53xx/.config
Original file line number Diff line number Diff line change
Expand Up @@ -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服务

Expand Down
2 changes: 1 addition & 1 deletion devices/common/kernel_5.15.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 -
Expand Down
12 changes: 5 additions & 7 deletions devices/common/patches/targets.patch
Original file line number Diff line number Diff line change
@@ -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 \
5 changes: 2 additions & 3 deletions devices/ramips_mt7621/.config
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
4 changes: 0 additions & 4 deletions devices/ramips_mt7621/diy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit a28d4c5

Please sign in to comment.